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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23819019: Refactor fixed layout mode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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 | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 3e35914aa1bc22703e936cf469563e57a99e5db8..4ff49871dfe87f0350d7338a60cd33c9824f86c7 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -173,7 +173,6 @@ protected:
{
webViewHelper->initializeAndLoad(url, true);
webViewHelper->webView()->settings()->setDefaultFontSize(12);
- webViewHelper->webView()->enableFixedLayoutMode(false);
webViewHelper->webView()->resize(WebSize(640, 480));
}
@@ -587,6 +586,7 @@ class FixedLayoutTestWebViewClient : public WebViewClient {
TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
FixedLayoutTestWebViewClient client;
@@ -597,12 +597,11 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
- webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->setFixedLayoutSize(WebCore::IntSize(100, 100));
+ webViewHelper.webViewImpl()->setFixedLayoutSize(WebCore::IntSize(100, 100));
EXPECT_TRUE(webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->needsLayout());
int prevLayoutCount = webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutCount();
@@ -614,6 +613,7 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)
TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
FixedLayoutTestWebViewClient client;
@@ -624,7 +624,6 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
WebCore::Document* document = webViewHelper.webViewImpl()->page()->mainFrame()->document();
@@ -649,7 +648,7 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
// Choose a width that's not going match the viewport width of the loaded document.
description.minWidth = WebCore::Length(100, WebCore::Fixed);
description.maxWidth = WebCore::Length(100, WebCore::Fixed);
- webViewHelper.webViewImpl()->updatePageDefinedPageScaleConstraints(description);
+ webViewHelper.webViewImpl()->updatePageDefinedViewportConstraints(description);
bool multiplierCheckedAtLeastOnce = false;
renderer = document->renderer();
@@ -665,6 +664,7 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
TEST_F(WebFrameTest, FixedLayoutSizeStopsResizeFromChangingLayoutSize)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
int viewportWidth = 640;
@@ -675,18 +675,18 @@ TEST_F(WebFrameTest, FixedLayoutSizeStopsResizeFromChangingLayoutSize)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->setFixedLayoutSize(WebSize(fixedLayoutWidth, fixedLayoutHeight));
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
- EXPECT_EQ(fixedLayoutWidth, webViewHelper.webView()->fixedLayoutSize().width);
- EXPECT_EQ(fixedLayoutHeight, webViewHelper.webView()->fixedLayoutSize().height);
+ EXPECT_EQ(fixedLayoutWidth, webViewHelper.webViewImpl()->page()->mainFrame()->view()->layoutSize().width());
+ EXPECT_EQ(fixedLayoutHeight, webViewHelper.webViewImpl()->page()->mainFrame()->view()->layoutSize().height());
}
TEST_F(WebFrameTest, FixedLayoutSizePreventsResizeFromChangingPageScale)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
int viewportWidth = 640;
@@ -697,7 +697,6 @@ TEST_F(WebFrameTest, FixedLayoutSizePreventsResizeFromChangingPageScale)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->setFixedLayoutSize(WebSize(fixedLayoutWidth, fixedLayoutHeight));
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -711,6 +710,7 @@ TEST_F(WebFrameTest, FixedLayoutSizePreventsResizeFromChangingPageScale)
TEST_F(WebFrameTest, FixedLayoutSizePreventsLayoutFromChangingPageScale)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
int viewportWidth = 640;
@@ -721,7 +721,6 @@ TEST_F(WebFrameTest, FixedLayoutSizePreventsLayoutFromChangingPageScale)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->setFixedLayoutSize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -736,6 +735,7 @@ TEST_F(WebFrameTest, FixedLayoutSizePreventsLayoutFromChangingPageScale)
TEST_F(WebFrameTest, PreferredSizeAndContentSizeReportedCorrectlyWithZeroHeightFixedLayout)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("200-by-300.html");
int windowWidth = 100;
@@ -750,7 +750,6 @@ TEST_F(WebFrameTest, PreferredSizeAndContentSizeReportedCorrectlyWithZeroHeightF
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(windowWidth, windowHeight));
webViewHelper.webView()->setFixedLayoutSize(WebSize(viewportWidth, viewportHeight));
@@ -765,6 +764,7 @@ TEST_F(WebFrameTest, PreferredSizeAndContentSizeReportedCorrectlyWithZeroHeightF
TEST_F(WebFrameTest, DisablingFixedLayoutSizeSetsCorrectLayoutSize)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("no_viewport_tag.html");
FixedLayoutTestWebViewClient client;
@@ -775,7 +775,6 @@ TEST_F(WebFrameTest, DisablingFixedLayoutSizeSetsCorrectLayoutSize)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -793,6 +792,7 @@ TEST_F(WebFrameTest, DisablingFixedLayoutSizeSetsCorrectLayoutSize)
TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("no_viewport_tag.html");
int viewportWidth = 640;
@@ -805,7 +805,6 @@ TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
webViewHelper.webView()->settings()->setViewportEnabled(true);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -836,7 +835,6 @@ TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -876,7 +874,6 @@ TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "wide_document.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -903,6 +900,7 @@ TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
TEST_F(WebFrameTest, setLoadWithOverviewModeToFalse)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-auto-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -912,7 +910,6 @@ TEST_F(WebFrameTest, setLoadWithOverviewModeToFalse)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
@@ -924,6 +921,7 @@ TEST_F(WebFrameTest, setLoadWithOverviewModeToFalse)
TEST_F(WebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewport)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("large-div.html");
FixedLayoutTestWebViewClient client;
@@ -933,7 +931,6 @@ TEST_F(WebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewport)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -946,6 +943,7 @@ TEST_F(WebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewport)
TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidth)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-auto-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -955,7 +953,6 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidth)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -968,6 +965,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidth)
TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccountsScale)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -977,13 +975,12 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccountsScale)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- // The page sets viewport width to 3000, but with UseWideViewport == false is must be ignored.
+ // The page sets viewport width to 3000, but with UseWideViewport == false it must be ignored.
// While the initial scale specified by the page must be accounted.
EXPECT_EQ(viewportWidth / 2, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->contentsSize().width());
EXPECT_EQ(viewportHeight / 2, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->contentsSize().height());
@@ -991,6 +988,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccountsScale)
TEST_F(WebFrameTest, WideViewportSetsTo980WithoutViewportTag)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("no_viewport_tag.html");
FixedLayoutTestWebViewClient client;
@@ -1000,7 +998,6 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithoutViewportTag)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
@@ -1012,6 +1009,7 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithoutViewportTag)
TEST_F(WebFrameTest, NoWideViewportAndHeightInMeta)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-height-1000.html");
FixedLayoutTestWebViewClient client;
@@ -1021,7 +1019,6 @@ TEST_F(WebFrameTest, NoWideViewportAndHeightInMeta)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-height-1000.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.webView()->settings()->setViewportEnabled(true);
@@ -1032,6 +1029,7 @@ TEST_F(WebFrameTest, NoWideViewportAndHeightInMeta)
TEST_F(WebFrameTest, WideViewportSetsTo980WithAutoWidth)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-2x-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -1041,7 +1039,6 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithAutoWidth)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
@@ -1053,6 +1050,7 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithAutoWidth)
TEST_F(WebFrameTest, PageViewportInitialScaleOverridesLoadWithOverviewMode)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -1062,7 +1060,6 @@ TEST_F(WebFrameTest, PageViewportInitialScaleOverridesLoadWithOverviewMode)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -1086,7 +1083,6 @@ TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->layout();
@@ -1106,6 +1102,7 @@ TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMode)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-auto-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -1116,7 +1113,6 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMod
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePactor);
@@ -1127,6 +1123,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMod
TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitialScale)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-wide-2x-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -1137,7 +1134,6 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitial
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScalePactor);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -1147,6 +1143,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitial
TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-device-0.5x-initial-scale.html");
FixedLayoutTestWebViewClient client;
@@ -1156,18 +1153,18 @@ TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-device-0.5x-initial-scale.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportMetaLayoutSizeQuirk(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->fixedLayoutSize().width());
+ EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
}
TEST_F(WebFrameTest, WideViewportAndWideContentWithInitialScale)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("wide_document_width_viewport.html");
FixedLayoutTestWebViewClient client;
@@ -1177,7 +1174,6 @@ TEST_F(WebFrameTest, WideViewportAndWideContentWithInitialScale)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1196,6 +1192,7 @@ TEST_F(WebFrameTest, WideViewportAndWideContentWithInitialScale)
TEST_F(WebFrameTest, ZeroValuesQuirk)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-zero-values.html");
FixedLayoutTestWebViewClient client;
@@ -1205,7 +1202,6 @@ TEST_F(WebFrameTest, ZeroValuesQuirk)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1213,12 +1209,12 @@ TEST_F(WebFrameTest, ZeroValuesQuirk)
Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->fixedLayoutSize().width());
+ EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
EXPECT_EQ(1.0f, webViewHelper.webView()->pageScaleFactor());
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->layout();
- EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->fixedLayoutSize().width());
+ EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
EXPECT_EQ(1.0f, webViewHelper.webView()->pageScaleFactor());
}
@@ -1263,6 +1259,7 @@ TEST_F(WebFrameTest, IgnoreOverflowHiddenQuirk)
TEST_F(WebFrameTest, NonZeroValuesNoQuirk)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("viewport-nonzero-values.html");
FixedLayoutTestWebViewClient client;
@@ -1273,7 +1270,6 @@ TEST_F(WebFrameTest, NonZeroValuesNoQuirk)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1281,17 +1277,18 @@ TEST_F(WebFrameTest, NonZeroValuesNoQuirk)
Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- EXPECT_EQ(viewportWidth / expectedPageScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->fixedLayoutSize().width());
+ EXPECT_EQ(viewportWidth / expectedPageScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScaleFactor());
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->layout();
- EXPECT_EQ(viewportWidth / expectedPageScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->fixedLayoutSize().width());
+ EXPECT_EQ(viewportWidth / expectedPageScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
EXPECT_EQ(expectedPageScaleFactor, webViewHelper.webView()->pageScaleFactor());
}
TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("scale_oscillate.html");
FixedLayoutTestWebViewClient client;
@@ -1301,7 +1298,6 @@ TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "scale_oscillate.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1309,6 +1305,7 @@ TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
TEST_F(WebFrameTest, setPageScaleFactorDoesNotLayout)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
FixedLayoutTestWebViewClient client;
@@ -1319,7 +1316,6 @@ TEST_F(WebFrameTest, setPageScaleFactorDoesNotLayout)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1343,7 +1339,6 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1372,6 +1367,7 @@ TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView)
TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
FixedLayoutTestWebViewClient client;
@@ -1381,7 +1377,6 @@ TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1395,6 +1390,7 @@ TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("large-div.html");
FixedLayoutTestWebViewClient client;
@@ -1405,7 +1401,6 @@ TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1431,6 +1426,7 @@ TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)
TEST_F(WebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad("fixed_layout.html");
FixedLayoutTestWebViewClient client;
@@ -1440,7 +1436,6 @@ TEST_F(WebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1470,7 +1465,6 @@ TEST_F(WebFrameTest, targetDensityDpiHigh)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -1479,8 +1473,8 @@ TEST_F(WebFrameTest, targetDensityDpiHigh)
// We need to account for the fact that logical pixels are unconditionally multiplied by deviceScaleFactor to produce
// physical pixels.
float densityDpiScaleRatio = deviceScaleFactor * targetDpi / deviceDpi;
- EXPECT_NEAR(viewportWidth * densityDpiScaleRatio, webViewHelper.webView()->fixedLayoutSize().width, 1.0f);
- EXPECT_NEAR(viewportHeight * densityDpiScaleRatio, webViewHelper.webView()->fixedLayoutSize().height, 1.0f);
+ EXPECT_NEAR(viewportWidth * densityDpiScaleRatio, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
+ EXPECT_NEAR(viewportHeight * densityDpiScaleRatio, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
EXPECT_NEAR(1.0f / densityDpiScaleRatio, webViewHelper.webView()->pageScaleFactor(), 0.01f);
}
}
@@ -1501,14 +1495,13 @@ TEST_F(WebFrameTest, targetDensityDpiDevice)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->fixedLayoutSize().width, 1.0f);
- EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->fixedLayoutSize().height, 1.0f);
+ EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
+ EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->pageScaleFactor(), 0.01f);
}
}
@@ -1529,15 +1522,14 @@ TEST_F(WebFrameTest, targetDensityDpiDeviceAndFixedWidth)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device-and-fixed-width.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- EXPECT_NEAR(viewportWidth, webViewHelper.webView()->fixedLayoutSize().width, 1.0f);
- EXPECT_NEAR(viewportHeight, webViewHelper.webView()->fixedLayoutSize().height, 1.0f);
+ EXPECT_NEAR(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
+ EXPECT_NEAR(viewportHeight, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
EXPECT_NEAR(1.0f, webViewHelper.webView()->pageScaleFactor(), 0.01f);
}
}
@@ -1553,7 +1545,6 @@ TEST_F(WebFrameTest, NoWideViewportAndScaleLessThanOne)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1561,8 +1552,8 @@ TEST_F(WebFrameTest, NoWideViewportAndScaleLessThanOne)
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
- EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->fixedLayoutSize().width, 1.0f);
- EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->fixedLayoutSize().height, 1.0f);
+ EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
+ EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
EXPECT_NEAR(1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->pageScaleFactor(), 0.01f);
}
@@ -1577,7 +1568,6 @@ TEST_F(WebFrameTest, NoWideViewportAndScaleLessThanOneWithDeviceWidth)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1-device-width.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1586,8 +1576,8 @@ TEST_F(WebFrameTest, NoWideViewportAndScaleLessThanOneWithDeviceWidth)
webViewHelper.webView()->layout();
const float pageZoom = 0.25f;
- EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor / pageZoom, webViewHelper.webView()->fixedLayoutSize().width, 1.0f);
- EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor / pageZoom, webViewHelper.webView()->fixedLayoutSize().height, 1.0f);
+ EXPECT_NEAR(viewportWidth * client.m_screenInfo.deviceScaleFactor / pageZoom, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width(), 1.0f);
+ EXPECT_NEAR(viewportHeight * client.m_screenInfo.deviceScaleFactor / pageZoom, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height(), 1.0f);
EXPECT_NEAR(pageZoom * 1.0f / client.m_screenInfo.deviceScaleFactor, webViewHelper.webView()->pageScaleFactor(), 0.01f);
}
@@ -1606,14 +1596,14 @@ protected:
const WebSize scrollOffset,
const WebSize viewportSize,
const bool shouldScaleRelativeToViewportWidth) {
+ UseMockScrollbarSettings mockScrollbarSettings;
registerMockedHttpURLLoad(url);
const float aspectRatio = static_cast<float>(viewportSize.width) / viewportSize.height;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + url, true);
+ webViewHelper.initializeAndLoad(m_baseURL + url, true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
- webViewHelper.webView()->enableFixedLayoutMode(true);
// Origin scrollOffsets preserved under resize.
{
@@ -1721,7 +1711,6 @@ TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1763,7 +1752,6 @@ TEST_F(WebFrameTest, pageScaleFactorUpdatesScrollbars)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -1791,7 +1779,6 @@ TEST_F(WebFrameTest, CanOverrideScaleLimits)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -1859,7 +1846,6 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)
webViewHelper.webView()->setPageScaleFactorLimits(0.01f, 4);
webViewHelper.webView()->setPageScaleFactor(0.5f, WebPoint(0, 0));
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->layout();
WebRect wideDiv(200, 100, 400, 150);
@@ -1936,7 +1922,6 @@ TEST_F(WebFrameTest, DivAutoZoomWideDivTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactorLimits(1.0f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -1970,7 +1955,7 @@ TEST_F(WebFrameTest, DivAutoZoomVeryTallTest)
int viewportHeight = 1280 / deviceScaleFactor;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
+ webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactorLimits(1.0f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -1998,7 +1983,6 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactorLimits(0.5f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2047,7 +2031,6 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(1.5f);
webViewHelper.webView()->layout();
@@ -2110,7 +2093,6 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
float textAutosizingFontScaleFactor = 1.13f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->layout();
@@ -2189,7 +2171,6 @@ TEST_F(WebFrameTest, DivMultipleTargetZoomMultipleDivsTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactorLimits(0.5f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2226,7 +2207,6 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
float minReadableCaretHeight = 18.0f;
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_scale_for_zoom_into_editable_test.html");
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactorLimits(1, 4);
webViewHelper.webView()->layout();
@@ -3515,6 +3495,7 @@ TEST_F(WebFrameTest, DisambiguationPopupNoContainer)
TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
const std::string htmlFile = "disambiguation_popup_mobile_site.html";
registerMockedHttpURLLoad(htmlFile);
@@ -3524,7 +3505,6 @@ TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(1000, 1000));
webViewHelper.webView()->layout();
@@ -3552,6 +3532,7 @@ TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
TEST_F(WebFrameTest, DisambiguationPopupViewportSite)
{
+ UseMockScrollbarSettings mockScrollbarSettings;
const std::string htmlFile = "disambiguation_popup_viewport_site.html";
registerMockedHttpURLLoad(htmlFile);
@@ -3561,7 +3542,6 @@ TEST_F(WebFrameTest, DisambiguationPopupViewportSite)
// only becomes available after the load begins.
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client);
- webViewHelper.webView()->enableFixedLayoutMode(true);
webViewHelper.webView()->settings()->setViewportEnabled(true);
webViewHelper.webView()->resize(WebSize(1000, 1000));
webViewHelper.webView()->layout();
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698