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/dom_serializer_unittest.cc | |
| 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/dom_serializer_unittest.cc')
| -rw-r--r-- | webkit/glue/dom_serializer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index d3f7e8e..de8d7e1 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -36,7 +36,6 @@ MSVC_POP_WARNING(); #include "webkit/glue/dom_serializer.h" #include "webkit/glue/dom_serializer_delegate.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/simple_resource_loader_bridge.h" @@ -109,11 +108,12 @@ class DomSerializerTests : public TestShellTest, test_shell_->ResetTestController(); // If input encoding is empty, use UTF-8 as default encoding. if (encoding_info.isEmpty()) { - test_shell_->webView()->GetMainFrame()->LoadHTMLString(contents, + test_shell_->webView()->GetMainFrame()->loadHTMLString(contents, base_url); } else { // Do not use WebFrame.LoadHTMLString because it assumes that input // html contents use UTF-8 encoding. + // TODO(darin): This should use WebFrame::loadData. WebFrameImpl* web_frame = static_cast<WebFrameImpl*>(test_shell_->webView()->GetMainFrame()); ASSERT_TRUE(web_frame != NULL); |