Title: [209757] trunk
Revision
209757
Author
[email protected]
Date
2016-12-13 08:59:55 -0800 (Tue, 13 Dec 2016)

Log Message

Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
https://bugs.webkit.org/show_bug.cgi?id=165251

Reviewed by Youenn Fablet.

Source/WebCore:

No new tests, fixes an API test.

* page/Settings.in: Delete mediaStreamEnabled and peerConnectionEnabled, we don't need a
setting and a runtime feature.

Source/WebKit2:

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Update the media stream and peer connection runtime
feature instead of the setting.

Tools:

* TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp:
(TestWebKitAPI::TEST): Enable MediaStream, create web view from the page group upon which
the preferences have been set.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209756 => 209757)


--- trunk/Source/WebCore/ChangeLog	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebCore/ChangeLog	2016-12-13 16:59:55 UTC (rev 209757)
@@ -1,3 +1,15 @@
+2016-12-13  Eric Carlson  <[email protected]>
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        No new tests, fixes an API test.
+
+        * page/Settings.in: Delete mediaStreamEnabled and peerConnectionEnabled, we don't need a
+        setting and a runtime feature.
+
 2016-12-13  Antti Koivisto  <[email protected]>
 
         REGRESSION (r198990): Cannot edit content inside <details> in wysiwyg editor

Modified: trunk/Source/WebCore/page/Settings.in (209756 => 209757)


--- trunk/Source/WebCore/page/Settings.in	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebCore/page/Settings.in	2016-12-13 16:59:55 UTC (rev 209757)
@@ -115,8 +115,6 @@
 paginateDuringLayoutEnabled initial=false
 fullScreenEnabled initial=false, conditional=FULLSCREEN_API
 asynchronousSpellCheckingEnabled initial=false
-mediaStreamEnabled initial=false
-peerConnectionEnabled initial=false
 
 # This feature requires an implementation of ValidationMessageClient.
 interactiveFormValidationEnabled initial=false

Modified: trunk/Source/WebKit2/ChangeLog (209756 => 209757)


--- trunk/Source/WebKit2/ChangeLog	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-13 16:59:55 UTC (rev 209757)
@@ -1,3 +1,14 @@
+2016-12-13  Eric Carlson  <[email protected]>
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences): Update the media stream and peer connection runtime
+        feature instead of the setting.
+
 2016-12-13  Sergio Villar Senin  <[email protected]>
 
         Fix GTK build after r209733

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209756 => 209757)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-13 16:59:55 UTC (rev 209757)
@@ -3033,11 +3033,11 @@
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-    settings.setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
+    RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(store.getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
 #endif
 
 #if ENABLE(WEB_RTC)
-    settings.setPeerConnectionEnabled(store.getBoolValueForKey(WebPreferencesKey::peerConnectionEnabledKey()));
+    RuntimeEnabledFeatures::sharedFeatures().setPeerConnectionEnabled(store.getBoolValueForKey(WebPreferencesKey::peerConnectionEnabledKey()));
 #endif
 
 #if ENABLE(SERVICE_CONTROLS)

Modified: trunk/Tools/ChangeLog (209756 => 209757)


--- trunk/Tools/ChangeLog	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Tools/ChangeLog	2016-12-13 16:59:55 UTC (rev 209757)
@@ -1,3 +1,14 @@
+2016-12-13  Eric Carlson  <[email protected]>
+
+        Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
+        https://bugs.webkit.org/show_bug.cgi?id=165251
+
+        Reviewed by Youenn Fablet.
+
+        * TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp:
+        (TestWebKitAPI::TEST): Enable MediaStream, create web view from the page group upon which
+        the preferences have been set.
+
 2016-12-08  Antti Koivisto  <[email protected]>
 
         Enable network cache speculative revalidation in MiniBrowser

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp (209756 => 209757)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp	2016-12-13 16:08:04 UTC (rev 209756)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/EnumerateMediaDevices.cpp	2016-12-13 16:59:55 UTC (rev 209757)
@@ -53,6 +53,7 @@
 
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("EnumerateDevices").get()));
     WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
+    WKPreferencesSetMediaStreamEnabled(preferences, true);
     WKPreferencesSetFileAccessFromFileURLsAllowed(preferences, true);
     WKPreferencesSetMediaCaptureRequiresSecureConnection(preferences, false);
 
@@ -61,7 +62,7 @@
     uiClient.base.version = 6;
     uiClient.checkUserMediaPermissionForOrigin = checkUserMediaPermissionCallback;
 
-    PlatformWebView webView(context.get());
+    PlatformWebView webView(context.get(), pageGroup.get());
     WKPageSetPageUIClient(webView.page(), &uiClient.base);
 
     auto url = "" "html"));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to