| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index cd3698a5fc367790912bc54333c14df949e6d390..99bdf5ca418483465cb4b07eed5e9a88f43d4049 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -420,7 +420,7 @@ TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
|
| TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
|
|
| registerMockedHttpURLLoad("fixed_layout.html");
|
|
|
| @@ -460,7 +460,7 @@ TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
|
| TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
|
|
| registerMockedHttpURLLoad("wide_document.html");
|
|
|
| @@ -663,7 +663,7 @@ TEST_F(WebFrameTest, PageViewportInitialScaleOverridesLoadWithOverviewMode)
|
| TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
|
|
| registerMockedHttpURLLoad("fixed_layout.html");
|
|
|
| @@ -823,7 +823,7 @@ TEST_F(WebFrameTest, setPageScaleFactorDoesNotLayout)
|
| TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
| EXPECT_TRUE(WebCore::ScrollbarTheme::theme()->usesOverlayScrollbars());
|
|
|
| registerMockedHttpURLLoad("fixed_layout.html");
|
| @@ -845,7 +845,7 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
|
| EXPECT_EQ(prevLayoutCount, webViewImpl()->mainFrameImpl()->frameView()->layoutCount());
|
|
|
| WebCore::Settings::setMockScrollbarsEnabled(false);
|
| - WebCore::Settings::setUsesOverlayScrollbars(false);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(false);
|
| }
|
|
|
| TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView)
|
| @@ -943,7 +943,7 @@ TEST_F(WebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
|
| TEST_F(WebFrameTest, targetDensityDpiHigh)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
| registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
|
|
|
| FixedLayoutTestWebViewClient client;
|
| @@ -979,7 +979,7 @@ TEST_F(WebFrameTest, targetDensityDpiHigh)
|
| TEST_F(WebFrameTest, targetDensityDpiDevice)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
| registerMockedHttpURLLoad("viewport-target-densitydpi-device.html");
|
|
|
| float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
|
| @@ -1191,7 +1191,7 @@ TEST_F(WebFrameTest, pageScaleFactorUpdatesScrollbars)
|
| TEST_F(WebFrameTest, CanOverrideScaleLimits)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
|
|
| registerMockedHttpURLLoad("no_scale_for_you.html");
|
|
|
| @@ -1224,7 +1224,7 @@ TEST_F(WebFrameTest, CanOverrideScaleLimits)
|
| TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
|
| {
|
| WebCore::Settings::setMockScrollbarsEnabled(true);
|
| - WebCore::Settings::setUsesOverlayScrollbars(true);
|
| + WebCore::Settings::setMockScrollbarsUseOverlay(true);
|
| EXPECT_TRUE(WebCore::ScrollbarTheme::theme()->usesOverlayScrollbars());
|
|
|
| registerMockedHttpURLLoad("large-div.html");
|
|
|