| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index a250276f3fdbfc71224549eabac3aa9de77c2e51..2ea914dcf633bdbefd3dd7fec1a736ce30f1fb0a 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -2306,12 +2306,7 @@ INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
|
| ParameterizedWebFrameTestConfig::Default,
|
| ParameterizedWebFrameTestConfig::RootLayerScrolls));
|
|
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
|
| -#else
|
| TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
|
| -#endif
|
| {
|
| // With width=device-width, pageScaleFactor is preserved across resizes as
|
| // long as the content adjusts according to the device-width.
|
| @@ -2325,12 +2320,7 @@ TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDevice
|
| url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
|
| }
|
|
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForMinimumScale)
|
| -#else
|
| TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForMinimumScale)
|
| -#endif
|
| {
|
| // This tests a scenario where minimum-scale is set to 1.0, but some element
|
| // on the page is slightly larger than the portrait width, so our "natural"
|
| @@ -2346,12 +2336,7 @@ TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForMinimumScale)
|
| url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
|
| }
|
|
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForFixedWidth)
|
| -#else
|
| TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedWidth)
|
| -#endif
|
| {
|
| // With a fixed width, pageScaleFactor scales by the relative change in viewport width.
|
| const char* url = "resize_scroll_fixed_width.html";
|
| @@ -2364,12 +2349,7 @@ TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedWidth)
|
| url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
|
| }
|
|
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForFixedLayout)
|
| -#else
|
| TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedLayout)
|
| -#endif
|
| {
|
| // With a fixed layout, pageScaleFactor scales by the relative change in viewport width.
|
| const char* url = "resize_scroll_fixed_layout.html";
|
| @@ -7816,12 +7796,7 @@ INSTANTIATE_TEST_CASE_P(All, ViewportOnResizeTest, ::testing::Values(
|
| ParameterizedWebFrameTestConfig::Default,
|
| ParameterizedWebFrameTestConfig::RootLayerScrolls));
|
|
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(ViewportOnResizeTest, DISABLED_ViewportInvalidatedOnResizeWithEmulation)
|
| -#else
|
| TEST_P(ViewportOnResizeTest, ViewportInvalidatedOnResizeWithEmulation)
|
| -#endif
|
| {
|
| WebDeviceEmulationParams params;
|
| params.screenPosition = WebDeviceEmulationParams::Mobile;
|
| @@ -7923,12 +7898,7 @@ TEST_P(ParameterizedWebFrameTest, SendBeaconFromChildWithRemoteMainFrame)
|
| }
|
|
|
| // See https://crbug.com/525285.
|
| -// Fails on Android: https://crbug.com/528186
|
| -#if OS(ANDROID)
|
| -TEST_P(ParameterizedWebFrameTest, DISABLED_RemoteToLocalSwapOnMainFrameInitializesCoreFrame)
|
| -#else
|
| TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFrame)
|
| -#endif
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| @@ -7948,7 +7918,9 @@ TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFra
|
|
|
| // Load a page with a child frame in the new root to make sure this doesn't
|
| // crash when the child frame invokes setCoreFrame.
|
| - FrameTestHelpers::loadFrame(localRoot, "data:text/html,<iframe></iframe>");
|
| + registerMockedHttpURLLoad("single_iframe.html");
|
| + registerMockedHttpURLLoad("visible_iframe.html");
|
| + FrameTestHelpers::loadFrame(localRoot, m_baseURL + "single_iframe.html");
|
|
|
| view->close();
|
| }
|
|
|