Changeset 109584 in webkit

Timestamp:

Mar 2, 2012 10:03:59 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Smooth scrolling support
​https://bugs.webkit.org/show_bug.cgi?id=16123

Patch by Zan Dobersek <​zandobersek@gmail.com> on 2012-03-02
Reviewed by Martin Robinson.

Source/WebCore:

No new tests - no new functionality.

Add the ScrollAnimatorNone class to compilation and enable
the smooth scrolling feature by default at compilation time.

• GNUmakefile.am:
• GNUmakefile.list.am:

Source/WebKit/gtk:

Add a new settings option to enable smooth scrolling.

• webkit/webkitwebsettings.cpp:

(webkit_web_settings_class_init):
(webkit_web_settings_set_property):
(webkit_web_settings_get_property):

• webkit/webkitwebsettingsprivate.h:
• webkit/webkitwebview.cpp:

(webkit_web_view_update_settings):
(webkit_web_view_settings_notify):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/GNUmakefile.list.am (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebsettings.cpp (modified) (4 diffs)
• WebKit/gtk/webkit/webkitwebsettingsprivate.h (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] Smooth scrolling support
+        https://bugs.webkit.org/show_bug.cgi?id=16123
+
+        Reviewed by Martin Robinson.
+
+        No new tests - no new functionality.
+
+        Add the ScrollAnimatorNone class to compilation and enable
+        the smooth scrolling feature by default at compilation time.
+
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+
 2012-03-02  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/GNUmakefile.am

@@ -111 +111 @@
         -I$(srcdir)/Source/WebCore/platform/gtk \
         -I$(srcdir)/Source/WebCore/platform/network/soup
+
+# ---
+# Features enabled by default at compilation time
+# ---
+FEATURE_DEFINES += ENABLE_SMOOTH_SCROLLING=1
+webcore_cppflags += -DENABLE_SMOOTH_SCROLLING=1
 
 # ---

trunk/Source/WebCore/GNUmakefile.list.am

@@ -3391 +3391 @@
         Source/WebCore/platform/ScrollAnimator.cpp \
         Source/WebCore/platform/ScrollAnimator.h \
+        Source/WebCore/platform/ScrollAnimatorNone.cpp \
+        Source/WebCore/platform/ScrollAnimatorNone.h \
         Source/WebCore/platform/ScrollableArea.cpp \
         Source/WebCore/platform/ScrollableArea.h \

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-03-02  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] Smooth scrolling support
+        https://bugs.webkit.org/show_bug.cgi?id=16123
+
+        Reviewed by Martin Robinson.
+
+        Add a new settings option to enable smooth scrolling.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+        (webkit_web_settings_set_property):
+        (webkit_web_settings_get_property):
+        * webkit/webkitwebsettingsprivate.h:
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+        (webkit_web_view_settings_notify):
+
 2012-03-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp

@@ -121 +121 @@
     PROP_ENABLE_WEBGL,
     PROP_ENABLE_WEB_AUDIO,
-    PROP_ENABLE_ACCELERATED_COMPOSITING
+    PROP_ENABLE_ACCELERATED_COMPOSITING,
+    PROP_ENABLE_SMOOTH_SCROLLING
 };
 
@@ -954 +955 @@
                                                          TRUE,
                                                          flags));
+
+    /**
+    * WebKitWebSettings:enable-smooth-scrolling
+    *
+    * Enable or disable support for smooth scrolling. The current implementation relies upon
+    * CPU work to produce a smooth scrolling experience.
+    *
+    * Since: 1.9.0
+    */
+    g_object_class_install_property(gobject_class,
+                                    PROP_ENABLE_SMOOTH_SCROLLING,
+                                    g_param_spec_boolean("enable-smooth-scrolling",
+                                                         _("Enable smooth scrolling"),
+                                                         _("Whether to enable smooth scrolling"),
+                                                         FALSE,
+                                                         flags));
 }
 
@@ -1129 +1146 @@
         priv->enableAcceleratedCompositing = g_value_get_boolean(value);
         break;
+    case PROP_ENABLE_SMOOTH_SCROLLING:
+        priv->enableSmoothScrolling = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -1293 +1313 @@
     case PROP_ENABLE_ACCELERATED_COMPOSITING:
         g_value_set_boolean(value, priv->enableAcceleratedCompositing);
+        break;
+    case PROP_ENABLE_SMOOTH_SCROLLING:
+        g_value_set_boolean(value, priv->enableSmoothScrolling);
         break;
     default:

trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h

@@ -81 +81 @@
     gboolean enableWebAudio;
     gboolean enableAcceleratedCompositing;
+    gboolean enableSmoothScrolling;
 };
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -3340 +3340 @@
 #if ENABLE(WEB_SOCKETS)
     coreSettings->setUseHixie76WebSocketProtocol(false);
+#endif
+
+#if ENABLE(SMOOTH_SCROLLING)
+    coreSettings->setEnableScrollAnimator(settingsPrivate->enableSmoothScrolling);
 #endif
 
@@ -3471 +3475 @@
 #endif
 
+#if ENABLE(SMOOTH_SCROLLING)
+    else if (name == g_intern_string("enable-smooth-scrolling"))
+        settings->setEnableScrollAnimator(g_value_get_boolean(&value));
+#endif
+
     else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
         g_warning("Unexpected setting '%s'", name);