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

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

Issue 1215973002: Oilpan: improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review-induced improvements Created 5 years, 6 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/ViewportAnchor.h ('k') | Source/web/tests/ScrollAnimatorNoneTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/PinchViewportTest.cpp
diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp
index 4f5e3f2628fd4884c1425d771519af305cac714a..d0917e6ac069fbf306de67b9e16941e678cbd764 100644
--- a/Source/web/tests/PinchViewportTest.cpp
+++ b/Source/web/tests/PinchViewportTest.cpp
@@ -208,11 +208,6 @@ public:
}
};
-#if OS(MACOSX) && ENABLE(OILPAN)
-// FIXME(504655): RootLayerScrolls configuration crashes on Mac Oilpan bots.
-INSTANTIATE_TEST_CASE_P(All, ParameterizedPinchViewportTest, ::testing::Values(
- DefaultSettingOverride));
-#else
static void RootLayerScrollsSettingOverride(WebSettings *settings)
{
settings->setRootLayerScrolls(true);
@@ -220,7 +215,6 @@ static void RootLayerScrollsSettingOverride(WebSettings *settings)
INSTANTIATE_TEST_CASE_P(All, ParameterizedPinchViewportTest, ::testing::Values(
DefaultSettingOverride,
RootLayerScrollsSettingOverride));
-#endif
// Test that resizing the PinchViewport works as expected and that resizing the
// WebView resizes the PinchViewport.
« no previous file with comments | « Source/web/ViewportAnchor.h ('k') | Source/web/tests/ScrollAnimatorNoneTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698