Changeset 211372 in webkit

Timestamp:

Jan 30, 2017 10:13:11 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r202615?): [GStreamer] ASSERTION FAILED: isMainThread() in WebCore::BuiltinResourceHandleConstructorMap& WebCore::builtinResourceHandleConstructorMap()
​https://bugs.webkit.org/show_bug.cgi?id=167003

Reviewed by Michael Catanzaro.

Add a way to create a ResourceHandle for a given SoupNetworkSession and use it in the GStreamer streaming client
to ensure both the session and the handle are created and destroyed in the secondary thread. This way we also
avoid using the default session for downloading HLS fragments.

• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(ResourceHandleStreamingClient::ResourceHandleStreamingClient): Create a SoupNetworkSession and pass it to ResourceHandle::create().

• platform/network/ResourceHandle.h: Add create and constructor to receive a SoupNetworkSession.
• platform/network/ResourceHandleInternal.h: Add SoupNetworkSession member.
• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::ResourceHandleInternal::soupSession): Return the SoupNetworkSession if not nullptr.
(WebCore::ResourceHandle::create): Create a ResourceHandle without trying to use any builtin constructor and
using the given SoupNetworkSession.
(WebCore::ResourceHandle::ResourceHandle): Set the SoupNetworkSession if early request validations didn't fail.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (4 diffs)
• platform/network/ResourceHandle.h (modified) (3 diffs)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-30  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r202615?): [GStreamer] ASSERTION FAILED: isMainThread() in WebCore::BuiltinResourceHandleConstructorMap& WebCore::builtinResourceHandleConstructorMap()
+        https://bugs.webkit.org/show_bug.cgi?id=167003
+
+        Reviewed by Michael Catanzaro.
+
+        Add a way to create a ResourceHandle for a given SoupNetworkSession and use it in the GStreamer streaming client
+        to ensure both the session and the handle are created and destroyed in the secondary thread. This way we also
+        avoid using the default session for downloading HLS fragments.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (ResourceHandleStreamingClient::ResourceHandleStreamingClient): Create a SoupNetworkSession and pass it to ResourceHandle::create().
+        * platform/network/ResourceHandle.h: Add create and constructor to receive a SoupNetworkSession.
+        * platform/network/ResourceHandleInternal.h: Add SoupNetworkSession member.
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandleInternal::soupSession): Return the SoupNetworkSession if not nullptr.
+        (WebCore::ResourceHandle::create): Create a ResourceHandle without trying to use any builtin constructor and
+        using the given SoupNetworkSession.
+        (WebCore::ResourceHandle::ResourceHandle): Set the SoupNetworkSession if early request validations didn't fail.
+
 2017-01-30  Youenn Fablet  <youennf@gmail.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -47 +47 @@
 #include <wtf/text/CString.h>
 
+#if USE(SOUP)
+#include "SoupNetworkSession.h"
+#endif
+
 using namespace WebCore;
 
@@ -112 +116 @@
         Condition m_terminateRunLoopCondition;
         RefPtr<ResourceHandle> m_resource;
+#if USE(SOUP)
+        std::unique_ptr<SoupNetworkSession> m_session;
+#endif
 };
 
@@ -1072 +1079 @@
             LockHolder locker(m_initializeRunLoopConditionMutex);
             m_runLoop = &RunLoop::current();
+#if USE(SOUP)
+            m_session = std::make_unique<SoupNetworkSession>();
+            m_resource = ResourceHandle::create(*m_session, request, this, true, false);
+#else
+            // FIXME: This create will hit an assert in debug builds. See https://bugs.webkit.org/show_bug.cgi?id=167003.
             m_resource = ResourceHandle::create(nullptr /*context*/, request, this, true, false);
+#endif
             m_initializeRunLoopCondition.notifyOne();
         }
@@ -1086 +1099 @@
             m_resource->cancel();
             m_resource = nullptr;
+#if USE(SOUP)
+            m_session = nullptr;
+#endif
             m_terminateRunLoopCondition.notifyOne();
         }

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -87 +87 @@
 class ResourceRequest;
 class ResourceResponse;
+class SoupNetworkSession;
 class SharedBuffer;
 class Timer;
@@ -94 +95 @@
     WEBCORE_EXPORT static RefPtr<ResourceHandle> create(NetworkingContext*, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
     WEBCORE_EXPORT static void loadResourceSynchronously(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
+
+#if USE(SOUP)
+    static RefPtr<ResourceHandle> create(SoupNetworkSession&, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
+#endif
 
     WEBCORE_EXPORT virtual ~ResourceHandle();
@@ -242 +247 @@
     };
 
+#if USE(SOUP)
+    ResourceHandle(SoupNetworkSession&, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);
+#endif
+
     void platformSetDefersLoading(bool);
 

trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

@@ -51 +51 @@
 #if USE(SOUP)
 #include "GUniquePtrSoup.h"
+#include "SoupNetworkSession.h"
 #include <libsoup/soup.h>
 #include <wtf/RunLoop.h>
@@ -150 +151 @@
 #endif
 #if USE(SOUP)
+    SoupNetworkSession* m_session { nullptr };
     GRefPtr<SoupMessage> m_soupMessage;
     ResourceResponse m_response;

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -92 +92 @@
 SoupSession* ResourceHandleInternal::soupSession()
 {
-    return sessionFromContext(m_context.get());
+    return m_session ? m_session->soupSession() : sessionFromContext(m_context.get());
+}
+
+RefPtr<ResourceHandle> ResourceHandle::create(SoupNetworkSession& session, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
+{
+    auto newHandle = adoptRef(*new ResourceHandle(session, request, client, defersLoading, shouldContentSniff));
+
+    if (newHandle->d->m_scheduledFailureType != NoFailure)
+        return WTFMove(newHandle);
+
+    if (newHandle->start())
+        return WTFMove(newHandle);
+
+    return nullptr;
+}
+
+ResourceHandle::ResourceHandle(SoupNetworkSession& session, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
+    : d(std::make_unique<ResourceHandleInternal>(this, nullptr, request, client, defersLoading, shouldContentSniff && shouldContentSniffURL(request.url())))
+{
+    if (!request.url().isValid()) {
+        scheduleFailure(InvalidURLFailure);
+        return;
+    }
+
+    if (!portAllowed(request.url())) {
+        scheduleFailure(BlockedFailure);
+        return;
+    }
+
+    d->m_session = &session;
 }