Changeset 129000 in webkit

Timestamp:

Sep 19, 2012 7:09:03 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[gtk] add enable-media-stream to websettings
​https://bugs.webkit.org/show_bug.cgi?id=94361

Patch by Danilo Cesar Lemes de Paula <​danilo.cesar@collabora.co.uk> on 2012-09-19
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):

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebsettings.cpp (modified) (4 diffs)
• webkit/webkitwebsettingsprivate.h (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-09-19  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
+
+        [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  <zandobersek@gmail.com>
 

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

@@ -115 +115 @@
     PROP_ENABLE_DNS_PREFETCHING,
     PROP_ENABLE_WEBGL,
+    PROP_ENABLE_MEDIA_STREAM,
     PROP_ENABLE_WEB_AUDIO,
     PROP_ENABLE_ACCELERATED_COMPOSITING,
@@ -890 +891 @@
                                                          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));
 
     /**
@@ -1131 +1151 @@
         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);
@@ -1307 +1330 @@
     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:

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

@@ -79 +79 @@
     gboolean enableDNSPrefetching;
     gboolean enableWebgl;
+    gboolean enableMediaStream;
     gboolean enableWebAudio;
     gboolean enableAcceleratedCompositing;

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

@@ -81 +81 @@
 #include "RenderView.h"
 #include "ResourceHandle.h"
+#include "RuntimeEnabledFeatures.h"
 #include "ScriptValue.h"
 #include "Settings.h"
@@ -3431 +3432 @@
 #if ENABLE(WEBGL)
     coreSettings->setWebGLEnabled(settingsPrivate->enableWebgl);
+#endif
+
+#if ENABLE(MEDIA_STREAM)
+    WebCore::RuntimeEnabledFeatures::setMediaStreamEnabled(settingsPrivate->enableMediaStream);
 #endif