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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1025543002: Remove old pinch-zoom paths from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 years, 9 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/TopControlsTest.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 e59f84849535e532ae27398687b86437c9ca3e7c..ca0efb582f94259f4b91ee6ca6d32d746d264f86 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -211,15 +211,6 @@ protected:
settings->setShrinksViewportContentToFit(true);
}
- static void configurePinchVirtualViewport(WebSettings* settings)
- {
- settings->setPinchVirtualViewportEnabled(true);
- settings->setViewportMetaEnabled(true);
- settings->setViewportEnabled(true);
- settings->setMainFrameResizesAreOrientationChanges(true);
- settings->setShrinksViewportContentToFit(true);
- }
-
static void configureLoadsImagesAutomatically(WebSettings* settings)
{
settings->setLoadsImagesAutomatically(true);
@@ -774,7 +765,7 @@ TEST_F(WebFrameTest, WorkingTextAutosizingMultipliers_VirtualViewport)
FixedLayoutTestWebViewClient client;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configureAndroid);
Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();
document->settings()->setTextAutosizingEnabled(true);
@@ -1304,7 +1295,7 @@ TEST_F(WebFrameTest, DocumentElementClientHeightWorksWithWrapContentMode)
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
@@ -1326,7 +1317,7 @@ TEST_F(WebFrameTest, SetForceZeroLayoutHeightWorksWithWrapContentMode)
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
DeprecatedPaintLayerCompositor* compositor = webViewHelper.webViewImpl()->compositor();
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
@@ -1409,7 +1400,7 @@ TEST_F(WebFrameTest, SetForceZeroLayoutHeightWorksWithRelayoutsWhenHeightChanged
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "button.html", true, 0, &client, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "button.html", true, 0, &client, configureAndroid);
// set view height to zero so that if the height of the view is not
// successfully updated during later resizes touch events will fail
// (as in not hit content included in the view)
@@ -2295,7 +2286,7 @@ void simulatePageScale(WebViewImpl* webViewImpl, float& scale)
{
IntSize scrollDelta = webViewImpl->fakePageScaleAnimationTargetPositionForTesting() - webViewImpl->mainFrameImpl()->frameView()->scrollPosition();
float scaleDelta = webViewImpl->fakePageScaleAnimationPageScaleForTesting() / webViewImpl->pageScaleFactor();
- webViewImpl->applyViewportDeltas(scrollDelta, scaleDelta, 0);
+ webViewImpl->applyViewportDeltas(WebFloatSize(), FloatSize(scrollDelta), WebFloatSize(), scaleDelta, 0);
scale = webViewImpl->pageScaleFactor();
}
@@ -2321,7 +2312,7 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
webViewHelper.webView()->setDefaultPageScaleLimits(0.01f, 4);
webViewHelper.webView()->setPageScaleFactor(0.5f);
@@ -2374,7 +2365,7 @@ TEST_F(WebFrameTest, DivAutoZoomWideDivTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
webViewHelper.webView()->setPageScaleFactor(1.0f);
@@ -2406,7 +2397,7 @@ TEST_F(WebFrameTest, DivAutoZoomVeryTallTest)
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html", true, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html", true, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
webViewHelper.webView()->setPageScaleFactor(1.0f);
@@ -2432,7 +2423,7 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDefaultPageScaleLimits(0.5f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2459,14 +2450,14 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
// If the user pinch zooms after double tap, a second double tap should zoom back to the div.
simulateDoubleTap(webViewHelper.webViewImpl(), topPoint, scale);
EXPECT_FLOAT_EQ(1, scale);
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 0.6f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 0.6f, 0);
simulateDoubleTap(webViewHelper.webViewImpl(), bottomPoint, scale);
EXPECT_FLOAT_EQ(1, scale);
simulateDoubleTap(webViewHelper.webViewImpl(), bottomPoint, scale);
EXPECT_FLOAT_EQ(webViewHelper.webViewImpl()->minimumPageScaleFactor(), scale);
// If we didn't yet get an auto-zoom update and a second double-tap arrives, should go back to minimum scale.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
webViewHelper.webViewImpl()->animateDoubleTapZoom(topPoint);
EXPECT_TRUE(webViewHelper.webViewImpl()->fakeDoubleTapAnimationPendingForTesting());
simulateDoubleTap(webViewHelper.webViewImpl(), bottomPoint, scale);
@@ -2481,7 +2472,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
int viewportHeight = 480;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(1.5f);
webViewHelper.webView()->setMaximumLegibleScale(1.f);
@@ -2507,7 +2498,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
EXPECT_FLOAT_EQ(1, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// 1 < minimumPageScale < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(1.1f, 4);
webViewHelper.webView()->layout();
@@ -2521,7 +2512,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
EXPECT_FLOAT_EQ(doubleTapZoomAlreadyLegibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// minimumPageScale < 1 < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(0.95f, 4);
webViewHelper.webView()->layout();
@@ -2544,7 +2535,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleLegibleScaleTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
float maximumLegibleScaleFactor = 1.13f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setMaximumLegibleScale(maximumLegibleScaleFactor);
webViewHelper.webView()->layout();
@@ -2571,7 +2562,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleLegibleScaleTest)
EXPECT_FLOAT_EQ(legibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// 1 < maximumLegibleScaleFactor < minimumPageScale < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(1.0f, 4);
webViewHelper.webView()->layout();
@@ -2585,7 +2576,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleLegibleScaleTest)
EXPECT_FLOAT_EQ(doubleTapZoomAlreadyLegibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// minimumPageScale < 1 < maximumLegibleScaleFactor < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(0.95f, 4);
webViewHelper.webView()->layout();
@@ -2599,7 +2590,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleLegibleScaleTest)
EXPECT_FLOAT_EQ(doubleTapZoomAlreadyLegibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// minimumPageScale < 1 < doubleTapZoomAlreadyLegibleScale < maximumLegibleScaleFactor
webViewHelper.webView()->setDefaultPageScaleLimits(0.9f, 4);
webViewHelper.webView()->layout();
@@ -2623,7 +2614,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
float accessibilityFontScaleFactor = 1.13f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
webViewHelper.webView()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setMaximumLegibleScale(1.f);
webViewHelper.webView()->layout();
@@ -2651,7 +2642,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
EXPECT_FLOAT_EQ(legibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// 1 < accessibilityFontScaleFactor < minimumPageScale < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(1.0f, 4);
webViewHelper.webView()->layout();
@@ -2665,7 +2656,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
EXPECT_FLOAT_EQ(doubleTapZoomAlreadyLegibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// minimumPageScale < 1 < accessibilityFontScaleFactor < doubleTapZoomAlreadyLegibleScale
webViewHelper.webView()->setDefaultPageScaleLimits(0.95f, 4);
webViewHelper.webView()->layout();
@@ -2679,7 +2670,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
EXPECT_FLOAT_EQ(doubleTapZoomAlreadyLegibleScale, scale);
// Zoom in to reset double_tap_zoom_in_effect flag.
- webViewHelper.webViewImpl()->applyViewportDeltas(WebSize(), 1.1f, 0);
+ webViewHelper.webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.1f, 0);
// minimumPageScale < 1 < doubleTapZoomAlreadyLegibleScale < accessibilityFontScaleFactor
webViewHelper.webView()->setDefaultPageScaleLimits(0.9f, 4);
webViewHelper.webView()->layout();
@@ -2698,7 +2689,7 @@ TEST_F(WebFrameTest, BlockBoundTest)
registerMockedHttpURLLoad("block_bound.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "block_bound.html", false, 0, 0, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + "block_bound.html", false, 0, 0, configureAndroid);
IntRect rectBack = IntRect(0, 0, 200, 200);
IntRect rectLeftTop = IntRect(10, 10, 80, 80);
@@ -4555,7 +4546,7 @@ TEST_F(WebFrameTest, DisambiguationPopupPinchViewport)
DisambiguationPopupTestWebViewClient client;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configurePinchVirtualViewport);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configureAndroid);
WebViewImpl* webViewImpl = webViewHelper.webViewImpl();
ASSERT_TRUE(webViewImpl);
@@ -6039,24 +6030,24 @@ TEST_F(WebFrameTest, FrameViewScrollAccountsForTopControls)
EXPECT_POINT_EQ(IntPoint(0, 1940), IntPoint(frameView->scrollOffset()));
// Hide until there's 10px showing.
- webView->applyViewportDeltas(WebSize(0, 0), 1.0f, -30.0f / topControlsHeight);
+ webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, -30.0f / topControlsHeight);
EXPECT_POINT_EQ(IntPoint(0, 1910), frameView->maximumScrollPosition());
// Simulate a LayoutPart::resize. The frame is resized to accomodate
// the top controls and Blink's view of the top controls matches that of
// the CC
- webView->applyViewportDeltas(WebSize(0, 0), 1.0f, 30.0f / topControlsHeight);
+ webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, 30.0f / topControlsHeight);
webView->setTopControlsHeight(40.0f, true);
webView->resize(WebSize(100, 60));
webView->layout();
EXPECT_POINT_EQ(IntPoint(0, 1940), frameView->maximumScrollPosition());
// Now simulate hiding.
- webView->applyViewportDeltas(WebSize(0, 0), 1.0f, -10.0f / topControlsHeight);
+ webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, -10.0f / topControlsHeight);
EXPECT_POINT_EQ(IntPoint(0, 1930), frameView->maximumScrollPosition());
// Reset to original state: 100px widget height, top controls fully hidden.
- webView->applyViewportDeltas(WebSize(0, 0), 1.0f, -30.0f / topControlsHeight);
+ webView->applyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(), 1.0f, -30.0f / topControlsHeight);
webView->setTopControlsHeight(topControlsHeight, false);
webView->resize(WebSize(100, 100));
webView->layout();
@@ -6082,7 +6073,7 @@ TEST_F(WebFrameTest, FullscreenLayerSize)
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
client.m_screenInfo.rect.height = viewportHeight;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->layout();
@@ -6115,7 +6106,7 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)
FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 640;
int viewportHeight = 480;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->layout();
@@ -6148,7 +6139,7 @@ TEST_F(WebFrameTest, FullscreenMainFrame)
FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 640;
int viewportHeight = 480;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->layout();
@@ -6178,7 +6169,7 @@ TEST_F(WebFrameTest, FullscreenSubframe)
registerMockedHttpURLLoad("fullscreen_iframe.html");
registerMockedHttpURLLoad("fullscreen_div.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_iframe.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_iframe.html", true, 0, &client, configureAndroid);
int viewportWidth = 640;
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6213,7 +6204,7 @@ TEST_F(WebFrameTest, FullscreenMediaStreamVideo)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_video.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_video.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_video.html", true, 0, &client, configureAndroid);
int viewportWidth = 640;
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6243,7 +6234,7 @@ TEST_F(WebFrameTest, FullscreenWithTinyViewport)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("viewport-tiny.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, 0, &client, configurePinchVirtualViewport);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, 0, &client, configureAndroid);
int viewportWidth = 384;
int viewportHeight = 640;
client.m_screenInfo.rect.width = viewportWidth;
« no previous file with comments | « Source/web/tests/TopControlsTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698