Attachment 368328 Details for Bug 197315 – Patch

[patch] Patch

bug-197315-20190426100823.patch (text/plain), 3.34 KB, created by youenn fablet on 2019-04-26 10:08:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-04-26 10:08:23 PDT

Size: 3.34 KB

patch

obsolete

>Subversion Revision: 244694
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1bb30dd88921041855632b3d55a4944e125b9870..0f0c8d084e93e5ce038ec05f49bb78a8e4fb204a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-26  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 NOBODY (OOPS!).
>+
>+        No change of behavior, removing no longer needed code.
>+
>+        * Modules/mediastream/PeerConnectionBackend.cpp:
>+        (WebCore::PeerConnectionBackend::addIceCandidateSucceeded):
>+        (WebCore::PeerConnectionBackend::addIceCandidateFailed):
>+        * Modules/mediastream/PeerConnectionBackend.h:
>+
> 2019-04-26  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix an internal High Sierra build after r244653
>diff --git a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
>index 12a23e9072538e6cbd6652408c9470c896237c70..04ec535064a7c89591afbba2620577165814fc4d 100644
>--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
>+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
>@@ -308,14 +308,10 @@ void PeerConnectionBackend::addIceCandidateSucceeded()
>     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 @@ void PeerConnectionBackend::addIceCandidateFailed(Exception&& exception)
> 
>     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)
>diff --git a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>index d496ce1e7d5d8b36b25d5d8414a62e7a2a2044b9..dbbed4df65c1a7426d405f6af948f34ffb2cf9a7 100644
>--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>@@ -210,7 +210,6 @@ private:
>     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 @@ private:
>     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

Actions: View | Formatted Diff | Diff

Attachments on bug 197315: 368325 | 368328 | 368359