| 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 78c617d086f34e1a43539c3828f18019dc322e94..24e15c7341f3617ed166b4954c592f53db4e7479 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -310,6 +310,14 @@ void PrintTo(ParameterizedWebFrameTestConfig config, ::std::ostream* os)
|
| }
|
| }
|
|
|
| +// Flakily failing on Mac ASAN.
|
| +// https://crbug.com/592771
|
| +#if OS(MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE(test) DISABLED_##test
|
| +#else
|
| +#define MAYBE(test) test
|
| +#endif
|
| +
|
| INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values(
|
| ParameterizedWebFrameTestConfig::Default,
|
| ParameterizedWebFrameTestConfig::RootLayerScrolls));
|
| @@ -1383,7 +1391,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorOverridesPageVi
|
| EXPECT_EQ(enforcedPageScaleFactor, webViewHelper.webView()->pageScaleFactor());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, SmallPermanentInitialPageScaleFactorIsClobbered)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(SmallPermanentInitialPageScaleFactorIsClobbered))
|
| {
|
| const char* pages[] = {
|
| // These pages trigger the clobbering condition. There must be a matching item in "pageScaleFactors" array.
|
| @@ -1635,7 +1643,7 @@ TEST_F(WebFrameTest, FrameOwnerPropertiesScrolling)
|
| }
|
|
|
|
|
| -TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksAcrossNavigations)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(SetForceZeroLayoutHeightWorksAcrossNavigations))
|
| {
|
| registerMockedHttpURLLoad("200-by-300.html");
|
| registerMockedHttpURLLoad("large-div.html");
|
| @@ -1677,7 +1685,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWithWideViewportQuirk)
|
| EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(WideViewportAndWideContentWithInitialScale))
|
| {
|
| registerMockedHttpURLLoad("wide_document_width_viewport.html");
|
| registerMockedHttpURLLoad("white-1x1.png");
|
| @@ -1703,7 +1711,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale)
|
| EXPECT_EQ(minimumPageScaleFactor, webViewHelper.webViewImpl()->minimumPageScaleFactor());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(WideViewportQuirkClobbersHeight))
|
| {
|
| registerMockedHttpURLLoad("viewport-height-1000.html");
|
|
|
| @@ -1726,7 +1734,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight)
|
| EXPECT_EQ(1, webViewHelper.webView()->pageScaleFactor());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(LayoutSize320Quirk))
|
| {
|
| registerMockedHttpURLLoad("viewport/viewport-30.html");
|
|
|
| @@ -2025,7 +2033,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
|
| EXPECT_EQ(980, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->contentsSize().width());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(targetDensityDpiHigh))
|
| {
|
| registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
|
|
|
| @@ -2056,7 +2064,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh)
|
| }
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(targetDensityDpiDevice))
|
| {
|
| registerMockedHttpURLLoad("viewport-target-densitydpi-device.html");
|
|
|
| @@ -2081,7 +2089,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice)
|
| }
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(targetDensityDpiDeviceAndFixedWidth))
|
| {
|
| registerMockedHttpURLLoad("viewport-target-densitydpi-device-and-fixed-width.html");
|
|
|
| @@ -2887,7 +2895,7 @@ TEST_P(ParameterizedWebFrameTest, BlockBoundTest)
|
| EXPECT_RECT_EQ(rectRightBottom, blockBound);
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DivMultipleTargetZoomMultipleDivsTest)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DivMultipleTargetZoomMultipleDivsTest))
|
| {
|
| registerMockedHttpURLLoad("get_multiple_divs_for_auto_zoom_test.html");
|
|
|
| @@ -3163,7 +3171,7 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTestZoomToLegibleScaleDisabled)
|
| EXPECT_FALSE(needAnimation);
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, CharacterIndexAtPointWithPinchZoom)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(CharacterIndexAtPointWithPinchZoom))
|
| {
|
| registerMockedHttpURLLoad("sometext.html");
|
|
|
| @@ -4418,7 +4426,7 @@ TEST_P(ParameterizedWebFrameTest, SelectRangeCanMoveSelectionEnd)
|
| // EXPECT_EQ("Editable 1. Editable 2. ]", selectionAsString(frame));
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtent)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(MoveRangeSelectionExtent))
|
| {
|
| WebLocalFrameImpl* frame;
|
| WebRect startWebRect;
|
| @@ -4452,7 +4460,7 @@ TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtent)
|
| EXPECT_EQ("", selectionAsString(frame));
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtentCannotCollapse)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(MoveRangeSelectionExtentCannotCollapse))
|
| {
|
| WebLocalFrameImpl* frame;
|
| WebRect startWebRect;
|
| @@ -4477,7 +4485,7 @@ TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtentCannotCollapse)
|
| EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtentScollsInputField)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(MoveRangeSelectionExtentScollsInputField))
|
| {
|
| WebLocalFrameImpl* frame;
|
| WebRect startWebRect;
|
| @@ -4839,7 +4847,7 @@ static WebGestureEvent fatTap(int x, int y)
|
| return event;
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopup)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopup))
|
| {
|
| const std::string htmlFile = "disambiguation_popup.html";
|
| registerMockedHttpURLLoad(htmlFile);
|
| @@ -4893,7 +4901,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup)
|
| }
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopupNoContainer)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopupNoContainer))
|
| {
|
| registerMockedHttpURLLoad("disambiguation_popup_no_container.html");
|
|
|
| @@ -4910,7 +4918,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupNoContainer)
|
| EXPECT_FALSE(client.triggered());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopupMobileSite))
|
| {
|
| const std::string htmlFile = "disambiguation_popup_mobile_site.html";
|
| registerMockedHttpURLLoad(htmlFile);
|
| @@ -4944,7 +4952,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite)
|
| }
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopupViewportSite))
|
| {
|
| const std::string htmlFile = "disambiguation_popup_viewport_site.html";
|
| registerMockedHttpURLLoad(htmlFile);
|
| @@ -5028,7 +5036,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport)
|
| EXPECT_FALSE(client.triggered());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopupBlacklist))
|
| {
|
| const unsigned viewportWidth = 500;
|
| const unsigned viewportHeight = 1000;
|
| @@ -5060,7 +5068,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist)
|
| EXPECT_FALSE(client.triggered());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, DisambiguationPopupPageScale)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(DisambiguationPopupPageScale))
|
| {
|
| registerMockedHttpURLLoad("disambiguation_popup_page_scale.html");
|
|
|
| @@ -6421,7 +6429,7 @@ TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport)
|
| EXPECT_EQ(500, leftRightFixed->offsetWidth());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, FrameViewMoveWithSetFrameRect)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(FrameViewMoveWithSetFrameRect))
|
| {
|
| FrameTestHelpers::WebViewHelper webViewHelper(this);
|
| webViewHelper.initializeAndLoad("about:blank");
|
| @@ -6624,7 +6632,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame)
|
| ASSERT_TRUE(webScrollLayer->userScrollableVertical());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, FullscreenSubframe)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(FullscreenSubframe))
|
| {
|
| FakeCompositingWebViewClient client;
|
| registerMockedHttpURLLoad("fullscreen_iframe.html");
|
| @@ -6745,7 +6753,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport)
|
| EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
|
| }
|
|
|
| -TEST_P(ParameterizedWebFrameTest, LayoutBlockPercentHeightDescendants)
|
| +TEST_P(ParameterizedWebFrameTest, MAYBE(LayoutBlockPercentHeightDescendants))
|
| {
|
| registerMockedHttpURLLoad("percent-height-descendants.html");
|
| FrameTestHelpers::WebViewHelper webViewHelper(this);
|
|
|