diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
| commit | dd7daa80d25deb78ab365e28df4d93437357793b (patch) | |
| tree | fb4dd2331820f5e32ddeb7e2bfb731f0604fbc0d /webkit/glue/devtools | |
| parent | 64c40aa34646a198a04029ee6b78dd9559595dc5 (diff) | |
| download | chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.zip chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.gz chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.bz2 | |
Switch to WebFrame from the WebKit API.
I tried to avoid unnecessary changes in this CL to help make it easier to
review.
As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.
R=dglazkov
BUG=10034
TEST=none
Review URL: http://codereview.chromium.org/164225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/devtools')
| -rw-r--r-- | webkit/glue/devtools/devtools_rpc_js.h | 2 | ||||
| -rw-r--r-- | webkit/glue/devtools/dom_agent_unittest.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/devtools/devtools_rpc_js.h b/webkit/glue/devtools/devtools_rpc_js.h index 7f9f856..4e82273 100644 --- a/webkit/glue/devtools/devtools_rpc_js.h +++ b/webkit/glue/devtools/devtools_rpc_js.h @@ -14,10 +14,10 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/values.h" +#include "webkit/api/public/WebFrame.h" #include "webkit/glue/cpp_bound_class.h" #include "webkit/glue/devtools/devtools_rpc.h" #include "webkit/glue/glue_util.h" -#include "webkit/glue/webframe.h" /////////////////////////////////////////////////////// // JS RPC binds and stubs diff --git a/webkit/glue/devtools/dom_agent_unittest.cc b/webkit/glue/devtools/dom_agent_unittest.cc index 3c693b2..ce01a50 100644 --- a/webkit/glue/devtools/dom_agent_unittest.cc +++ b/webkit/glue/devtools/dom_agent_unittest.cc @@ -20,13 +20,13 @@ #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/api/public/WebData.h" +#include "webkit/api/public/WebFrame.h" #include "webkit/api/public/WebURL.h" #include "webkit/glue/devtools/devtools_mock_rpc.h" #include "webkit/glue/devtools/devtools_rpc.h" #include "webkit/glue/devtools/dom_agent_impl.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/glue_util.h" -#include "webkit/glue/webframe.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_shell_test.h" @@ -38,6 +38,7 @@ using WebCore::HTMLFrameOwnerElement; using WebCore::Node; using WebCore::String; using WebCore::Text; +using WebKit::WebFrame; namespace { @@ -61,7 +62,7 @@ class DomAgentTests : public TestShellTest { test_shell_->ResetTestController(); GURL file_url = net::FilePathToFileURL(data_dir_); WebFrame* main_frame = test_shell_->webView()->GetMainFrame(); - main_frame->LoadHTMLString("<html> <head> </head> <body> </body> </html>", + main_frame->loadHTMLString("<html> <head> </head> <body> </body> </html>", file_url); WebFrameImpl* main_frame_impl = static_cast<WebFrameImpl*>(main_frame); |