third_party/WebKit/Source/web/tests/WebFrameTest.cpp - Issue 2934853002: [Refactor] Use correct viewport style in Android tests

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

Issue 2934853002: [Refactor] Use correct viewport style in Android tests (Closed)

Patch Set: 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

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 9171bd5cc3b82ab1103805ef8f886273ff137fd7..52919cde63df29b9511eaaace6438c70b60dfb31 100644

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

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

@@ -255,12 +255,6 @@ class WebFrameTest : public ::testing::Test {

WebString::FromUTF8(file_name), WebString::FromUTF8(mime_type));

}

- void ApplyViewportStyleOverride(

- FrameTestHelpers::WebViewHelper* web_view_helper) {

- web_view_helper->WebView()->GetSettings()->SetViewportStyle(

- WebViewportStyle::kMobile);

- }

static void ConfigureCompositingWebView(WebSettings* settings) {

settings->SetAcceleratedCompositingEnabled(true);

settings->SetPreferCompositingToLCDTextEnabled(true);

@@ -271,6 +265,7 @@ class WebFrameTest : public ::testing::Test {

settings->SetViewportEnabled(true);

settings->SetMainFrameResizesAreOrientationChanges(true);

settings->SetShrinksViewportContentToFit(true);

+ settings->SetViewportStyle(WebViewportStyle::kMobile);

}

static void ConfigureLoadsImagesAutomatically(WebSettings* settings) {

@@ -1095,6 +1090,7 @@ void EnableViewportSettings(WebSettings* settings) {

settings->SetViewportEnabled(true);

settings->SetMainFrameResizesAreOrientationChanges(true);

settings->SetShrinksViewportContentToFit(true);

+ settings->SetViewportStyle(WebViewportStyle::kMobile);

}

// Helper function to set autosizing multipliers on a document.

@@ -1512,7 +1508,6 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithoutViewportTag) {

web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,

nullptr, &client, nullptr,

EnableViewportSettings);

- ApplyViewportStyleOverride(&web_view_helper);

web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);

web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);

web_view_helper.Resize(WebSize(viewport_width, viewport_height));

@@ -1540,7 +1535,6 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp) {

FrameTestHelpers::WebViewHelper web_view_helper;

web_view_helper.Initialize(true, nullptr, &client, nullptr,

EnableViewportSettings);

- ApplyViewportStyleOverride(&web_view_helper);

web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);

web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);

FrameTestHelpers::LoadFrame(

@@ -1595,7 +1589,6 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithAutoWidth) {

web_view_helper.InitializeAndLoad(

base_url_ + "viewport-2x-initial-scale.html", true, nullptr, &client,

nullptr, EnableViewportSettings);

- ApplyViewportStyleOverride(&web_view_helper);

web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);

web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);

web_view_helper.Resize(WebSize(viewport_width, viewport_height));

@@ -1644,7 +1637,6 @@ TEST_P(ParameterizedWebFrameTest, setInitialPageScaleFactorPermanently) {

web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,

nullptr, &client, nullptr,

EnableViewportSettings);

- ApplyViewportStyleOverride(&web_view_helper);

web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);

web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);

web_view_helper.WebView()->SetInitialPageScaleOverride(

@@ -1737,7 +1729,6 @@ TEST_P(ParameterizedWebFrameTest,

web_view_helper.InitializeAndLoad(base_url_ + pages[i], true, nullptr,

&client, nullptr,

EnableViewportSettings);

- ApplyViewportStyleOverride(&web_view_helper);

web_view_helper.WebView()

->GetSettings()

->SetClobberUserAgentInitialScaleQuirk(quirk_enabled);

@@ -10310,7 +10301,7 @@ TEST_P(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerDivOverScroll) {

// Now On Scrolling DIV, scroll is bubbled and root layer is over-scrolled.

EXPECT_CALL(client, DidOverscroll(WebFloatSize(0, 50), WebFloatSize(0, 50),

WebFloatPoint(100, 100), WebFloatSize()));

- ScrollUpdate(&web_view_helper, 0, -150);

+ ScrollUpdate(&web_view_helper, 0, -250);

bokan 2017/06/12 16:06:11 Eh, why did this change? Didn't we see this work w

chaopeng 2017/06/12 16:29:21 Forgot revert this one.

Mock::VerifyAndClearExpectations(&client);

}

@@ -11021,20 +11012,22 @@ TEST_F(WebFrameTest, RootLayerMinimumHeight) {

WebSize(kViewportWidth, kViewportHeight - kBrowserControlsHeight),

kBrowserControlsHeight, true);

- InitializeWithHTML(*web_view->MainFrameImpl()->GetFrame(),

- "<!DOCTYPE html>"

- "<style>"

- " html, body {width:100%;height:540px;margin:0px}"

- " #elem {"

- " overflow: scroll;"

- " width: 100px;"

- " height: 10px;"

- " position: fixed;"

- " left: 0px;"

- " bottom: 0px;"

- " }"

- "</style>"

- "<div id='elem'></div>");

+ InitializeWithHTML(

+ *web_view->MainFrameImpl()->GetFrame(),

+ "<!DOCTYPE html>"

+ "<meta name='viewport' content='width=device-width, initial-scale=1'>"

+ "<style>"

+ " html, body {width:100%;height:540px;margin:0px}"

+ " #elem {"

+ " overflow: scroll;"

+ " width: 100px;"

+ " height: 10px;"

+ " position: fixed;"

+ " left: 0px;"

+ " bottom: 0px;"

+ " }"

+ "</style>"

+ "<div id='elem'></div>");

web_view->UpdateAllLifecyclePhases();

Document* document = web_view->MainFrameImpl()->GetFrame()->GetDocument();

« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/data/overscroll/div-overscroll.html » ('j') | no next file with comments »