diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 16:55:27 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 16:55:27 +0000 |
| commit | 26aa04898e37692f354a9f97df01ff1fc7bbb14e (patch) | |
| tree | d83f599bdc5083646ea70aec4c6906707e671b71 /webkit/tools/test_shell/plugin_tests.cc | |
| parent | fbc805556ed3f7e15718313907481821ef6908b4 (diff) | |
| download | chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.zip chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.tar.gz chromium_src-26aa04898e37692f354a9f97df01ff1fc7bbb14e.tar.bz2 | |
Hook up webkit/api/public/WebView.h
This change does not completely eliminate webkit/glue/webview.h. Instead,
the old WebView extends from the new WebView temporarily as we complete
the transition.
R=dglazkov
BUG=10033
TEST=none
Review URL: http://codereview.chromium.org/257001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
| -rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index 3c07a07..7f7214e 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -100,22 +100,22 @@ TEST_F(PluginTest, Refresh) { // test plugin from a previous test. DeleteTestPlugin(); ASSERT_FALSE(file_util::PathExists(plugin_file_path_)); - test_shell_->webView()->GetMainFrame()->executeScript(refresh); + test_shell_->webView()->mainFrame()->executeScript(refresh); - test_shell_->webView()->GetMainFrame()->loadHTMLString( + test_shell_->webView()->mainFrame()->loadHTMLString( html, GURL("about:blank")); test_shell_->WaitTestFinished(); std::string text; - test_shell_->webView()->GetMainFrame()->executeScript(call_check); - text = test_shell_->webView()->GetMainFrame()->contentAsText(10000).utf8(); + test_shell_->webView()->mainFrame()->executeScript(call_check); + text = test_shell_->webView()->mainFrame()->contentAsText(10000).utf8(); ASSERT_EQ(text, "FAIL"); CopyTestPlugin(); - test_shell_->webView()->GetMainFrame()->executeScript(refresh); - test_shell_->webView()->GetMainFrame()->executeScript(call_check); - text = test_shell_->webView()->GetMainFrame()->contentAsText(10000).utf8(); + test_shell_->webView()->mainFrame()->executeScript(refresh); + test_shell_->webView()->mainFrame()->executeScript(call_check); + text = test_shell_->webView()->mainFrame()->contentAsText(10000).utf8(); ASSERT_EQ(text, "DONE"); } @@ -139,12 +139,12 @@ TEST_F(PluginTest, DefaultPluginLoadTest) { </DIV>\ "; - test_shell_->webView()->GetMainFrame()->loadHTMLString( + test_shell_->webView()->mainFrame()->loadHTMLString( html, GURL("about:blank")); test_shell_->WaitTestFinished(); std::string text = - test_shell_->webView()->GetMainFrame()->contentAsText(10000).utf8(); + test_shell_->webView()->mainFrame()->contentAsText(10000).utf8(); ASSERT_EQ(true, StartsWithASCII(text, "DONE", true)); } #endif @@ -188,7 +188,7 @@ TEST_F(PluginTest, PluginVisibilty) { test_shell_->LoadFile(test_html); test_shell_->WaitTestFinished(); - WebFrame* main_frame = test_shell_->webView()->GetMainFrame(); + WebFrame* main_frame = test_shell_->webView()->mainFrame(); HWND frame_hwnd = test_shell_->webViewWnd(); HWND plugin_hwnd = NULL; EnumChildWindows(frame_hwnd, EnumChildProc, |