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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 15927026: Enabled using viewport on desktop browsers behind experimental flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: WIP Created 7 years, 5 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
« Source/web/WebViewImpl.cpp ('K') | « Source/web/WebViewImpl.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 1bcee0fe62ee4fd471c6522f40006d6f5458c7e6..676704bd187be770f7d88cbf8dbbe22d481f48ef 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -318,13 +318,13 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(m_webView);
- webViewImpl->mainFrameImpl()->frameView()->setFixedLayoutSize(WebCore::IntSize(100, 100));
+ webViewImpl->mainFrameImpl()->frameView()->setLayoutSize(WebCore::IntSize(100, 100));
EXPECT_TRUE(webViewImpl->mainFrameImpl()->frameView()->needsLayout());
int prevLayoutCount = webViewImpl->mainFrameImpl()->frameView()->layoutCount();
@@ -345,7 +345,7 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(m_webView);
@@ -396,7 +396,7 @@ TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
m_webView->settings()->setViewportEnabled(true);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -427,7 +427,7 @@ TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -468,7 +468,7 @@ TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "wide_document.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -504,7 +504,7 @@ TEST_F(WebFrameTest, setLoadWithOverviewModeToFalse)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setLoadWithOverviewMode(false);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -524,7 +524,7 @@ TEST_F(WebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewport)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "large-div.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setLoadWithOverviewMode(false);
m_webView->settings()->setUseWideViewport(false);
@@ -545,7 +545,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidth)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setUseWideViewport(false);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -567,7 +567,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccountsScale)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setUseWideViewport(false);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -591,7 +591,7 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithAutoWidth)
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setUseWideViewport(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -611,7 +611,7 @@ TEST_F(WebFrameTest, PageViewportInitialScaleOverridesLoadWithOverviewMode)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setLoadWithOverviewMode(false);
@@ -636,7 +636,7 @@ TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
m_webView->settings()->setLoadWithOverviewMode(false);
m_webView->setInitialPageScaleOverride(enforcedPageScaleFactor);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->layout();
@@ -665,7 +665,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMod
float enforcedPageScalePactor = 0.5f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setLoadWithOverviewMode(false);
@@ -686,7 +686,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitial
float enforcedPageScalePactor = 0.5f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->setInitialPageScaleOverride(enforcedPageScalePactor);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -704,7 +704,7 @@ TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
int viewportHeight = 1057;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "scale_oscillate.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -721,7 +721,7 @@ TEST_F(WebFrameTest, setPageScaleFactorDoesNotLayout)
int viewportHeight = 48;
m_webView = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client));
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -747,7 +747,7 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
int viewportHeight = 480;
m_webView = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client));
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -786,7 +786,7 @@ TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -810,7 +810,7 @@ TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)
int viewportHeight = 48;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -844,7 +844,7 @@ TEST_F(WebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -868,7 +868,7 @@ TEST_F(WebFrameTest, targetDensityDpiHigh)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -895,7 +895,7 @@ TEST_F(WebFrameTest, targetDensityDpiDevice)
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -930,7 +930,7 @@ protected:
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + url, true);
m_webView->settings()->setViewportEnabled(true);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(m_webView);
// Origin scrollOffsets preserved under resize.
@@ -1032,7 +1032,7 @@ TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)
int viewportHeight = 50;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -1072,7 +1072,7 @@ TEST_F(WebFrameTest, pageScaleFactorUpdatesScrollbars)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -1100,7 +1100,7 @@ TEST_F(WebFrameTest, CanOverrideScaleLimits)
int viewportHeight = 480;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->settings()->setViewportEnabled(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -1165,7 +1165,7 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)
m_webView->setPageScaleFactorLimits(0.01f, 4);
m_webView->setPageScaleFactor(0.5f, WebPoint(0, 0));
m_webView->resize(WebSize(viewportWidth, viewportHeight));
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->layout();
WebRect wideDiv(200, 100, 400, 150);
@@ -1228,7 +1228,7 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->setPageScaleFactorLimits(0.5f, 4);
m_webView->setDeviceScaleFactor(deviceScaleFactor);
@@ -1277,7 +1277,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
int viewportHeight = 480;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->setDeviceScaleFactor(1.5f);
m_webView->layout();
@@ -1340,7 +1340,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
float textAutosizingFontScaleFactor = 1.13f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->layout();
@@ -1419,7 +1419,7 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
int caretPadding = 10;
float minReadableCaretHeight = 18.0f;
m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_zoom_into_editable_test.html");
- m_webView->enableFixedLayoutMode(true);
+ // m_webView->enableFixedLayoutMode(true);
m_webView->resize(WebSize(viewportWidth, viewportHeight));
m_webView->setPageScaleFactorLimits(1, 4);
m_webView->layout();
@@ -2297,7 +2297,7 @@ static WebView* createWebViewForTextSelection(const std::string& url)
{
WebView* webView = FrameTestHelpers::createWebViewAndLoad(url, true);
webView->settings()->setDefaultFontSize(12);
- webView->enableFixedLayoutMode(false);
+ // webView->enableFixedLayoutMode(false);
webView->resize(WebSize(640, 480));
return webView;
}
« Source/web/WebViewImpl.cpp ('K') | « Source/web/WebViewImpl.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698