Changeset 213190 in webkit

Timestamp:

Feb 28, 2017 4:07:23 PM (7 years ago)

Author:

achristensen@apple.com

Message:

LibWebRTCProvider should check existence of libwebrtc.dylib
​https://bugs.webkit.org/show_bug.cgi?id=168986
Source/WebCore:

<rdar://problem/30735413>

Reviewed by Youenn Fablet.

Some configurations of the webrtc tests overwrite the availability of WebRTC in order to test it
with MockLibWebRTCPeerConnection. If the dylib can not be found, we can't use it, so we want to
fail these tests rather than crashing calling rtc::LogMessage::LogToDebug.

• Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:

(WebCore::LibWebRTCMediaEndpoint::doCreateOffer):
(WebCore::LibWebRTCMediaEndpoint::doCreateAnswer):

• platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:

(WebCore::LibWebRTCProvider::factory):
(WebCore::LibWebRTCProvider::webRTCAvailable):

• platform/mediastream/libwebrtc/LibWebRTCProvider.h:
• testing/MockLibWebRTCPeerConnection.cpp:

(WebCore::useMockRTCPeerConnectionFactory):
(WebCore::MockLibWebRTCPeerConnectionFactory::CreatePeerConnection):

Source/WebKit2:

Reviewed by Youenn Fablet.

• Shared/WebPreferencesDefinitions.h:
• Shared/WebPreferencesStore.cpp:
• UIProcess/WebPreferences.cpp:

(WebKit::checkWebRTCAvailability): Deleted.

Location:

trunk/Source

Files:

• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (modified) (7 diffs)
• WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (modified) (4 diffs)
• WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h (modified) (2 diffs)
• WebCore/testing/MockLibWebRTCPeerConnection.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPreferencesDefinitions.h (modified) (2 diffs)
• WebKit2/Shared/WebPreferencesStore.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPreferences.cpp (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -2301 +2301 @@
     platform/mediastream/SDPProcessorScriptResource.cpp
 
+    platform/mediastream/libwebrtc/LibWebRTCProvider.cpp
+
     platform/mock/DeviceOrientationClientMock.cpp
     platform/mock/GeolocationClientMock.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-28  Alex Christensen  <achristensen@webkit.org>
+
+        LibWebRTCProvider should check existence of libwebrtc.dylib
+        https://bugs.webkit.org/show_bug.cgi?id=168986
+        <rdar://problem/30735413>
+
+        Reviewed by Youenn Fablet.
+
+        Some configurations of the webrtc tests overwrite the availability of WebRTC in order to test it
+        with MockLibWebRTCPeerConnection.  If the dylib can not be found, we can't use it, so we want to
+        fail these tests rather than crashing calling rtc::LogMessage::LogToDebug.
+
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+        (WebCore::LibWebRTCMediaEndpoint::doCreateOffer):
+        (WebCore::LibWebRTCMediaEndpoint::doCreateAnswer):
+        * platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:
+        (WebCore::LibWebRTCProvider::factory):
+        (WebCore::LibWebRTCProvider::webRTCAvailable):
+        * platform/mediastream/libwebrtc/LibWebRTCProvider.h:
+        * testing/MockLibWebRTCPeerConnection.cpp:
+        (WebCore::useMockRTCPeerConnectionFactory):
+        (WebCore::MockLibWebRTCPeerConnectionFactory::CreatePeerConnection):
+
 2017-02-28  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -156 +156 @@
 void LibWebRTCMediaEndpoint::doCreateOffer()
 {
+    if (!LibWebRTCProvider::factory()) {
+        m_peerConnectionBackend.createOfferFailed(Exception { NOT_SUPPORTED_ERR, ASCIILiteral("libwebrtc backend is missing.") });
+        return;
+    }
+        
     m_isInitiator = true;
     auto& senders = m_peerConnectionBackend.connection().getSenders();
     if (senders.size()) {
         // FIXME: We only support one stream for the moment.
-        auto stream = LibWebRTCProvider::factory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
+        auto stream = LibWebRTCProvider::factory()->CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
         for (RTCRtpSender& sender : senders) {
             auto* track = sender.track();
@@ -168 +173 @@
                 if (source.type() == RealtimeMediaSource::Audio) {
                     auto trackSource = RealtimeOutgoingAudioSource::create(source);
-                    auto rtcTrack = LibWebRTCProvider::factory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
+                    auto rtcTrack = LibWebRTCProvider::factory()->CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
                     trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(rtcTrack));
                     m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
@@ -174 +179 @@
                 } else {
                     auto videoSource = RealtimeOutgoingVideoSource::create(source);
-                    auto videoTrack = LibWebRTCProvider::factory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
+                    auto videoTrack = LibWebRTCProvider::factory()->CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
                     m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
                     stream->AddTrack(WTFMove(videoTrack));
@@ -187 +192 @@
 void LibWebRTCMediaEndpoint::doCreateAnswer()
 {
+    if (!LibWebRTCProvider::factory()) {
+        m_peerConnectionBackend.createAnswerFailed(Exception { NOT_SUPPORTED_ERR, ASCIILiteral("libwebrtc backend is missing.") });
+        return;
+    }
+
     m_isInitiator = false;
 
@@ -192 +202 @@
     if (senders.size()) {
         // FIXME: We only support one stream for the moment.
-        auto stream = LibWebRTCProvider::factory().CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
+        auto stream = LibWebRTCProvider::factory()->CreateLocalMediaStream(streamId(m_peerConnectionBackend.connection()));
         for (RTCRtpSender& sender : senders) {
             auto* track = sender.track();
@@ -200 +210 @@
                 if (source.type() == RealtimeMediaSource::Audio) {
                     auto trackSource = RealtimeOutgoingAudioSource::create(source);
-                    auto rtcTrack = LibWebRTCProvider::factory().CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
+                    auto rtcTrack = LibWebRTCProvider::factory()->CreateAudioTrack(track->id().utf8().data(), trackSource.ptr());
                     trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(rtcTrack));
                     m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
@@ -206 +216 @@
                 } else {
                     auto videoSource = RealtimeOutgoingVideoSource::create(source);
-                    auto videoTrack = LibWebRTCProvider::factory().CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
+                    auto videoTrack = LibWebRTCProvider::factory()->CreateVideoTrack(track->id().utf8().data(), videoSource.ptr());
                     m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
                     stream->AddTrack(WTFMove(videoTrack));

trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp

@@ -28 +28 @@
 
 #if USE(LIBWEBRTC)
-
 #include "LibWebRTCAudioModule.h"
 #include "Logging.h"
+#include <dlfcn.h>
 #include <webrtc/api/peerconnectionfactory.h>
 #include <webrtc/api/peerconnectionfactoryproxy.h>
@@ -38 +38 @@
 #include <wtf/Function.h>
 #include <wtf/NeverDestroyed.h>
+#endif
 
 namespace WebCore {
 
+#if USE(LIBWEBRTC)
 struct PeerConnectionFactoryAndThreads : public rtc::MessageHandler {
     std::unique_ptr<LibWebRTCAudioModule> audioDeviceModule;
@@ -112 +114 @@
 }
 
-webrtc::PeerConnectionFactoryInterface& LibWebRTCProvider::factory()
+webrtc::PeerConnectionFactoryInterface* LibWebRTCProvider::factory()
 {
+    if (!webRTCAvailable())
+        return nullptr;
     if (!staticFactoryAndThreads().factory)
         initializePeerConnectionFactoryAndThreads();
-    return *staticFactoryAndThreads().factory;
+    return staticFactoryAndThreads().factory;
 }
 
@@ -167 +171 @@
     return createActualPeerConnection(observer, WTFMove(portAllocator));
 }
+#endif // USE(LIBWEBRTC)
+
+bool LibWebRTCProvider::webRTCAvailable()
+{
+#if USE(LIBWEBRTC)
+    static bool available = [] {
+        void* libwebrtcLibrary = dlopen("libwebrtc.dylib", RTLD_LAZY);
+        if (!libwebrtcLibrary)
+            return false;
+        dlclose(libwebrtcLibrary);
+        return true;
+    }();
+    return available;
+#else
+    return true;
+#endif
+}
 
 } // namespace WebCore
-
-#endif // USE(LIBWEBRTC)

trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.h

@@ -51 +51 @@
     virtual ~LibWebRTCProvider() = default;
 
+    static bool webRTCAvailable();
 #if USE(LIBWEBRTC)
     WEBCORE_EXPORT virtual rtc::scoped_refptr<webrtc::PeerConnectionInterface> createPeerConnection(webrtc::PeerConnectionObserver&);
@@ -57 +58 @@
     static WEBCORE_EXPORT void callOnWebRTCNetworkThread(Function<void()>&&);
     static WEBCORE_EXPORT void callOnWebRTCSignalingThread(Function<void()>&&);
-    static WEBCORE_EXPORT webrtc::PeerConnectionFactoryInterface& factory();
+    static WEBCORE_EXPORT webrtc::PeerConnectionFactoryInterface* factory();
     // Used for mock testing
     static void setPeerConnectionFactory(rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>&&);

trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.cpp

@@ -52 +52 @@
     if (provider && !realPeerConnectionFactory()) {
         auto& factory = getRealPeerConnectionFactory();
-        factory = &provider->factory();
+        factory = provider->factory();
     }
 
@@ -163 +163 @@
 rtc::scoped_refptr<webrtc::PeerConnectionInterface> MockLibWebRTCPeerConnectionFactory::CreatePeerConnection(const webrtc::PeerConnectionInterface::RTCConfiguration& configuration, std::unique_ptr<cricket::PortAllocator> portAllocator, std::unique_ptr<rtc::RTCCertificateGeneratorInterface> generator, webrtc::PeerConnectionObserver* observer)
 {
+    if (!realPeerConnectionFactory())
+        return nullptr;
+
     if (m_numberOfRealPeerConnections) {
         auto connection = realPeerConnectionFactory()->CreatePeerConnection(configuration, WTFMove(portAllocator), WTFMove(generator), observer);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-28  Alex Christensen  <achristensen@webkit.org>
+
+        LibWebRTCProvider should check existence of libwebrtc.dylib
+        https://bugs.webkit.org/show_bug.cgi?id=168986
+
+        Reviewed by Youenn Fablet.
+
+        * Shared/WebPreferencesDefinitions.h:
+        * Shared/WebPreferencesStore.cpp:
+        * UIProcess/WebPreferences.cpp:
+        (WebKit::checkWebRTCAvailability): Deleted.
+
 2017-02-28  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

@@ -313 +313 @@
 //   wider testing).
 
-// Disable webrtc feature if libwebrtc library is not present
-namespace WebKit {
-bool checkWebRTCAvailability();
-}
-
 #define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
     macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Spring Animations", "CSS Spring Animation prototype") \
@@ -329 +324 @@
     macro(WebAnimationsEnabled, webAnimationsEnabled, Bool, bool, false, "Web Animations", "Web Animations prototype") \
     macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
-    macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, checkWebRTCAvailability(), "WebRTC", "Enable WebRTC API") \
+    macro(PeerConnectionEnabled, peerConnectionEnabled, Bool, bool, WebCore::LibWebRTCProvider::webRTCAvailable(), "WebRTC", "Enable WebRTC API") \
     \
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp

@@ -30 +30 @@
 #include "WebCoreArgumentCoders.h"
 #include "WebPreferencesKeys.h"
+#include <WebCore/LibWebRTCProvider.h>
 #include <WebCore/Settings.h>
 #include <WebCore/TextEncodingRegistry.h>

trunk/Source/WebKit2/UIProcess/WebPreferences.cpp

@@ -30 +30 @@
 #include "WebPreferencesKeys.h"
 #include "WebProcessPool.h"
-#include <dlfcn.h>
+#include <WebCore/LibWebRTCProvider.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/ThreadingPrimitives.h>
@@ -197 +197 @@
 #undef DEFINE_PREFERENCE_GETTER_AND_SETTERS
 
-bool checkWebRTCAvailability()
-{
-#if USE(LIBWEBRTC)
-    static bool available = [&] {
-        void* libwebrtcLibrary = dlopen("libwebrtc.dylib", RTLD_LAZY);
-        if (!libwebrtcLibrary)
-            return false;
-        dlclose(libwebrtcLibrary);
-        return true;
-    }();
-    return available;
-#else
-    return true;
-#endif
-}
-
 #define DEFINE_EXPERIMENTAL_PREFERENCE_GETTER_AND_SETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
     void WebPreferences::set##KeyUpper(const Type& value) \