Title: [244724] trunk/Source/WebCore
- Revision
- 244724
- Author
- [email protected]
- Date
- 2019-04-28 12:02:39 -0700 (Sun, 28 Apr 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (244723 => 244724)
--- trunk/Source/WebCore/ChangeLog 2019-04-27 22:45:38 UTC (rev 244723)
+++ trunk/Source/WebCore/ChangeLog 2019-04-28 19:02:39 UTC (rev 244724)
@@ -1,3 +1,19 @@
+2019-04-28 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
Move some Compositing logging to the Layers log channel
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (244723 => 244724)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2019-04-27 22:45:38 UTC (rev 244723)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2019-04-28 19:02:39 UTC (rev 244724)
@@ -308,14 +308,10 @@
if (m_peerConnection.isClosed())
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));
}
void PeerConnectionBackend::addIceCandidateFailed(Exception&& exception)
@@ -330,9 +326,6 @@
m_addIceCandidatePromise->reject(WTFMove(exception));
m_addIceCandidatePromise = WTF::nullopt;
-
- if (!m_waitingForMDNSResolution && m_finishedReceivingCandidates)
- endOfIceCandidates(WTFMove(*m_endOfIceCandidatePromise));
}
void PeerConnectionBackend::fireICECandidateEvent(RefPtr<RTCIceCandidate>&& candidate, String&& serverURL)
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (244723 => 244724)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2019-04-27 22:45:38 UTC (rev 244723)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2019-04-28 19:02:39 UTC (rev 244724)
@@ -210,7 +210,6 @@
Optional<PeerConnection::SessionDescriptionPromise> m_offerAnswerPromise;
Optional<DOMPromiseDeferred<void>> m_setDescriptionPromise;
Optional<DOMPromiseDeferred<void>> m_addIceCandidatePromise;
- Optional<DOMPromiseDeferred<void>> m_endOfIceCandidatePromise;
bool m_shouldFilterICECandidates { true };
struct PendingICECandidate {
@@ -229,11 +228,6 @@
bool m_negotiationNeeded { false };
bool m_finishedGatheringCandidates { false };
uint64_t m_waitingForMDNSRegistration { 0 };
-
- bool m_finishedReceivingCandidates { false };
- uint64_t m_waitingForMDNSResolution { 0 };
-
- HashMap<String, String> m_mdnsMapping;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
