Modified: trunk/Source/WebKit2/ChangeLog (107043 => 107044)
--- trunk/Source/WebKit2/ChangeLog 2012-02-08 07:21:31 UTC (rev 107043)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-08 08:05:05 UTC (rev 107044)
@@ -1,3 +1,23 @@
+2012-02-08 Philippe Normand <pnorm...@igalia.com>
+
+ [GTK][WK2] enable-webaudio WebSetting
+ https://bugs.webkit.org/show_bug.cgi?id=77959
+
+ Reviewed by Martin Robinson.
+
+ Add a new WebKitGTK WebSetting to enable/disable WebAudio at
+ runtime.
+
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_get_enable_webaudio):
+ (webkit_settings_set_enable_webaudio):
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+ (testWebKitSettings):
+
2012-02-07 Martin Robinson <mrobin...@igalia.com>
[GTK] [WK2] Add WebKitResponsePolicyDecision
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (107043 => 107044)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2012-02-08 07:21:31 UTC (rev 107043)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2012-02-08 08:05:05 UTC (rev 107044)
@@ -101,7 +101,8 @@
PROP_ENABLE_DNS_PREFETCHING,
PROP_ENABLE_CARET_BROWSING,
PROP_ENABLE_FULLSCREEN,
- PROP_PRINT_BACKGROUNDS
+ PROP_PRINT_BACKGROUNDS,
+ PROP_ENABLE_WEBAUDIO
};
static void webKitSettingsSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -202,6 +203,9 @@
case PROP_PRINT_BACKGROUNDS:
webkit_settings_set_print_backgrounds(settings, g_value_get_boolean(value));
break;
+ case PROP_ENABLE_WEBAUDIO:
+ webkit_settings_set_enable_webaudio(settings, g_value_get_boolean(value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -306,6 +310,9 @@
case PROP_PRINT_BACKGROUNDS:
g_value_set_boolean(value, webkit_settings_get_print_backgrounds(settings));
break;
+ case PROP_ENABLE_WEBAUDIO:
+ g_value_set_boolean(value, webkit_settings_get_enable_webaudio(settings));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -768,6 +775,25 @@
TRUE,
readWriteConstructParamFlags));
+ /**
+ * WebKitSettings:enable-webaudio:
+ *
+ *
+ * Enable or disable support for WebAudio on pages. WebAudio is an
+ * experimental proposal for allowing web pages to generate Audio
+ * WAVE data from _javascript_. The standard is currently a
+ * work-in-progress by the W3C Audio Working Group.
+ *
+ * See also https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html
+ */
+ g_object_class_install_property(gObjectClass,
+ PROP_ENABLE_WEBAUDIO,
+ g_param_spec_boolean("enable-webaudio",
+ _("Enable WebAudio"),
+ _("Whether WebAudio content should be handled"),
+ FALSE,
+ readWriteConstructParamFlags));
+
g_type_class_add_private(klass, sizeof(WebKitSettingsPrivate));
}
@@ -1955,3 +1981,38 @@
WKPreferencesSetShouldPrintBackgrounds(priv->preferences.get(), printBackgrounds);
g_object_notify(G_OBJECT(settings), "print-backgrounds");
}
+
+/**
+ * webkit_settings_get_enable_webaudio:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-webaudio property.
+ *
+ * Returns: %TRUE If webaudio support is enabled or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_enable_webaudio(WebKitSettings* settings)
+{
+ g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+ return WKPreferencesGetWebAudioEnabled(settings->priv->preferences.get());
+}
+
+/**
+ * webkit_settings_set_enable_webaudio:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-webaudio property.
+ */
+void webkit_settings_set_enable_webaudio(WebKitSettings* settings, gboolean enabled)
+{
+ g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ WebKitSettingsPrivate* priv = settings->priv;
+ bool currentValue = WKPreferencesGetWebAudioEnabled(priv->preferences.get());
+ if (currentValue == enabled)
+ return;
+
+ WKPreferencesSetWebAudioEnabled(priv->preferences.get(), enabled);
+ g_object_notify(G_OBJECT(settings), "enable-webaudio");
+}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h (107043 => 107044)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2012-02-08 07:21:31 UTC (rev 107043)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2012-02-08 08:05:05 UTC (rev 107044)
@@ -293,6 +293,13 @@
webkit_settings_set_print_backgrounds (WebKitSettings *settings,
gboolean print_backgrounds);
+WEBKIT_API gboolean
+webkit_settings_get_enable_webaudio (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_webaudio (WebKitSettings *settings,
+ gboolean enabled);
+
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (107043 => 107044)
--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2012-02-08 07:21:31 UTC (rev 107043)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2012-02-08 08:05:05 UTC (rev 107044)
@@ -216,6 +216,8 @@
webkit_settings_set_enable_fullscreen
webkit_settings_get_print_backgrounds
webkit_settings_set_print_backgrounds
+webkit_settings_get_enable_webaudio
+webkit_settings_set_enable_webaudio
<SUBSECTION Standard>
WebKitSettingsClass
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (107043 => 107044)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2012-02-08 07:21:31 UTC (rev 107043)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2012-02-08 08:05:05 UTC (rev 107044)
@@ -189,6 +189,11 @@
webkit_settings_set_print_backgrounds(settings, FALSE);
g_assert(!webkit_settings_get_print_backgrounds(settings));
+ // WebAudio is disabled by default.
+ g_assert(!webkit_settings_get_enable_webaudio(settings));
+ webkit_settings_set_enable_webaudio(settings, TRUE);
+ g_assert(webkit_settings_get_enable_webaudio(settings));
+
g_object_unref(G_OBJECT(settings));
}
