Diff
Modified: trunk/Source/WebCore/ChangeLog (208099 => 208100)
--- trunk/Source/WebCore/ChangeLog 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/ChangeLog 2016-10-29 13:43:06 UTC (rev 208100)
@@ -1,3 +1,26 @@
+2016-10-29 Youenn Fablet <you...@apple.com>
+
+ MediaEndpoint::generateDtlsInfo is not needed
+ https://bugs.webkit.org/show_bug.cgi?id=164130
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior.
+
+ Removing MediaEndpoint::generateDtlsInfo as it can be called directly from createMediaEndpointOwr.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
+ * platform/mediastream/MediaEndpoint.cpp:
+ * platform/mediastream/MediaEndpoint.h:
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.cpp:
+ (WebCore::createMediaEndpointOwr):
+ * platform/mediastream/openwebrtc/MediaEndpointOwr.h:
+ * platform/mock/MockMediaEndpoint.cpp:
+ (WebCore::MockMediaEndpoint::MockMediaEndpoint):
+ (WebCore::MockMediaEndpoint::generateDtlsInfo): Deleted.
+ * platform/mock/MockMediaEndpoint.h:
+
2016-10-28 Wenson Hsieh <wenson_hs...@apple.com>
Unreviewed, add Input Events to the features list.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (208099 => 208100)
--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-10-29 13:43:06 UTC (rev 208100)
@@ -89,9 +89,6 @@
m_defaultAudioPayloads = m_mediaEndpoint->getDefaultAudioPayloads();
m_defaultVideoPayloads = m_mediaEndpoint->getDefaultVideoPayloads();
-
- // Tasks (see runTask()) will be deferred until we get the DTLS fingerprint.
- m_mediaEndpoint->generateDtlsInfo();
}
static RTCRtpTransceiver* matchTransceiver(const RtpTransceiverVector& transceivers, const std::function<bool(RTCRtpTransceiver&)>& matchFunction)
Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp (208099 => 208100)
--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2016-10-29 13:43:06 UTC (rev 208100)
@@ -59,7 +59,6 @@
void setConfiguration(MediaEndpointConfiguration&&) override { }
- void generateDtlsInfo() override { }
MediaPayloadVector getDefaultAudioPayloads() override { return MediaPayloadVector(); }
MediaPayloadVector getDefaultVideoPayloads() override { return MediaPayloadVector(); }
MediaPayloadVector filterPayloads(const MediaPayloadVector&, const MediaPayloadVector&) override { return MediaPayloadVector(); }
Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h (208099 => 208100)
--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2016-10-29 13:43:06 UTC (rev 208100)
@@ -65,7 +65,6 @@
virtual void setConfiguration(MediaEndpointConfiguration&&) = 0;
- virtual void generateDtlsInfo() = 0;
virtual MediaPayloadVector getDefaultAudioPayloads() = 0;
virtual MediaPayloadVector getDefaultVideoPayloads() = 0;
virtual MediaPayloadVector filterPayloads(const MediaPayloadVector& remotePayloads, const MediaPayloadVector& defaultPayloads) = 0;
Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp (208099 => 208100)
--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2016-10-29 13:43:06 UTC (rev 208100)
@@ -64,7 +64,9 @@
static std::unique_ptr<MediaEndpoint> createMediaEndpointOwr(MediaEndpointClient& client)
{
- return std::unique_ptr<MediaEndpoint>(new MediaEndpointOwr(client));
+ auto mediaEndpoint = std::make_unique<MediaEndpointOwr>(client);
+ mediaEndpoint->generateDtlsInfo();
+ return WTFMove(mediaEndpoint);
}
CreateMediaEndpoint MediaEndpoint::create = createMediaEndpointOwr;
Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h (208099 => 208100)
--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.h 2016-10-29 13:43:06 UTC (rev 208100)
@@ -85,7 +85,7 @@
void setConfiguration(MediaEndpointConfiguration&&) override;
- void generateDtlsInfo() override;
+ void generateDtlsInfo();
MediaPayloadVector getDefaultAudioPayloads() override;
MediaPayloadVector getDefaultVideoPayloads() override;
MediaPayloadVector filterPayloads(const MediaPayloadVector& remotePayloads, const MediaPayloadVector& defaultPayloads) override;
Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp (208099 => 208100)
--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2016-10-29 13:43:06 UTC (rev 208100)
@@ -56,6 +56,9 @@
, m_iceTransportTimer(*this, &MockMediaEndpoint::iceTransportTimerFired)
, m_unmuteTimer(*this, &MockMediaEndpoint::unmuteTimerFired)
{
+ callOnMainThread([this]() {
+ m_client.gotDtlsFingerprint(String(fingerprint), String(fingerprintFunction));
+ });
}
MockMediaEndpoint::~MockMediaEndpoint()
@@ -63,13 +66,6 @@
stop();
}
-void MockMediaEndpoint::generateDtlsInfo()
-{
- callOnMainThread([this]() {
- m_client.gotDtlsFingerprint(String(fingerprint), String(fingerprintFunction));
- });
-}
-
MediaPayloadVector MockMediaEndpoint::getDefaultAudioPayloads()
{
MediaPayloadVector payloads;
Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h (208099 => 208100)
--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2016-10-29 06:14:42 UTC (rev 208099)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2016-10-29 13:43:06 UTC (rev 208100)
@@ -47,7 +47,6 @@
void setConfiguration(MediaEndpointConfiguration&&) final { };
- void generateDtlsInfo() final;
MediaPayloadVector getDefaultAudioPayloads() final;
MediaPayloadVector getDefaultVideoPayloads() final;
MediaPayloadVector filterPayloads(const MediaPayloadVector& remotePayloads, const MediaPayloadVector& defaultPayloads) final;
