| 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.
|
|
|