third_party/WebKit/Source/web/tests/ViewportTest.cpp - Issue 2923433002: Move ExecuteScript method from WebFrame to WebLocalFrame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/tests/ViewportTest.cpp

Issue 2923433002: Move ExecuteScript method from WebFrame to WebLocalFrame. (Closed)

Patch Set: Tweaked a comment in WebViewPlugin::WebViewHelper::main_frame [as suggested in CR feedback] Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/web/tests/PrerenderingTest.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/ViewportTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp

index 842790f26f56a7ea5a311463a10fcd52ff7611fd..03058ca34e09ac7e4b12c98f413a96e9969ba885 100644

--- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp

+++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp

@@ -32,6 +32,7 @@

#include "core/frame/LocalFrameView.h"

#include "core/frame/PageScaleConstraints.h"

#include "core/frame/Settings.h"

+#include "core/frame/WebLocalFrameBase.h"

#include "core/page/Page.h"

#include "platform/Length.h"

#include "platform/geometry/IntPoint.h"

@@ -44,6 +45,7 @@

#include "public/platform/WebURLLoaderMockFactory.h"

#include "public/web/WebConsoleMessage.h"

#include "public/web/WebFrame.h"

+#include "public/web/WebLocalFrame.h"

#include "public/web/WebScriptSource.h"

#include "public/web/WebSettings.h"

#include "public/web/WebViewClient.h"

@@ -77,7 +79,7 @@ class ViewportTest : public ::testing::Test {

WebString::FromUTF8(file_name));

}

- void ExecuteScript(WebFrame* frame, const WebString& code) {

+ void ExecuteScript(WebLocalFrame* frame, const WebString& code) {

frame->ExecuteScript(WebScriptSource(code));

RunPendingTasks();

}

@@ -2880,7 +2882,7 @@ TEST_F(ViewportTest, viewportLegacyXHTMLMPRemoveAndAdd) {

EXPECT_NEAR(5.0f, constraints.maximum_scale, 0.01f);

EXPECT_TRUE(page->GetViewportDescription().user_zoom);

- ExecuteScript(web_view_helper.WebView()->MainFrame(),

+ ExecuteScript(web_view_helper.WebView()->MainFrameImpl(),

"originalDoctype = document.doctype;"

"document.removeChild(originalDoctype);");

@@ -2893,7 +2895,7 @@ TEST_F(ViewportTest, viewportLegacyXHTMLMPRemoveAndAdd) {

EXPECT_NEAR(5.0f, constraints.maximum_scale, 0.01f);

EXPECT_TRUE(page->GetViewportDescription().user_zoom);

- ExecuteScript(web_view_helper.WebView()->MainFrame(),

+ ExecuteScript(web_view_helper.WebView()->MainFrameImpl(),

"document.insertBefore(originalDoctype, document.firstChild);");

constraints = RunViewportTest(page, 320, 352);