Changeset 115109 in webkit

Timestamp:

Apr 24, 2012 2:14:21 PM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Create a new flag for PeerConnection
​https://bugs.webkit.org/show_bug.cgi?id=84723

Reviewed by Dimitri Glazkov.

To allow Chrome to make the GetUserMedia functionality available by default we
need another flag for the PeerConnection related parts. This new flag is in
addition to the general media stream flag, and both need to be enabled for
PeerConnection object creation.

Source/WebCore:

No code behavior changes.

• bindings/generic/RuntimeEnabledFeatures.cpp:

(WebCore):

• bindings/generic/RuntimeEnabledFeatures.h:

(RuntimeEnabledFeatures):
(WebCore::RuntimeEnabledFeatures::peerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::setPeerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::webkitDeprecatedPeerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::webkitPeerConnection00Enabled):

Source/WebKit/chromium:

• public/WebRuntimeFeatures.h:

(WebRuntimeFeatures):

• src/WebRuntimeFeatures.cpp:

(WebKit::WebRuntimeFeatures::enablePeerConnection):
(WebKit):
(WebKit::WebRuntimeFeatures::isPeerConnectionEnabled):

Tools:

• DumpRenderTree/chromium/TestShell.cpp:

(TestShell::TestShell):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (modified) (1 diff)
• Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebRuntimeFeatures.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/TestShell.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-24  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Create a new flag for PeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=84723
+
+        Reviewed by Dimitri Glazkov.
+
+        To allow Chrome to make the GetUserMedia functionality available by default we
+        need another flag for the PeerConnection related parts. This new flag is in
+        addition to the general media stream flag, and both need to be enabled for
+        PeerConnection object creation.
+
+        No code behavior changes.
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        (WebCore):
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (RuntimeEnabledFeatures):
+        (WebCore::RuntimeEnabledFeatures::peerConnectionEnabled):
+        (WebCore::RuntimeEnabledFeatures::setPeerConnectionEnabled):
+        (WebCore::RuntimeEnabledFeatures::webkitDeprecatedPeerConnectionEnabled):
+        (WebCore::RuntimeEnabledFeatures::webkitPeerConnection00Enabled):
+
 2012-04-24  Joe Mason  <jmason@rim.com>
 

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

@@ -63 +63 @@
 
 #if ENABLE(MEDIA_STREAM)
-bool RuntimeEnabledFeatures::isMediaStreamEnabled = true;
+bool RuntimeEnabledFeatures::isMediaStreamEnabled = false;
+bool RuntimeEnabledFeatures::isPeerConnectionEnabled = true;
 #endif
 

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

@@ -189 +189 @@
     static void setMediaStreamEnabled(bool isEnabled) { isMediaStreamEnabled = isEnabled; }
     static bool webkitGetUserMediaEnabled() { return isMediaStreamEnabled; }
-    static bool webkitDeprecatedPeerConnectionEnabled() { return isMediaStreamEnabled; }
     static bool webkitMediaStreamEnabled() { return isMediaStreamEnabled; }
-    static bool webkitPeerConnection00Enabled() { return isMediaStreamEnabled; }
+
+    static bool peerConnectionEnabled() { return isMediaStreamEnabled && isPeerConnectionEnabled; }
+    static void setPeerConnectionEnabled(bool isEnabled) { isPeerConnectionEnabled = isEnabled; }
+    static bool webkitDeprecatedPeerConnectionEnabled() { return peerConnectionEnabled(); }
+    static bool webkitPeerConnection00Enabled() { return peerConnectionEnabled(); }
 #endif
 
@@ -269 +272 @@
 #if ENABLE(MEDIA_STREAM)
     static bool isMediaStreamEnabled;
+    static bool isPeerConnectionEnabled;
 #endif
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-24  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Create a new flag for PeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=84723
+
+        Reviewed by Dimitri Glazkov.
+
+        To allow Chrome to make the GetUserMedia functionality available by default we
+        need another flag for the PeerConnection related parts. This new flag is in
+        addition to the general media stream flag, and both need to be enabled for
+        PeerConnection object creation.
+
+        * public/WebRuntimeFeatures.h:
+        (WebRuntimeFeatures):
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enablePeerConnection):
+        (WebKit):
+        (WebKit::WebRuntimeFeatures::isPeerConnectionEnabled):
+
 2012-04-24  Sami Kyostila  <skyostil@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h

@@ -110 +110 @@
     WEBKIT_EXPORT static bool isMediaStreamEnabled();
 
+    WEBKIT_EXPORT static void enablePeerConnection(bool);
+    WEBKIT_EXPORT static bool isPeerConnectionEnabled();
+
     WEBKIT_EXPORT static void enableFullScreenAPI(bool);
     WEBKIT_EXPORT static bool isFullScreenAPIEnabled();

trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

@@ -359 +359 @@
 }
 
+void WebRuntimeFeatures::enablePeerConnection(bool enable)
+{
+#if ENABLE(MEDIA_STREAM)
+    RuntimeEnabledFeatures::setPeerConnectionEnabled(enable);
+#else
+    UNUSED_PARAM(enable);
+#endif
+}
+
+bool WebRuntimeFeatures::isPeerConnectionEnabled()
+{
+#if ENABLE(MEDIA_STREAM)
+    return RuntimeEnabledFeatures::peerConnectionEnabled();
+#else
+    return false;
+#endif
+}
+
 void WebRuntimeFeatures::enableFullScreenAPI(bool enable)
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-24  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Create a new flag for PeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=84723
+
+        Reviewed by Dimitri Glazkov.
+
+        To allow Chrome to make the GetUserMedia functionality available by default we
+        need another flag for the PeerConnection related parts. This new flag is in
+        addition to the general media stream flag, and both need to be enabled for
+        PeerConnection object creation.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+
 2012-04-24  Joe Mason  <jmason@rim.com>
 

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -127 +127 @@
     WebRuntimeFeatures::enableEncryptedMedia(true);
     WebRuntimeFeatures::enableMediaStream(true);
+    WebRuntimeFeatures::enablePeerConnection(true);
     WebRuntimeFeatures::enableWebAudio(true); 
     WebRuntimeFeatures::enableVideoTrack(true);