Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (282443 => 282444)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-09-15 08:19:01 UTC (rev 282444)
@@ -1,3 +1,14 @@
+2021-09-15 Youenn Fablet <[email protected]>
+
+ Migrate to libwebrtc non-racy setRemoteDescription/setLocalDescription variants
+ https://bugs.webkit.org/show_bug.cgi?id=230262
+
+ Reviewed by Darin Adler.
+
+ * Configurations/libwebrtc.iOS.exp:
+ * Configurations/libwebrtc.iOSsim.exp:
+ * Configurations/libwebrtc.mac.exp:
+
2021-09-09 Youenn Fablet <[email protected]>
Add support for RTCSctpTransport
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp (282443 => 282444)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp 2021-09-15 08:19:01 UTC (rev 282444)
@@ -25,7 +25,7 @@
__ZN6webrtc18CreateIceCandidateERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEiS8_PNS_13SdpParseErrorE
__ZN6webrtc19RTCCertificateStats5kTypeE
__ZN6webrtc19RTCDataChannelStats5kTypeE
-__ZN6webrtc24CreateSessionDescriptionERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_PNS_13SdpParseErrorE
+__ZN6webrtc24CreateSessionDescriptionENS_7SdpTypeERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPNS_13SdpParseErrorE
__ZN6webrtc24RTCIceCandidatePairStats5kTypeE
__ZN6webrtc24RTCInboundRTPStreamStats5kTypeE
__ZN6webrtc24RTCMediaStreamTrackStats5kTypeE
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp (282443 => 282444)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp 2021-09-15 08:19:01 UTC (rev 282444)
@@ -25,7 +25,7 @@
__ZN6webrtc18CreateIceCandidateERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEiS8_PNS_13SdpParseErrorE
__ZN6webrtc19RTCCertificateStats5kTypeE
__ZN6webrtc19RTCDataChannelStats5kTypeE
-__ZN6webrtc24CreateSessionDescriptionERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_PNS_13SdpParseErrorE
+__ZN6webrtc24CreateSessionDescriptionENS_7SdpTypeERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPNS_13SdpParseErrorE
__ZN6webrtc24RTCIceCandidatePairStats5kTypeE
__ZN6webrtc24RTCInboundRTPStreamStats5kTypeE
__ZN6webrtc24RTCMediaStreamTrackStats5kTypeE
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp (282443 => 282444)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp 2021-09-15 08:19:01 UTC (rev 282444)
@@ -25,7 +25,7 @@
__ZN6webrtc18CreateIceCandidateERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEiS8_PNS_13SdpParseErrorE
__ZN6webrtc19RTCCertificateStats5kTypeE
__ZN6webrtc19RTCDataChannelStats5kTypeE
-__ZN6webrtc24CreateSessionDescriptionERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_PNS_13SdpParseErrorE
+__ZN6webrtc24CreateSessionDescriptionENS_7SdpTypeERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPNS_13SdpParseErrorE
__ZN6webrtc24RTCIceCandidatePairStats5kTypeE
__ZN6webrtc24RTCInboundRTPStreamStats5kTypeE
__ZN6webrtc24RTCMediaStreamTrackStats5kTypeE
Modified: trunk/Source/WebCore/ChangeLog (282443 => 282444)
--- trunk/Source/WebCore/ChangeLog 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/WebCore/ChangeLog 2021-09-15 08:19:01 UTC (rev 282444)
@@ -1,3 +1,31 @@
+2021-09-15 Youenn Fablet <[email protected]>
+
+ Migrate to libwebrtc non-racy setRemoteDescription/setLocalDescription variants
+ https://bugs.webkit.org/show_bug.cgi?id=230262
+
+ Reviewed by Darin Adler.
+
+ We were using the old versions of libwebrtc SetLocalDescription/SetRemoteDescription.
+ As per the header file, these versions are potentially racy.
+ This patch migrates to new versions of the same API which in addition take more modern parameters instead of raw pointers.
+ We also modernize a bit the code by using methods manipulating unique_ptr instead of raw pointers.
+ Drive-by fix: Add support for getting back to new for ICE gathering state. This was missing and without it,
+ imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-explicit-rollback-iceGatheringState.html would time out.
+ Update mock to implement the new method versions.
+
+ Covered by existing tests.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::sessionDescriptionType):
+ (WebCore::LibWebRTCMediaEndpoint::doSetLocalDescription):
+ (WebCore::LibWebRTCMediaEndpoint::doSetRemoteDescription):
+ (WebCore::LibWebRTCMediaEndpoint::OnIceGatheringChange):
+ * Modules/mediastream/libwebrtc/LibWebRTCObservers.h:
+ * testing/MockLibWebRTCPeerConnection.cpp:
+ (WebCore::MockLibWebRTCPeerConnection::SetLocalDescription):
+ (WebCore::MockLibWebRTCPeerConnection::SetRemoteDescription):
+ * testing/MockLibWebRTCPeerConnection.h:
+
2021-09-15 Said Abou-Hallawa <[email protected]>
Linear gradient sometimes is drawn incorrectly and sometimes hangs
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (282443 => 282444)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2021-09-15 08:19:01 UTC (rev 282444)
@@ -127,21 +127,18 @@
return m_backend ? m_backend->ShouldFireNegotiationNeededEvent(eventId) : false;
}
-static inline const char* sessionDescriptionType(RTCSdpType sdpType)
+static inline webrtc::SdpType sessionDescriptionType(RTCSdpType sdpType)
{
switch (sdpType) {
case RTCSdpType::Offer:
- return "offer";
+ return webrtc::SdpType::kOffer;
case RTCSdpType::Pranswer:
- return "pranswer";
+ return webrtc::SdpType::kPrAnswer;
case RTCSdpType::Answer:
- return "answer";
+ return webrtc::SdpType::kAnswer;
case RTCSdpType::Rollback:
- return "rollback";
+ return webrtc::SdpType::kRollback;
}
-
- ASSERT_NOT_REACHED();
- return "";
}
void LibWebRTCMediaEndpoint::doSetLocalDescription(const RTCSessionDescription* description)
@@ -154,7 +151,7 @@
}
webrtc::SdpParseError error;
- std::unique_ptr<webrtc::SessionDescriptionInterface> sessionDescription(webrtc::CreateSessionDescription(sessionDescriptionType(description->type()), description->sdp().utf8().data(), &error));
+ auto sessionDescription = webrtc::CreateSessionDescription(sessionDescriptionType(description->type()), description->sdp().utf8().data(), &error);
if (!sessionDescription) {
m_peerConnectionBackend.setLocalDescriptionFailed(Exception { OperationError, fromStdString(error.description) });
@@ -167,7 +164,7 @@
return;
}
- m_backend->SetLocalDescription(&m_setLocalSessionDescriptionObserver, sessionDescription.release());
+ m_backend->SetLocalDescription(WTFMove(sessionDescription), &m_setLocalSessionDescriptionObserver);
}
void LibWebRTCMediaEndpoint::doSetRemoteDescription(const RTCSessionDescription& description)
@@ -175,13 +172,14 @@
ASSERT(m_backend);
webrtc::SdpParseError error;
- std::unique_ptr<webrtc::SessionDescriptionInterface> sessionDescription(webrtc::CreateSessionDescription(sessionDescriptionType(description.type()), description.sdp().utf8().data(), &error));
+ auto sessionDescription = webrtc::CreateSessionDescription(sessionDescriptionType(description.type()), description.sdp().utf8().data(), &error);
if (!sessionDescription) {
m_peerConnectionBackend.setRemoteDescriptionFailed(Exception { SyntaxError, fromStdString(error.description) });
return;
}
- m_backend->SetRemoteDescription(&m_setRemoteSessionDescriptionObserver, sessionDescription.release());
+ m_backend->SetRemoteDescription(WTFMove(sessionDescription), &m_setRemoteSessionDescriptionObserver);
+
startLoggingStats();
}
@@ -538,6 +536,8 @@
protectedThis->m_peerConnectionBackend.doneGatheringCandidates();
else if (state == webrtc::PeerConnectionInterface::kIceGatheringGathering)
protectedThis->m_peerConnectionBackend.connection().updateIceGatheringState(RTCIceGatheringState::Gathering);
+ else if (state == webrtc::PeerConnectionInterface::kIceGatheringNew)
+ protectedThis->m_peerConnectionBackend.connection().updateIceGatheringState(RTCIceGatheringState::New);
});
}
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCObservers.h (282443 => 282444)
--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCObservers.h 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCObservers.h 2021-09-15 08:19:01 UTC (rev 282444)
@@ -59,7 +59,7 @@
};
template<typename Endpoint>
-class SetLocalSessionDescriptionObserver final : public webrtc::SetSessionDescriptionObserver {
+class SetLocalSessionDescriptionObserver final : public webrtc::SetLocalDescriptionObserverInterface {
public:
explicit SetLocalSessionDescriptionObserver(Endpoint &endpoint)
: m_endpoint(endpoint)
@@ -66,18 +66,24 @@
{
}
- void OnSuccess() final { m_endpoint.setLocalSessionDescriptionSucceeded(); }
- void OnFailure(webrtc::RTCError error) final { m_endpoint.setLocalSessionDescriptionFailed(toExceptionCode(error.type()), error.message()); }
-
void AddRef() const { m_endpoint.AddRef(); }
rtc::RefCountReleaseStatus Release() const { return m_endpoint.Release(); }
private:
+ void OnSetLocalDescriptionComplete(webrtc::RTCError error) final
+ {
+ if (!error.ok()) {
+ m_endpoint.setLocalSessionDescriptionFailed(toExceptionCode(error.type()), error.message());
+ return;
+ }
+ m_endpoint.setLocalSessionDescriptionSucceeded();
+ }
+
Endpoint& m_endpoint;
};
template<typename Endpoint>
-class SetRemoteSessionDescriptionObserver final : public webrtc::SetSessionDescriptionObserver {
+class SetRemoteSessionDescriptionObserver final : public webrtc::SetRemoteDescriptionObserverInterface {
public:
explicit SetRemoteSessionDescriptionObserver(Endpoint &endpoint)
: m_endpoint(endpoint)
@@ -84,13 +90,19 @@
{
}
- void OnSuccess() final { m_endpoint.setRemoteSessionDescriptionSucceeded(); }
- void OnFailure(webrtc::RTCError error) final { m_endpoint.setRemoteSessionDescriptionFailed(toExceptionCode(error.type()), error.message()); }
-
void AddRef() const { m_endpoint.AddRef(); }
rtc::RefCountReleaseStatus Release() const { return m_endpoint.Release(); }
private:
+ void OnSetRemoteDescriptionComplete(webrtc::RTCError error) final
+ {
+ if (!error.ok()) {
+ m_endpoint.setRemoteSessionDescriptionFailed(toExceptionCode(error.type()), error.message());
+ return;
+ }
+ m_endpoint.setRemoteSessionDescriptionSucceeded();
+ }
+
Endpoint& m_endpoint;
};
Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp (282443 => 282444)
--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp 2021-09-15 08:19:01 UTC (rev 282444)
@@ -205,9 +205,8 @@
virtual ~MockLibWebRTCPeerConnectionReleasedInNetworkThreadWhileSettingDescription() = default;
private:
- void SetLocalDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface* sessionDescription) final
+ void SetLocalDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>, rtc::scoped_refptr<webrtc::SetLocalDescriptionObserverInterface> observer) final
{
- std::unique_ptr<webrtc::SessionDescriptionInterface> toBeFreed(sessionDescription);
releaseInNetworkThread(*this, *observer);
}
};
@@ -260,7 +259,7 @@
return new rtc::RefCountedObject<webrtc::MediaStream>(label);
}
-void MockLibWebRTCPeerConnection::SetLocalDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface* sessionDescription)
+void MockLibWebRTCPeerConnection::SetLocalDescription(std::unique_ptr<webrtc::SessionDescriptionInterface> sessionDescription, rtc::scoped_refptr<webrtc::SetLocalDescriptionObserverInterface> observer)
{
bool isCorrectState = true;
switch (m_signalingState) {
@@ -282,19 +281,18 @@
}
if (!isCorrectState) {
LibWebRTCProvider::callOnWebRTCSignalingThread([observer] {
- observer->OnFailure(webrtc::RTCError(webrtc::RTCErrorType::INVALID_STATE));
+ observer->OnSetLocalDescriptionComplete(webrtc::RTCError(webrtc::RTCErrorType::INVALID_STATE));
});
return;
}
- std::unique_ptr<webrtc::SessionDescriptionInterface> toBeFreed(sessionDescription);
LibWebRTCProvider::callOnWebRTCSignalingThread([this, observer] {
- observer->OnSuccess();
+ observer->OnSetLocalDescriptionComplete(webrtc::RTCError::OK());
gotLocalDescription();
});
}
-void MockLibWebRTCPeerConnection::SetRemoteDescription(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface* sessionDescription)
+void MockLibWebRTCPeerConnection::SetRemoteDescription(std::unique_ptr<webrtc::SessionDescriptionInterface> sessionDescription, rtc::scoped_refptr<webrtc::SetRemoteDescriptionObserverInterface> observer)
{
bool isCorrectState = true;
switch (m_signalingState) {
@@ -316,14 +314,13 @@
}
if (!isCorrectState) {
LibWebRTCProvider::callOnWebRTCSignalingThread([observer] {
- observer->OnFailure(webrtc::RTCError(webrtc::RTCErrorType::INVALID_STATE));
+ observer->OnSetRemoteDescriptionComplete(webrtc::RTCError(webrtc::RTCErrorType::INVALID_STATE));
});
return;
}
- std::unique_ptr<webrtc::SessionDescriptionInterface> toBeFreed(sessionDescription);
LibWebRTCProvider::callOnWebRTCSignalingThread([observer] {
- observer->OnSuccess();
+ observer->OnSetRemoteDescriptionComplete(webrtc::RTCError::OK());
});
ASSERT(sessionDescription);
if (sessionDescription->type() == "offer") {
Modified: trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h (282443 => 282444)
--- trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h 2021-09-15 07:26:18 UTC (rev 282443)
+++ trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h 2021-09-15 08:19:01 UTC (rev 282444)
@@ -299,8 +299,8 @@
std::vector<rtc::scoped_refptr<webrtc::RtpTransceiverInterface>> GetTransceivers() const final;
protected:
- void SetRemoteDescription(webrtc::SetSessionDescriptionObserver*, webrtc::SessionDescriptionInterface*) final;
- void SetRemoteDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>, rtc::scoped_refptr<webrtc::SetRemoteDescriptionObserverInterface>) override { }
+ void SetRemoteDescription(webrtc::SetSessionDescriptionObserver*, webrtc::SessionDescriptionInterface*) final { ASSERT_NOT_REACHED(); }
+ void SetRemoteDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>, rtc::scoped_refptr<webrtc::SetRemoteDescriptionObserverInterface>) override;
bool RemoveIceCandidates(const std::vector<cricket::Candidate>&) override { return true; }
rtc::scoped_refptr<webrtc::DtlsTransportInterface> LookupDtlsTransportByMid(const std::string&) override { return { }; }
rtc::scoped_refptr<webrtc::SctpTransportInterface> GetSctpTransport() const override { return { }; }
@@ -314,7 +314,8 @@
bool RemoveTrack(webrtc::RtpSenderInterface*) final;
webrtc::RTCError SetBitrate(const webrtc::BitrateSettings&) final { return { }; }
- void SetLocalDescription(webrtc::SetSessionDescriptionObserver*, webrtc::SessionDescriptionInterface*) override;
+ void SetLocalDescription(webrtc::SetSessionDescriptionObserver*, webrtc::SessionDescriptionInterface*) final { ASSERT_NOT_REACHED(); };
+ void SetLocalDescription(std::unique_ptr<webrtc::SessionDescriptionInterface>, rtc::scoped_refptr<webrtc::SetLocalDescriptionObserverInterface>) override;
bool GetStats(webrtc::StatsObserver*, webrtc::MediaStreamTrackInterface*, StatsOutputLevel) override { return false; }
void CreateOffer(webrtc::CreateSessionDescriptionObserver*, const webrtc::PeerConnectionInterface::RTCOfferAnswerOptions&) override;
