Changeset 244724 in webkit

Timestamp:

Apr 28, 2019 12:02:39 PM (5 years ago)

Author:

youenn@apple.com

Message:

Remove no longer needed mDNS ICE candidate resolution code
​https://bugs.webkit.org/show_bug.cgi?id=197315

Reviewed by Eric Carlson.

No change of behavior.
Removed code is no longer exercised as mDNS resolution happens inside libwebrtc
using the same resolution mechanism as for TURN/STUN server names.

• Modules/mediastream/PeerConnectionBackend.cpp:

(WebCore::PeerConnectionBackend::addIceCandidateSucceeded):
(WebCore::PeerConnectionBackend::addIceCandidateFailed):

• Modules/mediastream/PeerConnectionBackend.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/PeerConnectionBackend.cpp (modified) (2 diffs)
• Modules/mediastream/PeerConnectionBackend.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-28  Youenn Fablet  <youenn@apple.com>
+
+        Remove no longer needed mDNS ICE candidate resolution code
+        https://bugs.webkit.org/show_bug.cgi?id=197315
+
+        Reviewed by Eric Carlson.
+
+        No change of behavior.
+        Removed code is no longer exercised as mDNS resolution happens inside libwebrtc
+        using the same resolution mechanism as for TURN/STUN server names.
+
+        * Modules/mediastream/PeerConnectionBackend.cpp:
+        (WebCore::PeerConnectionBackend::addIceCandidateSucceeded):
+        (WebCore::PeerConnectionBackend::addIceCandidateFailed):
+        * Modules/mediastream/PeerConnectionBackend.h:
+
 2019-04-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp

@@ -309 +309 @@
         return;
 
-    // FIXME: Update remote description and set ICE connection state to checking if not already done so.
     ASSERT(m_addIceCandidatePromise);
 
     m_addIceCandidatePromise->resolve();
     m_addIceCandidatePromise = WTF::nullopt;
-
-    if (!m_waitingForMDNSResolution && m_finishedReceivingCandidates)
-        endOfIceCandidates(WTFMove(*m_endOfIceCandidatePromise));
 }
 
@@ -331 +327 @@
     m_addIceCandidatePromise->reject(WTFMove(exception));
     m_addIceCandidatePromise = WTF::nullopt;
-
-    if (!m_waitingForMDNSResolution && m_finishedReceivingCandidates)
-        endOfIceCandidates(WTFMove(*m_endOfIceCandidatePromise));
 }
 

trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h

@@ -211 +211 @@
     Optional<DOMPromiseDeferred<void>> m_setDescriptionPromise;
     Optional<DOMPromiseDeferred<void>> m_addIceCandidatePromise;
-    Optional<DOMPromiseDeferred<void>> m_endOfIceCandidatePromise;
 
     bool m_shouldFilterICECandidates { true };
@@ -230 +229 @@
     bool m_finishedGatheringCandidates { false };
     uint64_t m_waitingForMDNSRegistration { 0 };
-
-    bool m_finishedReceivingCandidates { false };
-    uint64_t m_waitingForMDNSResolution { 0 };
-
-    HashMap<String, String> m_mdnsMapping;
 };