From: mrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 20 Apr 2012 23:47:03 +0000 (+0000)
Subject: [Gtk][WK1] Use mock scrollbars when testing
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=82d68d42546013d4f01ffc3339ddb83ee3381fe3

[Gtk][WK1] Use mock scrollbars when testing
https://bugs.webkit.org/show_bug.cgi?id=79577

Patch by Zan Dobersek <zandobersek@gmail.com> on 2012-04-20
Reviewed by Daniel Bates.

Enable mock scrollbars if running DumpRenderTree.

* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@114799 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index b0d49ff..2a67d67 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-20  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk][WK1] Use mock scrollbars when testing
+        https://bugs.webkit.org/show_bug.cgi?id=79577
+
+        Reviewed by Daniel Bates.
+
+        Enable mock scrollbars if running DumpRenderTree.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+
 2012-04-18  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r114506.
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp
index 5582092..a9ecd97 100644
--- a/Source/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp
@@ -3420,6 +3420,9 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
     coreSettings->setEnableScrollAnimator(settingsPrivate->enableSmoothScrolling);
 #endif
 
+    // Use mock scrollbars if in DumpRenderTree mode (i.e. testing layout tests).
+    coreSettings->setMockScrollbarsEnabled(DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled());
+
     if (Page* page = core(webView))
         page->setTabKeyCyclesThroughElements(settingsPrivate->tabKeyCyclesThroughElements);