Modified: trunk/Source/WebKit/gtk/ChangeLog (128999 => 129000)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-09-19 14:08:21 UTC (rev 128999)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-09-19 14:09:03 UTC (rev 129000)
@@ -1,3 +1,20 @@
+2012-09-19 Danilo Cesar Lemes de Paula <[email protected]>
+
+ [gtk] add enable-media-stream to websettings
+ https://bugs.webkit.org/show_bug.cgi?id=94361
+
+ Reviewed by Martin Robinson.
+
+ Applications should be allowed to enable/disable MediaStream on webkitwebsettings.
+
+ * 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):
+
2012-09-14 Zan Dobersek <[email protected]>
[GTK] Clear application cache between tests in DumpRenderTree
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (128999 => 129000)
--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2012-09-19 14:08:21 UTC (rev 128999)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2012-09-19 14:09:03 UTC (rev 129000)
@@ -114,6 +114,7 @@
PROP_ENABLE_FULLSCREEN,
PROP_ENABLE_DNS_PREFETCHING,
PROP_ENABLE_WEBGL,
+ PROP_ENABLE_MEDIA_STREAM,
PROP_ENABLE_WEB_AUDIO,
PROP_ENABLE_ACCELERATED_COMPOSITING,
PROP_ENABLE_SMOOTH_SCROLLING,
@@ -889,6 +890,25 @@
_("Whether WebKit prefetches domain names"),
TRUE,
flags));
+ /**
+ * WebKitWebSettings:enable-media-stream:
+ *
+ * Enable or disable support for Media Stream on pages. Media Stream is
+ * an experimental proposal for allowing web pages to access local video and
+ * audio input devices. The standard is currently a work-in-progress as part
+ * of the Web Applications 1.0 specification from WHATWG.
+ *
+ * See also http://www.w3.org/TR/mediacapture-streams/
+ *
+ * Since: 1.10.0
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_ENABLE_MEDIA_STREAM,
+ g_param_spec_boolean("enable-media-stream",
+ _("Enable Media Stream"),
+ _("Whether Media Stream should be enabled"),
+ FALSE,
+ flags));
/**
* WebKitWebSettings:enable-smooth-scrolling
@@ -1130,6 +1150,9 @@
case PROP_ENABLE_WEBGL:
priv->enableWebgl = g_value_get_boolean(value);
break;
+ case PROP_ENABLE_MEDIA_STREAM:
+ priv->enableMediaStream = g_value_get_boolean(value);
+ break;
case PROP_ENABLE_WEB_AUDIO:
priv->enableWebAudio = g_value_get_boolean(value);
break;
@@ -1307,6 +1330,9 @@
case PROP_ENABLE_WEBGL:
g_value_set_boolean(value, priv->enableWebgl);
break;
+ case PROP_ENABLE_MEDIA_STREAM:
+ g_value_set_boolean(value, priv->enableMediaStream);
+ break;
case PROP_ENABLE_WEB_AUDIO:
g_value_set_boolean(value, priv->enableWebAudio);
break;
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h (128999 => 129000)
--- trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h 2012-09-19 14:08:21 UTC (rev 128999)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h 2012-09-19 14:09:03 UTC (rev 129000)
@@ -78,6 +78,7 @@
gboolean enableFullscreen;
gboolean enableDNSPrefetching;
gboolean enableWebgl;
+ gboolean enableMediaStream;
gboolean enableWebAudio;
gboolean enableAcceleratedCompositing;
gboolean enableSmoothScrolling;
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (128999 => 129000)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-09-19 14:08:21 UTC (rev 128999)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-09-19 14:09:03 UTC (rev 129000)
@@ -80,6 +80,7 @@
#include "ProgressTracker.h"
#include "RenderView.h"
#include "ResourceHandle.h"
+#include "RuntimeEnabledFeatures.h"
#include "ScriptValue.h"
#include "Settings.h"
#include "webkit/WebKitDOMDocumentPrivate.h"
@@ -3432,6 +3433,10 @@
coreSettings->setWebGLEnabled(settingsPrivate->enableWebgl);
#endif
+#if ENABLE(MEDIA_STREAM)
+ WebCore::RuntimeEnabledFeatures::setMediaStreamEnabled(settingsPrivate->enableMediaStream);
+#endif
+
#if USE(ACCELERATED_COMPOSITING)
coreSettings->setAcceleratedCompositingEnabled(settingsPrivate->enableAcceleratedCompositing);
#endif
