Title: [128924] trunk/Source
- Revision
- 128924
- Author
- [email protected]
- Date
- 2012-09-18 13:07:18 -0700 (Tue, 18 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128923 => 128924)
--- trunk/Source/WebCore/ChangeLog 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebCore/ChangeLog 2012-09-18 20:07:18 UTC (rev 128924)
@@ -1,3 +1,23 @@
+2012-09-18 Tommy Widenflycht <[email protected]>
+
+ 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 <[email protected]>
Revert 128780, 128676, 128645
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (128923 => 128924)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-09-18 20:07:18 UTC (rev 128924)
@@ -64,6 +64,7 @@
#if ENABLE(MEDIA_STREAM)
bool RuntimeEnabledFeatures::isMediaStreamEnabled = false;
bool RuntimeEnabledFeatures::isPeerConnectionEnabled = true;
+bool RuntimeEnabledFeatures::isDeprecatedPeerConnectionEnabled = true;
#endif
#if ENABLE(GAMEPAD)
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (128923 => 128924)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-09-18 20:07:18 UTC (rev 128924)
@@ -185,7 +185,9 @@
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
@@ -298,6 +300,7 @@
#if ENABLE(MEDIA_STREAM)
static bool isMediaStreamEnabled;
static bool isPeerConnectionEnabled;
+ static bool isDeprecatedPeerConnectionEnabled;
#endif
#if ENABLE(GAMEPAD)
Modified: trunk/Source/WebKit/chromium/ChangeLog (128923 => 128924)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-18 20:07:18 UTC (rev 128924)
@@ -1,3 +1,20 @@
+2012-09-18 Tommy Widenflycht <[email protected]>
+
+ 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 <[email protected]>
[Chromium] Merge moveSelectionStart, moveSelectionEnd, and moveCaret into selectRange
Modified: trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h (128923 => 128924)
--- trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2012-09-18 20:07:18 UTC (rev 128924)
@@ -112,6 +112,8 @@
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);
WEBKIT_EXPORT static bool isFullScreenAPIEnabled();
Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (128923 => 128924)
--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-09-18 19:55:55 UTC (rev 128923)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-09-18 20:07:18 UTC (rev 128924)
@@ -368,6 +368,24 @@
#endif
}
+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)
{
#if ENABLE(FULLSCREEN_API)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
