| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index 2d31f85568e5356c8f8dc3222ffaa0c97a135619..faf6e379dd43010b9e035c149e1058b319ed10b7 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -483,7 +483,7 @@ TEST_P(ParameterizedWebFrameTest, SuspendedRequestExecuteScript) {
|
|
|
| // If the frame navigates, pending scripts should be removed, but the callback
|
| // should always be ran.
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "bar.html");
|
| EXPECT_TRUE(callback_helper.DidComplete());
|
| EXPECT_EQ(String(), callback_helper.StringValue());
|
| @@ -638,7 +638,7 @@ TEST_P(ParameterizedWebFrameTest, ChromePageJavascript) {
|
| web_view_helper.InitializeAndLoad(chrome_url_ + "history.html", true);
|
|
|
| // Try to run JS against the chrome-style URL.
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.body.appendChild(document."
|
| "createTextNode('Clobbered'))");
|
|
|
| @@ -659,7 +659,7 @@ TEST_P(ParameterizedWebFrameTest, ChromePageNoJavascript) {
|
|
|
| // Try to run JS against the chrome-style URL after prohibiting it.
|
| WebSecurityPolicy::RegisterURLSchemeAsNotAllowingJavascriptURLs("chrome");
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.body.appendChild(document."
|
| "createTextNode('Clobbered'))");
|
|
|
| @@ -683,11 +683,11 @@ TEST_P(ParameterizedWebFrameTest, LocationSetHostWithMissingPort) {
|
|
|
| // Setting host to "hostname:" should be treated as "hostname:0".
|
| FrameTestHelpers::LoadFrame(
|
| - web_view_helper.WebView()->MainFrame(),
|
| + web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:location.host = 'internal.test:'; void 0;");
|
|
|
| FrameTestHelpers::LoadFrame(
|
| - web_view_helper.WebView()->MainFrame(),
|
| + web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.body.textContent = location.href; void 0;");
|
|
|
| std::string content =
|
| @@ -706,11 +706,11 @@ TEST_P(ParameterizedWebFrameTest, LocationSetEmptyPort) {
|
| /// Pass true to enable JavaScript.
|
| web_view_helper.InitializeAndLoad(base_url_ + file_name, true);
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:location.port = ''; void 0;");
|
|
|
| FrameTestHelpers::LoadFrame(
|
| - web_view_helper.WebView()->MainFrame(),
|
| + web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.body.textContent = location.href; void 0;");
|
|
|
| std::string content =
|
| @@ -1284,7 +1284,7 @@ TEST_P(ParameterizedWebFrameTest, FixedLayoutInitializeAtMinimumScale) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
|
| web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "fixed_layout.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -1326,7 +1326,7 @@ TEST_P(ParameterizedWebFrameTest, WideDocumentInitializeAtMinimumScale) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
|
| web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "wide_document.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -1525,7 +1525,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp) {
|
| web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
|
| web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
|
| FrameTestHelpers::LoadFrame(
|
| - web_view_helper.WebView()->MainFrame(),
|
| + web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport/viewport-legacy-xhtmlmp.html");
|
|
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
| @@ -2087,7 +2087,7 @@ TEST_P(ParameterizedWebFrameTest,
|
| web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "large-div.html");
|
| web_view_helper.WebView()->UpdateAllLifecyclePhases();
|
|
|
| @@ -2142,7 +2142,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale) {
|
| true);
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "wide_document_width_viewport.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2171,7 +2171,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight) {
|
| true);
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport-height-1000.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2200,7 +2200,7 @@ TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk) {
|
| true);
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport/viewport-30.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2277,7 +2277,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroValuesQuirk) {
|
| web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
|
| web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
|
| true);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport-zero-values.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2308,7 +2308,7 @@ TEST_P(ParameterizedWebFrameTest, OverflowHiddenDisablesScrolling) {
|
|
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "body-overflow-hidden.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2329,7 +2329,7 @@ TEST_P(ParameterizedWebFrameTest,
|
|
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "body-overflow-hidden-short.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2356,7 +2356,7 @@ TEST_F(WebFrameTest, IgnoreOverflowHiddenQuirk) {
|
| web_view_helper.WebView()
|
| ->GetSettings()
|
| ->SetIgnoreMainFrameOverflowHiddenQuirk(true);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "body-overflow-hidden.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2379,7 +2379,7 @@ TEST_P(ParameterizedWebFrameTest, NonZeroValuesNoQuirk) {
|
| web_view_helper.WebView()->GetSettings()->SetViewportMetaZeroValuesQuirk(
|
| true);
|
| web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport-nonzero-values.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2493,7 +2493,7 @@ TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
|
| web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "fixed_layout.html");
|
| web_view_helper.Resize(WebSize(viewport_width, viewport_height));
|
|
|
| @@ -2988,7 +2988,7 @@ TEST_P(ParameterizedWebFrameTest, AtViewportAffectingAtMediaRecalcCount) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
|
| web_view_helper.Resize(WebSize(640, 480));
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport-and-media.html");
|
|
|
| Document* document =
|
| @@ -3014,7 +3014,7 @@ TEST_P(ParameterizedWebFrameTest, AtViewportWithViewportLengths) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
|
| web_view_helper.Resize(WebSize(800, 600));
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "viewport-lengths.html");
|
|
|
| LocalFrameView* view =
|
| @@ -3243,7 +3243,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
|
| &ConfigureCompositingWebView);
|
|
|
| web_view_helper.Resize(WebSize(view_width, view_height));
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "large-div.html");
|
|
|
| LocalFrameView* view =
|
| @@ -4236,11 +4236,11 @@ TEST_P(ParameterizedWebFrameTest, ReloadDoesntSetRedirect) {
|
| web_view_helper.InitializeAndLoad(base_url_ + "form.html", false,
|
| &web_frame_client);
|
|
|
| - web_view_helper.WebView()->MainFrame()->Reload(
|
| + web_view_helper.WebView()->MainFrameImpl()->Reload(
|
| WebFrameLoadType::kReloadBypassingCache);
|
| // start another reload before request is delivered.
|
| FrameTestHelpers::ReloadFrameBypassingCache(
|
| - web_view_helper.WebView()->MainFrame());
|
| + web_view_helper.WebView()->MainFrameImpl());
|
| }
|
|
|
| class ClearScrollStateOnCommitWebFrameClient
|
| @@ -4273,7 +4273,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState) {
|
| web_view_helper.WebView()->SetPageScaleFactor(kPageScaleFactor);
|
|
|
| // Reload the page and end up at the same url. State should not be propagated.
|
| - web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
|
| + web_view_helper.WebView()->MainFrameImpl()->ReloadWithOverrideURL(
|
| ToKURL(base_url_ + first_url), WebFrameLoadType::kReload);
|
| FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
|
| web_view_helper.WebView()->MainFrame());
|
| @@ -4283,7 +4283,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState) {
|
| EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
|
|
|
| // Reload the page using the cache. State should not be propagated.
|
| - web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
|
| + web_view_helper.WebView()->MainFrameImpl()->ReloadWithOverrideURL(
|
| ToKURL(base_url_ + second_url), WebFrameLoadType::kReload);
|
| FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
|
| web_view_helper.WebView()->MainFrame());
|
| @@ -4293,7 +4293,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState) {
|
| EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
|
|
|
| // Reload the page while bypassing the cache. State should not be propagated.
|
| - web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
|
| + web_view_helper.WebView()->MainFrameImpl()->ReloadWithOverrideURL(
|
| ToKURL(base_url_ + third_url), WebFrameLoadType::kReloadBypassingCache);
|
| FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
|
| web_view_helper.WebView()->MainFrame());
|
| @@ -4311,10 +4311,10 @@ TEST_P(ParameterizedWebFrameTest, ReloadWhileProvisional) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize();
|
| WebURLRequest request(ToKURL(base_url_ + "fixed_layout.html"));
|
| - web_view_helper.WebView()->MainFrame()->LoadRequest(request);
|
| + web_view_helper.WebView()->MainFrameImpl()->LoadRequest(request);
|
| // start reload before first request is delivered.
|
| FrameTestHelpers::ReloadFrameBypassingCache(
|
| - web_view_helper.WebView()->MainFrame());
|
| + web_view_helper.WebView()->MainFrameImpl());
|
|
|
| WebDataSource* data_source =
|
| web_view_helper.WebView()->MainFrameImpl()->DataSource();
|
| @@ -4574,7 +4574,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsReload) {
|
|
|
| // Refresh, we should get two release notifications and two more create
|
| // notifications.
|
| - FrameTestHelpers::ReloadFrame(web_view_helper.WebView()->MainFrame());
|
| + FrameTestHelpers::ReloadFrame(web_view_helper.WebView()->MainFrameImpl());
|
| ASSERT_EQ(4u, create_notifications.size());
|
| ASSERT_EQ(2u, release_notifications.size());
|
|
|
| @@ -4821,7 +4821,7 @@ TEST_P(ParameterizedWebFrameTest, ExecuteScriptDuringDidCreateScriptContext) {
|
| web_view_helper.InitializeAndLoad(base_url_ + "hello_world.html", true,
|
| &web_frame_client);
|
|
|
| - FrameTestHelpers::ReloadFrame(web_view_helper.WebView()->MainFrame());
|
| + FrameTestHelpers::ReloadFrame(web_view_helper.WebView()->MainFrameImpl());
|
| }
|
|
|
| class FindUpdateWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
|
| @@ -5963,7 +5963,7 @@ class CompositedSelectionBoundsTest : public WebFrameTest {
|
| void RunTestWithNoSelection(const char* test_file) {
|
| RegisterMockedHttpURLLoad(test_file);
|
| web_view_helper_.WebView()->SetFocus(true);
|
| - FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrameImpl(),
|
| base_url_ + test_file);
|
| web_view_helper_.WebView()->UpdateAllLifecyclePhases();
|
|
|
| @@ -5980,7 +5980,7 @@ class CompositedSelectionBoundsTest : public WebFrameTest {
|
| void RunTest(const char* test_file) {
|
| RegisterMockedHttpURLLoad(test_file);
|
| web_view_helper_.WebView()->SetFocus(true);
|
| - FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrameImpl(),
|
| base_url_ + test_file);
|
| web_view_helper_.WebView()->UpdateAllLifecyclePhases();
|
|
|
| @@ -6484,7 +6484,7 @@ TEST_P(ParameterizedWebFrameTest, ReplaceNavigationAfterHistoryNavigation) {
|
|
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.InitializeAndLoad("about:blank", true, &web_frame_client);
|
| - WebFrame* frame = web_view_helper.WebView()->MainFrame();
|
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();
|
|
|
| // Load a url as a history navigation that will return an error.
|
| // TestSubstituteDataWebFrameClient will start a SubstituteData load in
|
| @@ -7011,7 +7011,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentViaJavascriptUrl) {
|
| EXPECT_EQ(0, web_frame_client.did_access_initial_document_);
|
|
|
| // Access the initial document from a javascript: URL.
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.body.appendChild(document."
|
| "createTextNode('Modified'))");
|
| EXPECT_EQ(1, web_frame_client.did_access_initial_document_);
|
| @@ -7348,7 +7348,7 @@ TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload) {
|
| true);
|
| WebLocalFrameBase* main_frame = web_view_helper.LocalMainFrame();
|
| const FrameLoader& main_frame_loader = main_frame->GetFrame()->Loader();
|
| - WebFrame* child_frame = main_frame->FirstChild();
|
| + WebLocalFrame* child_frame = main_frame->FirstChild()->ToWebLocalFrame();
|
| ASSERT_TRUE(child_frame);
|
|
|
| // Start a history navigation, then have a different frame commit a
|
| @@ -7378,7 +7378,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadPost) {
|
| web_view_helper.InitializeAndLoad(base_url_ + "reload_post.html", true);
|
| WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();
|
|
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| "javascript:document.forms[0].submit()");
|
| // Pump requests one more time after the javascript URL has executed to
|
| // trigger the actual POST load request.
|
| @@ -7572,7 +7572,7 @@ TEST_P(ParameterizedWebFrameTest,
|
| &ConfigureLoadsImagesAutomatically);
|
|
|
| WebCache::Clear();
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "foo_with_image.html");
|
|
|
| // 2 images are requested, and each triggers 2 willSendRequest() calls,
|
| @@ -7737,7 +7737,7 @@ TEST_P(ParameterizedWebFrameTest, FirstBlankSubframeNavigation) {
|
| frame->ExecuteScript(WebScriptSource(WebString::FromUTF8(
|
| "document.body.appendChild(document.createElement('iframe'))")));
|
|
|
| - WebFrame* iframe = frame->FirstChild();
|
| + WebLocalFrame* iframe = frame->FirstChild()->ToWebLocalFrame();
|
| ASSERT_EQ(&client.ChildClient(), ToWebLocalFrameBase(iframe)->Client());
|
|
|
| std::string url1 = base_url_ + "history.html";
|
| @@ -7761,7 +7761,7 @@ TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation) {
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.InitializeAndLoad("about:blank", true, &client);
|
|
|
| - WebFrame* frame = web_view_helper.WebView()->MainFrame();
|
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();
|
|
|
| std::string url1 = base_url_ + "history.html";
|
| FrameTestHelpers::LoadFrame(
|
| @@ -7772,7 +7772,7 @@ TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation) {
|
| "';"
|
| "document.body.appendChild(f)");
|
|
|
| - WebFrame* iframe = frame->FirstChild();
|
| + WebLocalFrame* iframe = frame->FirstChild()->ToWebLocalFrame();
|
| EXPECT_EQ(url1, iframe->GetDocument().Url().GetString().Utf8());
|
|
|
| std::string url2 = base_url_ + "find.html";
|
| @@ -7793,7 +7793,7 @@ TEST_F(WebFrameTest, overflowHiddenRewrite) {
|
| &ConfigureCompositingWebView);
|
|
|
| web_view_helper.Resize(WebSize(100, 100));
|
| - FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
|
| + FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrameImpl(),
|
| base_url_ + "non-scrollable.html");
|
|
|
| PaintLayerCompositor* compositor = web_view_helper.WebView()->Compositor();
|
| @@ -7821,7 +7821,7 @@ TEST_P(ParameterizedWebFrameTest, CurrentHistoryItem) {
|
|
|
| FrameTestHelpers::WebViewHelper web_view_helper;
|
| web_view_helper.Initialize();
|
| - WebFrame* frame = web_view_helper.WebView()->MainFrame();
|
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();
|
| const FrameLoader& main_frame_loader =
|
| web_view_helper.WebView()->MainFrameImpl()->GetFrame()->Loader();
|
| WebURLRequest request(ToKURL(url));
|
| @@ -10877,7 +10877,7 @@ TEST_F(WebFrameTest, ChangeResourcePriority) {
|
| helper.Initialize(true, &client);
|
| helper.Resize(WebSize(640, 480));
|
| FrameTestHelpers::LoadFrame(
|
| - helper.WebView()->MainFrame(),
|
| + helper.WebView()->MainFrameImpl(),
|
| base_url_ + "promote_img_in_viewport_priority.html");
|
|
|
| // Ensure the image in the viewport got promoted after the request was sent.
|
|
|