Changeset 128924 in webkit

Timestamp:

Sep 18, 2012 1:07:18 PM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Create a flag to enable PeerConnection00
​https://bugs.webkit.org/show_bug.cgi?id=96989

Reviewed by Adam Barth.

Adding the functionality to separately enable/disable PeerConnection00.
For now it is enabled by default.

Source/WebCore:

Not testable, nor likely to cause issues.

• bindings/generic/RuntimeEnabledFeatures.cpp:

(WebCore):

• bindings/generic/RuntimeEnabledFeatures.h:

(WebCore::RuntimeEnabledFeatures::deprecatedPeerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::setDeprecatedPeerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::webkitPeerConnection00Enabled):
(RuntimeEnabledFeatures):

Source/WebKit/chromium:

• public/WebRuntimeFeatures.h:

(WebRuntimeFeatures):

• src/WebRuntimeFeatures.cpp:

(WebKit::WebRuntimeFeatures::enableDeprecatedPeerConnection):
(WebKit):
(WebKit::WebRuntimeFeatures::isDeprecatedPeerConnectionEnabled):

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-18  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Create a flag to enable PeerConnection00
+        https://bugs.webkit.org/show_bug.cgi?id=96989
+
+        Reviewed by Adam Barth.
+
+        Adding the functionality to separately enable/disable PeerConnection00.
+        For now it is enabled by default.
+
+        Not testable, nor likely to cause issues.
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        (WebCore):
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::deprecatedPeerConnectionEnabled):
+        (WebCore::RuntimeEnabledFeatures::setDeprecatedPeerConnectionEnabled):
+        (WebCore::RuntimeEnabledFeatures::webkitPeerConnection00Enabled):
+        (RuntimeEnabledFeatures):
+
 2012-09-18  Bo Liu  <boliu@chromium.org>
 

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

@@ -65 +65 @@
 bool RuntimeEnabledFeatures::isMediaStreamEnabled = false;
 bool RuntimeEnabledFeatures::isPeerConnectionEnabled = true;
+bool RuntimeEnabledFeatures::isDeprecatedPeerConnectionEnabled = true;
 #endif
 

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

@@ -186 +186 @@
     static bool peerConnectionEnabled() { return isMediaStreamEnabled && isPeerConnectionEnabled; }
     static void setPeerConnectionEnabled(bool isEnabled) { isPeerConnectionEnabled = isEnabled; }
-    static bool webkitPeerConnection00Enabled() { return peerConnectionEnabled(); }
+    static bool deprecatedPeerConnectionEnabled() { return isMediaStreamEnabled && isDeprecatedPeerConnectionEnabled; }
+    static void setDeprecatedPeerConnectionEnabled(bool isEnabled) { isDeprecatedPeerConnectionEnabled = isEnabled; }
+    static bool webkitPeerConnection00Enabled() { return deprecatedPeerConnectionEnabled(); }
     static bool webkitRTCPeerConnectionEnabled() { return peerConnectionEnabled(); }
 #endif
@@ -299 +301 @@
     static bool isMediaStreamEnabled;
     static bool isPeerConnectionEnabled;
+    static bool isDeprecatedPeerConnectionEnabled;
 #endif
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-18  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Create a flag to enable PeerConnection00
+        https://bugs.webkit.org/show_bug.cgi?id=96989
+
+        Reviewed by Adam Barth.
+
+        Adding the functionality to separately enable/disable PeerConnection00.
+        For now it is enabled by default.
+
+        * public/WebRuntimeFeatures.h:
+        (WebRuntimeFeatures):
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableDeprecatedPeerConnection):
+        (WebKit):
+        (WebKit::WebRuntimeFeatures::isDeprecatedPeerConnectionEnabled):
+
 2012-09-18  Iain Merrick  <husky@google.com>
 

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

@@ -113 +113 @@
     WEBKIT_EXPORT static void enablePeerConnection(bool);
     WEBKIT_EXPORT static bool isPeerConnectionEnabled();
+    WEBKIT_EXPORT static void enableDeprecatedPeerConnection(bool);
+    WEBKIT_EXPORT static bool isDeprecatedPeerConnectionEnabled();
 
     WEBKIT_EXPORT static void enableFullScreenAPI(bool);

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

@@ -369 +369 @@
 }
 
+void WebRuntimeFeatures::enableDeprecatedPeerConnection(bool enable)
+{
+#if ENABLE(MEDIA_STREAM)
+    RuntimeEnabledFeatures::setDeprecatedPeerConnectionEnabled(enable);
+#else
+    UNUSED_PARAM(enable);
+#endif
+}
+
+bool WebRuntimeFeatures::isDeprecatedPeerConnectionEnabled()
+{
+#if ENABLE(MEDIA_STREAM)
+    return RuntimeEnabledFeatures::deprecatedPeerConnectionEnabled();
+#else
+    return false;
+#endif
+}
+
 void WebRuntimeFeatures::enableFullScreenAPI(bool enable)
 {