Changeset 230203 in webkit

Timestamp:

Apr 3, 2018 8:09:10 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Stop using ResourceHandle to load GResources
​https://bugs.webkit.org/show_bug.cgi?id=184259

Reviewed by Sergio Villar Senin.

GResources are loaded in the WebProcess using ResourceHandle because soup handles them transparently. But now
that we no longer use ResourceHandle, we can add a simple loader for GResources, similar to the one used for
data URLS, since loading a GResource is a matter of calling g_resources_lookup_data() in the end.

• SourcesGTK.txt:
• SourcesWPE.txt:
• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::start): Check if resource to load is a GResource and call loadGResource().

• loader/ResourceLoader.h:
• loader/soup/ResourceLoaderSoup.cpp: Added.

(WebCore::ResourceLoader::loadGResource): Load the GResource in a GTask thread.

• platform/SharedBuffer.cpp:

(WebCore::SharedBuffer::DataSegment::data const):
(WebCore::SharedBuffer::DataSegment::size const):

• platform/SharedBuffer.h:
• platform/glib/SharedBufferGlib.cpp:

(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::create):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• SourcesGTK.txt (modified) (1 diff)
• SourcesWPE.txt (modified) (1 diff)
• loader/ResourceLoader.cpp (modified) (1 diff)
• loader/ResourceLoader.h (modified) (1 diff)
• loader/soup/ResourceLoaderSoup.cpp (added)
• platform/SharedBuffer.cpp (modified) (3 diffs)
• platform/SharedBuffer.h (modified) (6 diffs)
• platform/glib/SharedBufferGlib.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Stop using ResourceHandle to load GResources
+        https://bugs.webkit.org/show_bug.cgi?id=184259
+
+        Reviewed by Sergio Villar Senin.
+
+        GResources are loaded in the WebProcess using ResourceHandle because soup handles them transparently. But now
+        that we no longer use ResourceHandle, we can add a simple loader for GResources, similar to the one used for
+        data URLS, since loading a GResource is a matter of calling g_resources_lookup_data() in the end.
+
+        * SourcesGTK.txt:
+        * SourcesWPE.txt:
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::start): Check if resource to load is a GResource and call loadGResource().
+        * loader/ResourceLoader.h:
+        * loader/soup/ResourceLoaderSoup.cpp: Added.
+        (WebCore::ResourceLoader::loadGResource): Load the GResource in a GTask thread.
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::DataSegment::data const):
+        (WebCore::SharedBuffer::DataSegment::size const):
+        * platform/SharedBuffer.h:
+        * platform/glib/SharedBufferGlib.cpp:
+        (WebCore::SharedBuffer::SharedBuffer):
+        (WebCore::SharedBuffer::create):
+
 2018-04-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/SourcesGTK.txt

@@ -41 +41 @@
 
 editing/atk/FrameSelectionAtk.cpp
+
+loader/soup/ResourceLoaderSoup.cpp
 
 page/linux/ResourceUsageOverlayLinux.cpp

trunk/Source/WebCore/SourcesWPE.txt

@@ -26 +26 @@
 
 editing/wpe/EditorWPE.cpp
+
+loader/soup/ResourceLoaderSoup.cpp
 
 page/linux/ResourceUsageOverlayLinux.cpp

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -214 +214 @@
     }
 
+#if USE(SOUP)
+    if (m_request.url().protocolIs("resource")) {
+        loadGResource();
+        return;
+    }
+#endif
+
     m_handle = ResourceHandle::create(frameLoader()->networkingContext(), m_request, this, m_defersLoading, m_options.sniffContent == SniffContent, m_options.sniffContentEncoding == ContentEncodingSniffingPolicy::Sniff);
 }

trunk/Source/WebCore/loader/ResourceLoader.h

@@ -211 +211 @@
 #endif
 
+#if USE(SOUP)
+    void loadGResource();
+#endif
+
     ResourceRequest m_request;
     ResourceRequest m_originalRequest; // Before redirects.

trunk/Source/WebCore/platform/SharedBuffer.cpp

@@ -32 +32 @@
 #include <wtf/unicode/UTF8.h>
 
-#if USE(SOUP)
-#include "GUniquePtrSoup.h"
-#endif
-
 namespace WebCore {
 
@@ -213 +209 @@
         [](const GUniquePtr<SoupBuffer>& data) { return data->data; },
 #endif
+#if USE(GLIB)
+        [](const GRefPtr<GBytes>& data) { return reinterpret_cast<const char*>(g_bytes_get_data(data.get(), nullptr)); },
+#endif
         [](const FileSystem::MappedFileData& data) { return reinterpret_cast<const char*>(data.data()); }
     );
@@ -233 +232 @@
 #if USE(SOUP)
         [](const GUniquePtr<SoupBuffer>& data) { return static_cast<size_t>(data->length); },
+#endif
+#if USE(GLIB)
+        [](const GRefPtr<GBytes>& data) { return g_bytes_get_size(data.get()); },
 #endif
         [](const FileSystem::MappedFileData& data) { return data.size(); }

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -44 +44 @@
 #endif
 
+#if USE(GLIB)
+#include <wtf/glib/GRefPtr.h>
+typedef struct _GBytes GBytes;
+#endif
+
 #if USE(FOUNDATION)
 OBJC_CLASS NSArray;
@@ -80 +85 @@
 #endif
 
+#if USE(GLIB)
+    static Ref<SharedBuffer> create(GBytes*);
+#endif
+
     // Calling data() causes all the data segments to be copied into one segment if they are not already.
     // Iterate the segments using begin() and end() instead.
@@ -115 +124 @@
         static Ref<DataSegment> create(GUniquePtr<SoupBuffer>&& data) { return adoptRef(*new DataSegment(WTFMove(data))); }
 #endif
+#if USE(GLIB)
+        static Ref<DataSegment> create(GRefPtr<GBytes>&& data) { return adoptRef(*new DataSegment(WTFMove(data))); }
+#endif
         static Ref<DataSegment> create(FileSystem::MappedFileData&& data) { return adoptRef(*new DataSegment(WTFMove(data))); }
 
@@ -128 +140 @@
             : m_immutableData(WTFMove(data)) { }
 #endif
+#if USE(GLIB)
+        DataSegment(GRefPtr<GBytes>&& data)
+            : m_immutableData(WTFMove(data)) { }
+#endif
         DataSegment(FileSystem::MappedFileData&& data)
             : m_immutableData(WTFMove(data)) { }
@@ -137 +153 @@
 #if USE(SOUP)
             GUniquePtr<SoupBuffer>,
+#endif
+#if USE(GLIB)
+            GRefPtr<GBytes>,
 #endif
             FileSystem::MappedFileData> m_immutableData;
@@ -167 +186 @@
     explicit SharedBuffer(SoupBuffer*);
 #endif
+#if USE(GLIB)
+    explicit SharedBuffer(GBytes*);
+#endif
 
     void combineIntoOneSegment() const;

trunk/Source/WebCore/platform/glib/SharedBufferGlib.cpp

@@ -26 +26 @@
 #include <glib.h>
 
+namespace WebCore {
 
-namespace WebCore {
+SharedBuffer::SharedBuffer(GBytes* bytes)
+{
+    ASSERT(bytes);
+    m_size = g_bytes_get_size(bytes);
+    m_segments.append({ 0, DataSegment::create(GRefPtr<GBytes>(bytes)) });
+}
+
+Ref<SharedBuffer> SharedBuffer::create(GBytes* bytes)
+{
+    return adoptRef(*new SharedBuffer(bytes));
+}
 
 RefPtr<SharedBuffer> SharedBuffer::createFromReadingFile(const String& filePath)