Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2934853002: [Refactor] Use correct viewport style in Android tests (Closed)
Patch Set: bokan comments addressed 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 | « no previous file | third_party/WebKit/Source/web/tests/data/overscroll/div-overscroll.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..958cf412ded70806a0b6b0771a92b17b37e67e38 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) {
@@ -1089,14 +1084,6 @@ class FixedLayoutTestWebViewClient
class FakeCompositingWebViewClient : public FixedLayoutTestWebViewClient {};
-// Viewport settings need to be set before the page gets loaded
-void EnableViewportSettings(WebSettings* settings) {
- settings->SetViewportMetaEnabled(true);
- settings->SetViewportEnabled(true);
- settings->SetMainFrameResizesAreOrientationChanges(true);
- settings->SetShrinksViewportContentToFit(true);
-}
-
// Helper function to set autosizing multipliers on a document.
bool SetTextAutosizingMultiplier(Document* document, float multiplier) {
bool multiplier_set = false;
@@ -1138,7 +1125,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
Document* document =
ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
@@ -1194,7 +1181,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "iframe_reload.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
LocalFrame* main_frame =
ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame());
@@ -1239,8 +1226,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroHeightPositiveWidthNotIgnored) {
int viewport_height = 0;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
EXPECT_EQ(viewport_width, web_view_helper.WebView()
@@ -1268,7 +1254,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1296,8 +1282,7 @@ TEST_P(ParameterizedWebFrameTest, FixedLayoutInitializeAtMinimumScale) {
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
base_url_ + "fixed_layout.html");
@@ -1339,8 +1324,7 @@ TEST_P(ParameterizedWebFrameTest, WideDocumentInitializeAtMinimumScale) {
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
base_url_ + "wide_document.html");
@@ -1381,7 +1365,7 @@ TEST_P(ParameterizedWebFrameTest, DelayedViewportInitialScale) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
EXPECT_EQ(0.25f, web_view_helper.WebView()->PageScaleFactor());
@@ -1407,7 +1391,7 @@ TEST_P(ParameterizedWebFrameTest, setLoadWithOverviewModeToFalse) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1427,7 +1411,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
@@ -1449,7 +1433,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidth) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1480,7 +1464,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1511,8 +1495,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithoutViewportTag) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
- ApplyViewportStyleOverride(&web_view_helper);
+ ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1538,9 +1521,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp) {
int viewport_height = 480;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
- ApplyViewportStyleOverride(&web_view_helper);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
FrameTestHelpers::LoadFrame(
@@ -1571,7 +1552,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndHeightInMeta) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "viewport-height-1000.html",
true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1594,8 +1575,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithAutoWidth) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-2x-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
- ApplyViewportStyleOverride(&web_view_helper);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1624,7 +1604,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1643,8 +1623,7 @@ TEST_P(ParameterizedWebFrameTest, setInitialPageScaleFactorPermanently) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
- ApplyViewportStyleOverride(&web_view_helper);
+ ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
web_view_helper.WebView()->SetInitialPageScaleOverride(
@@ -1679,7 +1658,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-auto-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
web_view_helper.WebView()->SetInitialPageScaleOverride(
enforced_page_scale_factor);
@@ -1702,7 +1681,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-wide-2x-initial-scale.html", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetInitialPageScaleOverride(
enforced_page_scale_factor);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -1735,9 +1714,7 @@ TEST_P(ParameterizedWebFrameTest,
for (int quirk_enabled = 0; quirk_enabled <= 1; ++quirk_enabled) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + pages[i], true, nullptr,
- &client, nullptr,
- EnableViewportSettings);
- ApplyViewportStyleOverride(&web_view_helper);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()
->GetSettings()
->SetClobberUserAgentInitialScaleQuirk(quirk_enabled);
@@ -1765,7 +1742,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(false);
@@ -1895,7 +1872,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeight) {
web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
EXPECT_LE(viewport_height, web_view_helper.WebView()
@@ -2106,7 +2083,7 @@ TEST_P(ParameterizedWebFrameTest,
web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -2134,7 +2111,7 @@ TEST_P(ParameterizedWebFrameTest,
web_view_helper.InitializeAndLoad(base_url_ + "200-by-300.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
web_view_helper.WebView()->GetSettings()->SetForceZeroLayoutHeight(true);
@@ -2158,7 +2135,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
@@ -2187,7 +2164,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
@@ -2216,7 +2193,7 @@ TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad("about:blank", true, nullptr, &client,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(true);
web_view_helper.WebView()->GetSettings()->SetViewportMetaLayoutSizeQuirk(
@@ -2294,8 +2271,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroValuesQuirk) {
int viewport_height = 480;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetViewportMetaZeroValuesQuirk(
true);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
@@ -2399,8 +2375,7 @@ TEST_P(ParameterizedWebFrameTest, NonZeroValuesNoQuirk) {
float expected_page_scale_factor = 0.5f;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetViewportMetaZeroValuesQuirk(
true);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
@@ -2441,7 +2416,7 @@ TEST_P(ParameterizedWebFrameTest, setPageScaleFactorDoesNotLayout) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
int prev_layout_count =
@@ -2469,7 +2444,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
int prev_layout_count =
@@ -2496,7 +2471,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorWrittenToHistoryItem) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
web_view_helper.WebView()->SetPageScaleFactor(3);
@@ -2516,8 +2491,7 @@ TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem) {
int viewport_height = 480;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
base_url_ + "fixed_layout.html");
@@ -2545,7 +2519,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesntShrinkFrameView) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
LocalFrameView* view =
@@ -2590,7 +2564,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesNotApplyCssTransform) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
web_view_helper.WebView()->SetPageScaleFactor(2);
@@ -2624,7 +2598,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-target-densitydpi-high.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()
->GetSettings()
@@ -2669,7 +2643,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-target-densitydpi-device.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()
->GetSettings()
@@ -2711,7 +2685,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-target-densitydpi-device-and-fixed-width.html",
- true, nullptr, &client, nullptr, EnableViewportSettings);
+ true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()
->GetSettings()
@@ -2748,7 +2722,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndScaleLessThanOne) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-initial-scale-less-than-1.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()
->GetSettings()
->SetSupportDeprecatedTargetDensityDPI(true);
@@ -2787,7 +2761,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-initial-scale-less-than-1-device-width.html", true,
- nullptr, &client, nullptr, EnableViewportSettings);
+ nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()
->GetSettings()
->SetSupportDeprecatedTargetDensityDPI(true);
@@ -2827,7 +2801,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "large-div.html", true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
@@ -2863,7 +2837,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScale) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-initial-scale-and-user-scalable-no.html", true,
- nullptr, &client, nullptr, EnableViewportSettings);
+ nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetViewportMetaNonUserScalableQuirk(
true);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -2897,7 +2871,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-initial-scale-and-user-scalable-no.html", true,
- nullptr, &client, nullptr, EnableViewportSettings);
+ nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()
->GetSettings()
->SetSupportDeprecatedTargetDensityDPI(true);
@@ -2936,7 +2910,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "viewport-2x-initial-scale-non-user-scalable.html", true,
- nullptr, &client, nullptr, EnableViewportSettings);
+ nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.WebView()->GetSettings()->SetViewportMetaNonUserScalableQuirk(
true);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
@@ -2971,7 +2945,7 @@ TEST_P(ParameterizedWebFrameTest,
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "no_viewport_tag.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetUseWideViewport(false);
@@ -2989,7 +2963,7 @@ TEST_P(ParameterizedWebFrameTest, AtViewportInsideAtMediaInitialViewport) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "viewport-inside-media.html",
true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(640, 480));
EXPECT_EQ(2000, web_view_helper.WebView()
@@ -3012,8 +2986,7 @@ TEST_P(ParameterizedWebFrameTest, AtViewportAffectingAtMediaRecalcCount) {
FixedLayoutTestWebViewClient client;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(640, 480));
FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
base_url_ + "viewport-and-media.html");
@@ -3039,8 +3012,7 @@ TEST_P(ParameterizedWebFrameTest, AtViewportWithViewportLengths) {
FixedLayoutTestWebViewClient client;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, &client, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(800, 600));
FrameTestHelpers::LoadFrame(web_view_helper.WebView()->MainFrame(),
base_url_ + "viewport-lengths.html");
@@ -3079,7 +3051,7 @@ class WebFrameResizeTest : public ParameterizedWebFrameTest {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + url, true, nullptr, nullptr,
- nullptr, EnableViewportSettings);
+ nullptr, ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
// Origin scrollOffsets preserved under resize.
@@ -3199,7 +3171,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorUpdatesScrollbars) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "fixed_layout.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
LocalFrameView* view =
@@ -3230,7 +3202,7 @@ TEST_P(ParameterizedWebFrameTest, CanOverrideScaleLimits) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "no_scale_for_you.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->SetDefaultPageScaleLimits(0.25f, 5);
web_view_helper.Resize(WebSize(viewport_width, viewport_height));
@@ -6303,7 +6275,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite) {
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + html_file, true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
@@ -6337,7 +6309,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite) {
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + html_file, true, nullptr,
- &client, nullptr, EnableViewportSettings);
+ &client, nullptr, ConfigureAndroid);
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
@@ -7907,7 +7879,7 @@ TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(
base_url_ + "fixed-position-in-fixed-viewport.html", true, nullptr,
- nullptr, nullptr, EnableViewportSettings);
+ nullptr, nullptr, ConfigureAndroid);
WebViewBase* web_view = web_view_helper.WebView();
web_view_helper.Resize(WebSize(100, 100));
@@ -8029,7 +8001,7 @@ TEST_F(WebFrameTest, MaximumScrollPositionCanBeNegative) {
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + "rtl-overview-mode.html", true,
nullptr, &client, nullptr,
- EnableViewportSettings);
+ ConfigureAndroid);
web_view_helper.WebView()->SetInitialPageScaleOverride(-1);
web_view_helper.WebView()->GetSettings()->SetWideViewportQuirkEnabled(true);
web_view_helper.WebView()->GetSettings()->SetLoadWithOverviewMode(true);
@@ -11014,27 +10986,28 @@ TEST_F(WebFrameTest, RootLayerMinimumHeight) {
constexpr int kBrowserControlsHeight = 100;
FrameTestHelpers::WebViewHelper web_view_helper;
- web_view_helper.Initialize(true, nullptr, nullptr, nullptr,
- EnableViewportSettings);
+ web_view_helper.Initialize(true, nullptr, nullptr, nullptr, ConfigureAndroid);
WebViewBase* web_view = web_view_helper.WebView();
web_view->ResizeWithBrowserControls(
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 »

Powered by Google App Engine
This is Rietveld 408576698