Index: Source/web/tests/PinchViewportTest.cpp |
diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp |
index 5a567151803df858c4e6a552570bf8db8794f33a..75ffc9df273bbf8243f9caca05b51756b92f9141 100644 |
--- a/Source/web/tests/PinchViewportTest.cpp |
+++ b/Source/web/tests/PinchViewportTest.cpp |
@@ -199,7 +199,9 @@ TEST_F(PinchViewportTest, TestResize) |
static void turnOffForceCompositingMode(WebSettings* settings) |
{ |
PinchViewportTest::configureSettings(settings); |
- settings->setForceCompositingMode(false); |
+ // FIXME: This setting is being removed, so this test needs to be rewritten to |
+ // do something else. crbug.com/173949 |
+ settings->setAcceleratedCompositingEnabled(false); |
} |
// Test that the container layer gets sized properly if the WebView is resized |
@@ -211,12 +213,12 @@ TEST_F(PinchViewportTest, TestWebViewResizedBeforeAttachment) |
navigateTo("about:blank"); |
forceFullCompositingUpdate(); |
- webViewImpl()->enterForceCompositingMode(true); |
+ webViewImpl()->settings()->setAcceleratedCompositingEnabled(true); |
+ webViewImpl()->layout(); |
PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport(); |
EXPECT_FLOAT_SIZE_EQ(FloatSize(320, 240), pinchViewport.rootGraphicsLayer()->size()); |
} |
- |
// Make sure that the visibleRect method acurately reflects the scale and scroll location |
// of the viewport. |
TEST_F(PinchViewportTest, TestVisibleRect) |