Changeset 213234 in webkit

Timestamp:

Mar 1, 2017, 11:30:29 AM (8 years ago)

Author:

achristensen@apple.com

Message:

Don't call libwebrtc functions if libwebrtc.dylib doesn't exist while testing
​https://bugs.webkit.org/show_bug.cgi?id=169045
<rdar://problem/30735413>

Reviewed by Youenn Fablet.

WebRTC tests fail instead of crashing now if libwebrtc.dylib is missing.
All other tests pass instead of crashing immediately when creating an Internals object.

• Modules/mediastream/RTCController.cpp:

(WebCore::RTCController::disableICECandidateFiltering):
(WebCore::RTCController::enableICECandidateFiltering):

• Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:

(WebCore::createLibWebRTCPeerConnectionBackend):

• testing/Internals.cpp:

(WebCore::Internals::enableMockMediaEndpoint):
(WebCore::Internals::emulateRTCPeerConnectionPlatformEvent):
(WebCore::Internals::useMockRTCPeerConnectionFactory):

• testing/Internals.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/RTCController.cpp (modified) (3 diffs)
• Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (modified) (1 diff)
• testing/Internals.cpp (modified) (3 diffs)
• testing/Internals.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-01  Alex Christensen  <achristensen@webkit.org>
+
+        Don't call libwebrtc functions if libwebrtc.dylib doesn't exist while testing
+        https://bugs.webkit.org/show_bug.cgi?id=169045
+        <rdar://problem/30735413>
+
+        Reviewed by Youenn Fablet.
+
+        WebRTC tests fail instead of crashing now if libwebrtc.dylib is missing.
+        All other tests pass instead of crashing immediately when creating an Internals object.
+
+        * Modules/mediastream/RTCController.cpp:
+        (WebCore::RTCController::disableICECandidateFiltering):
+        (WebCore::RTCController::enableICECandidateFiltering):
+        * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
+        (WebCore::createLibWebRTCPeerConnectionBackend):
+        * testing/Internals.cpp:
+        (WebCore::Internals::enableMockMediaEndpoint):
+        (WebCore::Internals::emulateRTCPeerConnectionPlatformEvent):
+        (WebCore::Internals::useMockRTCPeerConnectionFactory):
+        * testing/Internals.h:
+
 2017-03-01  Javier Fernandez  <jfernandez@igalia.com>
 

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

@@ -28 +28 @@
 #if ENABLE(WEB_RTC)
 
+#include "LibWebRTCProvider.h"
 #include "RTCPeerConnection.h"
 
@@ -48 +49 @@
 void RTCController::disableICECandidateFiltering()
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
     m_shouldFilterICECandidates = false;
     for (RTCPeerConnection& connection : m_peerConnections)
@@ -55 +59 @@
 void RTCController::enableICECandidateFiltering()
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
     m_shouldFilterICECandidates = true;
     for (RTCPeerConnection& connection : m_peerConnections)

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp

@@ -46 +46 @@
 static std::unique_ptr<PeerConnectionBackend> createLibWebRTCPeerConnectionBackend(RTCPeerConnection& peerConnection)
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return nullptr;
     return std::make_unique<LibWebRTCPeerConnectionBackend>(peerConnection);
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -1139 +1139 @@
 void Internals::enableMockMediaEndpoint()
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
     MediaEndpoint::create = MockMediaEndpoint::create;
 }
@@ -1144 +1147 @@
 void Internals::emulateRTCPeerConnectionPlatformEvent(RTCPeerConnection& connection, const String& action)
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
     connection.emulatePlatformEvent(action);
 }
@@ -1149 +1155 @@
 void Internals::useMockRTCPeerConnectionFactory(const String& testCase)
 {
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
 #if USE(LIBWEBRTC)
     Document* document = contextDocument();

trunk/Source/WebCore/testing/Internals.h

@@ -397 +397 @@
 #if ENABLE(WEB_RTC)
     void enableMockMediaEndpoint();
-    void enableMockRTCPeerConnectionHandler();
     void emulateRTCPeerConnectionPlatformEvent(RTCPeerConnection&, const String& action);
     void useMockRTCPeerConnectionFactory(const String&);