Changeset 128231 in webkit

Timestamp:

Sep 11, 2012 3:32:24 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Gtk] allow building with css-shaders
​https://bugs.webkit.org/show_bug.cgi?id=95603

Patch by Arnaud Renevier <​a.renevier@sisa.samsung.com> on 2012-09-11
Reviewed by Martin Robinson.

.:

if unstable features and accelerated compositing are turned on, and
acceleration backend is opengl, then build CSS Shaders and CSS
Filters.

• configure.ac:

Source/WebCore:

Add support for css filters and shaders in GNUmakefile.am and include
Texture.cpp, Texture.h, TilingData.cpp and TilingData.h in
webcore_sources

No functional change, so no new tests.

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

Source/WebKit/gtk:

Add enable-css-shaders property to WebKit WebSettings, and connects it
to WebCore settings setCSSCustomFilterEnabled.

• 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

Files:

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

trunk/ChangeLog

@@ +1 @@
+2012-09-11  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        [Gtk] allow building with css-shaders
+        https://bugs.webkit.org/show_bug.cgi?id=95603
+
+        Reviewed by Martin Robinson.
+
+        if unstable features and accelerated compositing are turned on, and
+        acceleration backend is opengl, then build CSS Shaders and CSS
+        Filters.
+
+        * configure.ac:
+
 2012-09-11  Marcelo Lira  <marcelo.lira@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-11  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        [Gtk] allow building with css-shaders
+        https://bugs.webkit.org/show_bug.cgi?id=95603
+
+        Reviewed by Martin Robinson.
+
+        Add support for css filters and shaders in GNUmakefile.am and include
+        Texture.cpp, Texture.h, TilingData.cpp and TilingData.h in
+        webcore_sources
+
+        No functional change, so no new tests.
+
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+
 2012-09-11  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.am

@@ -255 +255 @@
 
 # ----
+# Filters
+# ----
+if ENABLE_CSS_FILTERS
+feature_defines_overrides += ENABLE_CSS_FILTERS=1
+else
+feature_defines_overrides += ENABLE_CSS_FILTERS=0
+endif # END ENABLE_CSS_FILTERS
+
+# ----
 # Track Support
 # ----
@@ -357 +366 @@
 feature_defines_overrides += ENABLE_CSS_EXCLUSIONS=0
 endif # END ENABLE_CSS_EXCLUSIONS
+
+# Shaders
+# ----
+if ENABLE_CSS_SHADERS
+feature_defines_overrides += ENABLE_CSS_SHADERS=1
+else
+feature_defines_overrides += ENABLE_CSS_SHADERS=0
+endif # END ENABLE_CSS_SHADERS
 
 # ----

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4385 +4385 @@
         Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp \
         Source/WebCore/platform/graphics/gpu/DrawingBuffer.h \
+        Source/WebCore/platform/graphics/gpu/Texture.cpp \
+        Source/WebCore/platform/graphics/gpu/Texture.h \
+        Source/WebCore/platform/graphics/gpu/TilingData.cpp \
+        Source/WebCore/platform/graphics/gpu/TilingData.h \
         Source/WebCore/platform/graphics/Gradient.cpp \
         Source/WebCore/platform/graphics/Gradient.h \

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-09-11  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        [Gtk] allow building with css-shaders
+        https://bugs.webkit.org/show_bug.cgi?id=95603
+
+        Reviewed by Martin Robinson.
+
+        Add enable-css-shaders property to WebKit WebSettings, and connects it
+        to WebCore settings setCSSCustomFilterEnabled.
+
+        * 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-09-09  Emil A Eklund  <eae@chromium.org>
 

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

@@ -119 +119 @@
     PROP_ENABLE_SMOOTH_SCROLLING,
     PROP_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE,
-    PROP_MEDIA_PLAYBACK_ALLOWS_INLINE
+    PROP_MEDIA_PLAYBACK_ALLOWS_INLINE,
+    PROP_ENABLE_CSS_SHADERS
 };
 
@@ -942 +943 @@
                                                          flags));
 
+    /**
+    * WebKitWebSettings:enable-css-shaders
+    *
+    * Enable or disable support for css shaders (css custom filters).
+    * Accelerated compositing needs to be enabled at compile time, but needs
+    * not be enabled at runtime.
+    *
+    * See also https://dvcs.w3.org/hg/FXTF/raw-file/tip/custom/index.html
+    *
+    * Since: 2.0
+    */
+    g_object_class_install_property(gobject_class,
+                                    PROP_ENABLE_CSS_SHADERS,
+                                    g_param_spec_boolean("enable-css-shaders",
+                                                         _("Enable CSS shaders"),
+                                                         _("Whether to enable css shaders"),
+                                                         FALSE,
+                                                         flags));
+
 }
 
@@ -1120 +1140 @@
         priv->enableSmoothScrolling = g_value_get_boolean(value);
         break;
+    case PROP_ENABLE_CSS_SHADERS:
+        priv->enableCSSShaders = g_value_get_boolean(value);
+        break;
     case PROP_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE:
         priv->mediaPlaybackRequiresUserGesture = g_value_get_boolean(value);
@@ -1293 +1316 @@
     case PROP_ENABLE_SMOOTH_SCROLLING:
         g_value_set_boolean(value, priv->enableSmoothScrolling);
+        break;
+    case PROP_ENABLE_CSS_SHADERS:
+        g_value_set_boolean(value, priv->enableCSSShaders);
         break;
     case PROP_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE:

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

@@ -82 +82 @@
     gboolean enableAcceleratedCompositing;
     gboolean enableSmoothScrolling;
+    gboolean enableCSSShaders;
     gboolean mediaPlaybackRequiresUserGesture;
     gboolean mediaPlaybackAllowsInline;

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

@@ -3443 +3443 @@
 #if ENABLE(SMOOTH_SCROLLING)
     coreSettings->setEnableScrollAnimator(settingsPrivate->enableSmoothScrolling);
+#endif
+
+#if ENABLE(CSS_SHADERS)
+    coreSettings->setCSSCustomFilterEnabled(settingsPrivate->enableCSSShaders);
 #endif
 
@@ -3586 +3590 @@
 #endif
 
+#if ENABLE(CSS_SHADERS)
+    else if (name == g_intern_string("enable-css-shaders"))
+        settings->setCSSCustomFilterEnabled(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);

trunk/configure.ac

@@ -964 +964 @@
               [],[enable_css_regions="yes"])
 AC_MSG_RESULT([$enable_css_regions])
+
+# Enable css shaders if unstable_features, css_filters and
+# accelerated_compositing are turned on.
+AC_MSG_CHECKING([whether to enable CSS Shaders])
+if test "$enable_unstable_features" = "yes" && test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"; then
+    enable_css_shaders=yes;
+    enable_css_filters=yes;
+fi
+AC_MSG_RESULT([$enable_css_filters])
+AC_MSG_RESULT([$enable_css_shaders])
 
 G_IR_SCANNER=
@@ -1277 +1287 @@
 AM_CONDITIONAL([ENABLE_CSS_EXCLUSIONS],[test "$enable_css_exclusions" = "yes"])
 AM_CONDITIONAL([ENABLE_CSS_REGIONS],[test "$enable_css_regions" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_FILTERS],[test "$enable_css_filters" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS_SHADERS],[test "$enable_css_shaders" = "yes"])
 
 # Gtk conditionals