Rename usesOverlayScrollbars of settings to mockScrollbarsUseOverlay

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 402 matching lines @@
     m_webView->layout();
     EXPECT_EQ(1, m_webView->pageScaleFactor());
 
     // Force the layout to happen before leaving the test.
     m_webView->mainFrame()->contentAsText(1024).utf8();
 }
 
 TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
-    WebCore::Settings::setUsesOverlayScrollbars(true);
+    WebCore::Settings::setMockScrollbarsUseOverlay(true);
 
     registerMockedHttpURLLoad("fixed_layout.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
@@ skipping 19 matching lines @@
     EXPECT_EQ(userPinchPageScaleFactor, m_webView->pageScaleFactor());
 
     // Make sure we don't reset to initial scale if the viewport size changes.
     m_webView->resize(WebSize(viewportWidth, viewportHeight + 100));
     EXPECT_EQ(userPinchPageScaleFactor, m_webView->pageScaleFactor());
 }
 
 TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
-    WebCore::Settings::setUsesOverlayScrollbars(true);
+    WebCore::Settings::setMockScrollbarsUseOverlay(true);
 
     registerMockedHttpURLLoad("wide_document.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
@@ skipping 182 matching lines @@
     m_webView->settings()->setLoadWithOverviewMode(false);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
 
     // The page must be displayed at 200% zoom, as specified in its viewport meta tag.
     EXPECT_EQ(2.0f, m_webView->pageScaleFactor());
 }
 
 TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
-    WebCore::Settings::setUsesOverlayScrollbars(true);
+    WebCore::Settings::setMockScrollbarsUseOverlay(true);
 
     registerMockedHttpURLLoad("fixed_layout.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     float enforcedPageScaleFactor = 2.0f;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
     m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
     m_webView->settings()->setLoadWithOverviewMode(false);
@@ skipping 139 matching lines @@
 
     int prevLayoutCount = webViewImpl()->mainFrameImpl()->frameView()->layoutCount();
     webViewImpl()->setPageScaleFactor(3, WebPoint());
     EXPECT_FALSE(webViewImpl()->mainFrameImpl()->frameView()->needsLayout());
     EXPECT_EQ(prevLayoutCount, webViewImpl()->mainFrameImpl()->frameView()->layoutCount());
 }
 
 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");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
     m_webView->layout();
 
     int prevLayoutCount = webViewImpl()->mainFrameImpl()->frameView()->layoutCount();
     webViewImpl()->setPageScaleFactor(30, WebPoint());
     EXPECT_FALSE(webViewImpl()->mainFrameImpl()->frameView()->needsLayout());
     EXPECT_EQ(prevLayoutCount, webViewImpl()->mainFrameImpl()->frameView()->layoutCount());
 
     WebCore::Settings::setMockScrollbarsEnabled(false);
-    WebCore::Settings::setUsesOverlayScrollbars(false);
+    WebCore::Settings::setMockScrollbarsUseOverlay(false);
 }
 
 TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView)
 {
     registerMockedHttpURLLoad("fixed_layout.html");
 
     float pageScaleFactor = 3;
     m_webView = FrameTestHelpers::createWebViewAndLoad("about:html", true, 0, 0);
     m_webView->setPageScaleFactor(pageScaleFactor, WebPoint());
 
@@ skipping 77 matching lines @@
 
     m_webView->setPageScaleFactor(2, WebPoint());
 
     EXPECT_EQ(980, webViewImpl()->page()->mainFrame()->contentRenderer()->unscaledDocumentRect().width());
     EXPECT_EQ(980, webViewImpl()->mainFrameImpl()->frameView()->contentsSize().width());
 }
 
 TEST_F(WebFrameTest, targetDensityDpiHigh)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
-    WebCore::Settings::setUsesOverlayScrollbars(true);
+    WebCore::Settings::setMockScrollbarsUseOverlay(true);
     registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
 
     FixedLayoutTestWebViewClient client;
     // high-dpi = 240
     float targetDpi = 240.0f;
     float deviceScaleFactors[] = { 1.0f, 4.0f / 3.0f, 2.0f };
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) {
@@ skipping 15 matching lines @@
         EXPECT_NEAR(1.0f / densityDpiScaleRatio, m_webView->pageScaleFactor(), 0.01f);
 
         m_webView->close();
         m_webView = 0;
     }
 }
 
 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 };
 
     FixedLayoutTestWebViewClient client;
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) {
         client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
@@ skipping 191 matching lines @@
 
     m_webView->setPageScaleFactor(10, WebPoint());
 
     EXPECT_EQ(view->scrollSize(WebCore::HorizontalScrollbar), view->contentsSize().width() - view->visibleContentRect().width());
     EXPECT_EQ(view->scrollSize(WebCore::VerticalScrollbar), view->contentsSize().height() - view->visibleContentRect().height());
 }
 
 TEST_F(WebFrameTest, CanOverrideScaleLimits)
 {
     WebCore::Settings::setMockScrollbarsEnabled(true);
-    WebCore::Settings::setUsesOverlayScrollbars(true);
+    WebCore::Settings::setMockScrollbarsUseOverlay(true);
 
     registerMockedHttpURLLoad("no_scale_for_you.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 640;
     int viewportHeight = 480;
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
     m_webView->enableFixedLayoutMode(true);
@@ skipping 12 matching lines @@
     m_webView->setIgnoreViewportTagScaleLimits(false);
     m_webView->layout();
 
     EXPECT_EQ(2.0f, m_webView->minimumPageScaleFactor());
     EXPECT_EQ(2.0f, m_webView->maximumPageScaleFactor());
 }
 
 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");
 
     int viewWidth = 500;
     int viewHeight = 500;
 
     createCompositingWebView();
     m_webView->resize(WebSize(viewWidth, viewHeight));
     FrameTestHelpers::loadFrame(m_webView->mainFrame(), m_baseURL + "large-div.html");
@@ skipping 2555 matching lines @@
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "push_state.html", true, 0, &client);
     runPendingTasks();
 
     EXPECT_EQ(client.startLoadingCount(), 2);
     EXPECT_EQ(client.stopLoadingCount(), 2);
     m_webView->close();
     m_webView = 0;
 }
 
 } // namespace