Changeset 246102 in webkit

Timestamp:

Jun 5, 2019 12:56:07 AM (5 years ago)

Author:

Michael Catanzaro

Message:

REGRESSION(r245796): [WPE][GTK] Web process crash on startup
​https://bugs.webkit.org/show_bug.cgi?id=198485

Reviewed by Chris Dumez.

Source/WebCore:

ResourceRequest's PageIdentifier may be unset, which causes coding to fail as
ObjectIdentifiers are required to be valid (nonzero). We need to use Optional here.
Previously, 0 was used to indicate unset page ID. This is clearer.

• platform/network/soup/ResourceRequest.h:

(WebCore::ResourceRequest::initiatingPageID const):
(WebCore::ResourceRequest::decodeWithPlatformData):

• platform/network/soup/ResourceRequestSoup.cpp:

(WebCore::ResourceRequest::updateSoupRequest const):

Source/WebKit:

• UIProcess/API/glib/WebKitURISchemeRequest.cpp:

(webkitURISchemeRequestCreate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/ResourceRequest.h (modified) (3 diffs)
• WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        REGRESSION(r245796): [WPE][GTK] Web process crash on startup
+        https://bugs.webkit.org/show_bug.cgi?id=198485
+
+        Reviewed by Chris Dumez.
+
+        ResourceRequest's PageIdentifier may be unset, which causes coding to fail as
+        ObjectIdentifiers are required to be valid (nonzero). We need to use Optional here.
+        Previously, 0 was used to indicate unset page ID. This is clearer.
+
+        * platform/network/soup/ResourceRequest.h:
+        (WebCore::ResourceRequest::initiatingPageID const):
+        (WebCore::ResourceRequest::decodeWithPlatformData):
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateSoupRequest const):
+
 2019-06-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/network/soup/ResourceRequest.h

@@ -96 +96 @@
         void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; }
 
-        PageIdentifier initiatingPageID() const { return m_initiatingPageID; }
+        Optional<PageIdentifier> initiatingPageID() const { return m_initiatingPageID; }
         void setInitiatingPageID(PageIdentifier pageID) { m_initiatingPageID = pageID; }
 
@@ -109 +109 @@
         bool m_acceptEncoding : 1;
         SoupMessageFlags m_soupFlags;
-        PageIdentifier m_initiatingPageID;
+        Optional<PageIdentifier> m_initiatingPageID;
 
         void updateSoupMessageMembers(SoupMessage*) const;
@@ -158 +158 @@
     m_soupFlags = static_cast<SoupMessageFlags>(soupMessageFlags);
 
-    Optional<PageIdentifier> initiatingPageID;
+    Optional<Optional<PageIdentifier>> initiatingPageID;
     decoder >> initiatingPageID;
     if (!initiatingPageID)

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

@@ -184 +184 @@
     if (m_initiatingPageID) {
         uint64_t* initiatingPageIDPtr = static_cast<uint64_t*>(fastMalloc(sizeof(uint64_t)));
-        *initiatingPageIDPtr = m_initiatingPageID.toUInt64();
+        *initiatingPageIDPtr = m_initiatingPageID->toUInt64();
         g_object_set_data_full(G_OBJECT(soupRequest), g_intern_static_string(gSoupRequestInitiatingPageIDKey), initiatingPageIDPtr, fastFree);
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        REGRESSION(r245796): [WPE][GTK] Web process crash on startup
+        https://bugs.webkit.org/show_bug.cgi?id=198485
+
+        Reviewed by Chris Dumez.
+
+        * UIProcess/API/glib/WebKitURISchemeRequest.cpp:
+        (webkitURISchemeRequestCreate):
+
 2019-06-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp

@@ -85 +85 @@
     request->priv->manager = &manager;
     request->priv->uri = resourceRequest.url().string().utf8();
-    request->priv->initiatingPage = WebProcessProxy::webPage(resourceRequest.initiatingPageID());
+    request->priv->initiatingPage = WebProcessProxy::webPage(*resourceRequest.initiatingPageID());
     request->priv->requestID = requestID;
     return request;