diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-14 16:29:47 +0200 |
| commit | d0424a769059c84ae20beb3c217812792ea6726b (patch) | |
| tree | 6f94a5c3db8c52c6694ee56498542a6c35417350 /Source/WebKit/gtk/webkit/webkitwebsettings.cpp | |
| parent | 88a04ac016f57c2d78e714682445dff2e7db4ade (diff) | |
| download | qtwebkit-d0424a769059c84ae20beb3c217812792ea6726b.tar.gz | |
Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608)
New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebsettings.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebsettings.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp index b93361105..db74507f6 100644 --- a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp @@ -118,7 +118,8 @@ enum { PROP_ENABLE_ACCELERATED_COMPOSITING, PROP_ENABLE_SMOOTH_SCROLLING, PROP_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE, - PROP_MEDIA_PLAYBACK_ALLOWS_INLINE + PROP_MEDIA_PLAYBACK_ALLOWS_INLINE, + PROP_ENABLE_CSS_SHADERS }; static void webkit_web_settings_finalize(GObject* object); @@ -941,6 +942,25 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) TRUE, 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)); + } static void webkit_web_settings_init(WebKitWebSettings* web_settings) @@ -1119,6 +1139,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con case PROP_ENABLE_SMOOTH_SCROLLING: 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); break; @@ -1293,6 +1316,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa 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: g_value_set_boolean(value, priv->mediaPlaybackRequiresUserGesture); break; |