Title: [237905] trunk
Revision
237905
Author
[email protected]
Date
2018-11-06 17:57:39 -0800 (Tue, 06 Nov 2018)

Log Message

Make mDNS ICE Candidate an experimental flag again
https://bugs.webkit.org/show_bug.cgi?id=191262

Reviewed by Dean Jackson.

Source/WebCore:

Rename mdnsICECandidatesEnabled to webRTCICECandidatesEnabled.
This allows grouping the WebRTC runtime flags.
No change of behavior.

* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::newICECandidate):
* page/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::webRTCMDNSICECandidatesEnabled const):
(WebCore::RuntimeEnabledFeatures::setWebRTCMDNSICECandidatesEnabled):
(WebCore::RuntimeEnabledFeatures::mdnsICECandidatesEnabled const): Deleted.
(WebCore::RuntimeEnabledFeatures::setMDNSICECandidatesEnabled): Deleted.

Source/WebKit:

* Shared/WebPreferences.yaml:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetWebRTCMDNSICECandidatesEnabled):
(WKPreferencesGetWebRTCMDNSICECandidatesEnabled):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

Tools:

* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setWebRTCMDNSICECandidatesEnabled):
(WTR::TestRunner::setMDNSICECandidatesEnabled): Deleted.
* WebKitTestRunner/InjectedBundle/TestRunner.h:

LayoutTests:

* webrtc/datachannel/mdns-ice-candidates.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (237904 => 237905)


--- trunk/LayoutTests/ChangeLog	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/LayoutTests/ChangeLog	2018-11-07 01:57:39 UTC (rev 237905)
@@ -1,3 +1,12 @@
+2018-11-06  Youenn Fablet  <[email protected]>
+
+        Make mDNS ICE Candidate an experimental flag again
+        https://bugs.webkit.org/show_bug.cgi?id=191262
+
+        Reviewed by Dean Jackson.
+
+        * webrtc/datachannel/mdns-ice-candidates.html:
+
 2018-11-06  Myles C. Maxfield  <[email protected]>
 
         Implement text-underline-offset and text-decoration-thickness

Modified: trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html (237904 => 237905)


--- trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html	2018-11-07 01:57:39 UTC (rev 237905)
@@ -10,7 +10,7 @@
     <script src =""
     <script>
 if (window.testRunner)
-    testRunner.setMDNSICECandidatesEnabled(true);
+    testRunner.setWebRTCMDNSICECandidatesEnabled(true);
 if (window.internals)
     internals.setICECandidateFiltering(true);
 

Modified: trunk/Source/WebCore/ChangeLog (237904 => 237905)


--- trunk/Source/WebCore/ChangeLog	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebCore/ChangeLog	2018-11-07 01:57:39 UTC (rev 237905)
@@ -1,3 +1,22 @@
+2018-11-06  Youenn Fablet  <[email protected]>
+
+        Make mDNS ICE Candidate an experimental flag again
+        https://bugs.webkit.org/show_bug.cgi?id=191262
+
+        Reviewed by Dean Jackson.
+
+        Rename mdnsICECandidatesEnabled to webRTCICECandidatesEnabled.
+        This allows grouping the WebRTC runtime flags.
+        No change of behavior.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::PeerConnectionBackend::newICECandidate):
+        * page/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::webRTCMDNSICECandidatesEnabled const):
+        (WebCore::RuntimeEnabledFeatures::setWebRTCMDNSICECandidatesEnabled):
+        (WebCore::RuntimeEnabledFeatures::mdnsICECandidatesEnabled const): Deleted.
+        (WebCore::RuntimeEnabledFeatures::setMDNSICECandidatesEnabled): Deleted.
+
 2018-11-06  Myles C. Maxfield  <[email protected]>
 
         Implement text-underline-offset and text-decoration-thickness

Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (237904 => 237905)


--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp	2018-11-07 01:57:39 UTC (rev 237905)
@@ -406,7 +406,7 @@
     if (sdp.find(" host ", 0) != notFound) {
         // FIXME: We might need to clear all pending candidates when setting again local description.
         m_pendingICECandidates.append(PendingICECandidate { String { sdp }, WTFMove(mid), sdpMLineIndex, WTFMove(serverURL) });
-        if (RuntimeEnabledFeatures::sharedFeatures().mdnsICECandidatesEnabled()) {
+        if (RuntimeEnabledFeatures::sharedFeatures().webRTCMDNSICECandidatesEnabled()) {
             auto ipAddress = extractIPAddres(sdp);
             // We restrict to IPv4 candidates for now.
             if (ipAddress.contains('.'))

Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (237904 => 237905)


--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2018-11-07 01:57:39 UTC (rev 237905)
@@ -214,8 +214,8 @@
     void setWebRTCUnifiedPlanEnabled(bool isEnabled) { m_isWebRTCUnifiedPlanEnabled = isEnabled; }
     bool peerConnectionEnabled() const { return m_isPeerConnectionEnabled; }
     void setPeerConnectionEnabled(bool isEnabled) { m_isPeerConnectionEnabled = isEnabled; }
-    bool mdnsICECandidatesEnabled() const { return m_mdnsICECandidatesEnabled; }
-    void setMDNSICECandidatesEnabled(bool isEnabled) { m_mdnsICECandidatesEnabled = isEnabled; }
+    bool webRTCMDNSICECandidatesEnabled() const { return m_isWebRTCMDNSICECandidatesEnabled; }
+    void setWebRTCMDNSICECandidatesEnabled(bool isEnabled) { m_isWebRTCMDNSICECandidatesEnabled = isEnabled; }
     bool webRTCH264SimulcastEnabled() const { return m_isWebRTCH264SimulcastEnabled; }
     void setWebRTCH264SimulcastEnabled(bool isEnabled) { m_isWebRTCH264SimulcastEnabled = isEnabled; }
 #endif
@@ -399,7 +399,7 @@
     bool m_isWebRTCVP8CodecEnabled { true };
     bool m_isWebRTCUnifiedPlanEnabled { true };
     bool m_isPeerConnectionEnabled { true };
-    bool m_mdnsICECandidatesEnabled { false };
+    bool m_isWebRTCMDNSICECandidatesEnabled { false };
     bool m_isWebRTCH264SimulcastEnabled { true };
 #endif
 

Modified: trunk/Source/WebKit/ChangeLog (237904 => 237905)


--- trunk/Source/WebKit/ChangeLog	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebKit/ChangeLog	2018-11-07 01:57:39 UTC (rev 237905)
@@ -1,3 +1,17 @@
+2018-11-06  Youenn Fablet  <[email protected]>
+
+        Make mDNS ICE Candidate an experimental flag again
+        https://bugs.webkit.org/show_bug.cgi?id=191262
+
+        Reviewed by Dean Jackson.
+
+        * Shared/WebPreferences.yaml:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetWebRTCMDNSICECandidatesEnabled):
+        (WKPreferencesGetWebRTCMDNSICECandidatesEnabled):
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+
 2018-11-06  Suresh Koppisetty  <[email protected]>
 
         Don’t use the main queue to create an XPC connection.

Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (237904 => 237905)


--- trunk/Source/WebKit/Shared/WebPreferences.yaml	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml	2018-11-07 01:57:39 UTC (rev 237905)
@@ -532,6 +532,15 @@
   humanReadableDescription: "Enable WebRTC H264 Simulcast"
   category: experimental
 
+WebRTCMDNSICECandidatesEnabled:
+  type: bool
+  defaultValue: false
+  humanReadableName: "WebRTC mDNS ICE candidates"
+  humanReadableDescription: "Enable WebRTC mDNS ICE candidates"
+  webcoreBinding: RuntimeEnabledFeatures
+  category: experimental
+  condition: ENABLE(WEB_RTC)
+
 UseLegacyTextAlignPositionedElementBehavior:
   type: bool
   defaultValue: false
@@ -1378,15 +1387,6 @@
   humanReadableDescription: "Perform frame scrolling in a dedicated thread or process"
   category: internal
 
-MDNSICECandidatesEnabled:
-  type: bool
-  defaultValue: false
-  humanReadableName: "MDNS ICE candidates"
-  humanReadableDescription: "Enable MDNS ICE candidates"
-  webcoreBinding: RuntimeEnabledFeatures
-  category: internal
-  condition: ENABLE(WEB_RTC)
-
 FetchAPIKeepAliveEnabled:
   type: bool
   defaultValue: false

Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (237904 => 237905)


--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp	2018-11-07 01:57:39 UTC (rev 237905)
@@ -1432,12 +1432,12 @@
 
 void WKPreferencesSetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef, bool enabled)
 {
-    toImpl(preferencesRef)->setMDNSICECandidatesEnabled(enabled);
+    toImpl(preferencesRef)->setWebRTCMDNSICECandidatesEnabled(enabled);
 }
 
 bool WKPreferencesGetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef)
 {
-    return toImpl(preferencesRef)->mDNSICECandidatesEnabled();
+    return toImpl(preferencesRef)->webRTCMDNSICECandidatesEnabled();
 }
 
 void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled)

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (237904 => 237905)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2018-11-07 01:57:39 UTC (rev 237905)
@@ -239,8 +239,8 @@
 #endif
 
 #if ENABLE(WEB_RTC)
-    if (preference == "WebKitMDNSICECandidatesEnabled")
-        RuntimeEnabledFeatures::sharedFeatures().setMDNSICECandidatesEnabled(enabled);
+    if (preference == "WebKitWebRTCMDNSICECandidatesEnabled")
+        RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled);
     if (preference == "WebKitWebRTCUnifiedPlanEnabled")
         RuntimeEnabledFeatures::sharedFeatures().setWebRTCUnifiedPlanEnabled(enabled);
 #endif

Modified: trunk/Tools/ChangeLog (237904 => 237905)


--- trunk/Tools/ChangeLog	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Tools/ChangeLog	2018-11-07 01:57:39 UTC (rev 237905)
@@ -1,3 +1,16 @@
+2018-11-06  Youenn Fablet  <[email protected]>
+
+        Make mDNS ICE Candidate an experimental flag again
+        https://bugs.webkit.org/show_bug.cgi?id=191262
+
+        Reviewed by Dean Jackson.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setWebRTCMDNSICECandidatesEnabled):
+        (WTR::TestRunner::setMDNSICECandidatesEnabled): Deleted.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
 2018-11-06  Aakash Jain  <[email protected]>
 
         [ews-app] Add views for OpenSource EWS Django app

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (237904 => 237905)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl	2018-11-07 01:57:39 UTC (rev 237905)
@@ -325,7 +325,7 @@
     // Open panel
     void setOpenPanelFiles(object filesArray);
 
-    void setMDNSICECandidatesEnabled(boolean value);
+    void setWebRTCMDNSICECandidatesEnabled(boolean value);
     void setWebRTCUnifiedPlanEnabled(boolean value);
     void setCustomUserAgent(DOMString userAgent);
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (237904 => 237905)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2018-11-07 01:57:39 UTC (rev 237905)
@@ -438,9 +438,9 @@
     WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
 }
 
-void TestRunner::setMDNSICECandidatesEnabled(bool enabled)
+void TestRunner::setWebRTCMDNSICECandidatesEnabled(bool enabled)
 {
-    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitMDNSICECandidatesEnabled"));
+    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitWebRTCMDNSICECandidatesEnabled"));
     auto& injectedBundle = InjectedBundle::singleton();
     WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
 }

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (237904 => 237905)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h	2018-11-07 01:44:46 UTC (rev 237904)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h	2018-11-07 01:57:39 UTC (rev 237905)
@@ -131,7 +131,7 @@
     void setAllowsAnySSLCertificate(bool);
     void setEncryptedMediaAPIEnabled(bool);
     void setMediaDevicesEnabled(bool);
-    void setMDNSICECandidatesEnabled(bool);
+    void setWebRTCMDNSICECandidatesEnabled(bool);
     void setWebRTCUnifiedPlanEnabled(bool);
     void setCustomUserAgent(JSStringRef);
     void setWebAPIStatisticsEnabled(bool);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to