Attachment 371367 Details for Bug 198485 – Patch

[patch] Patch

bug-198485-20190604221015.patch (text/plain), 5.05 KB, created by Michael Catanzaro on 2019-06-04 20:10:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-04 20:10:16 PDT

Size: 5.05 KB

patch

obsolete

>Subversion Revision: 246093
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c9b595bced2b63e31bcb1159b19a1b10995e8662..f12cf4e3224f7ceb2a853d1b78c6be4cb24d5192 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-06-04  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 NOBODY (OOPS!).
>+
>+        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  Keith Rollin  <krollin@apple.com>
> 
>         Fix 64-bit vs 32-bit mismatch in ISOFairPlayStreamingPsshBox.cpp
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f238efd45d63d30c9578e3e3ad9ac30021b8c262..37e0a7784f4249f10e264759d1ab7f552503fc96 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-04  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 NOBODY (OOPS!).
>+
>+        * UIProcess/API/glib/WebKitURISchemeRequest.cpp:
>+        (webkitURISchemeRequestCreate):
>+
> 2019-06-04  Youenn Fablet  <youenn@apple.com>
> 
>         getUserMedia requests should be processed sequentially in UIProcess
>diff --git a/Source/WebCore/platform/network/soup/ResourceRequest.h b/Source/WebCore/platform/network/soup/ResourceRequest.h
>index 543902ff534ea50a4deb05162c2eeb35ba2d7d96..01cc03a2e5c2cd883446d16a22862aeb8e6ad17a 100644
>--- a/Source/WebCore/platform/network/soup/ResourceRequest.h
>+++ b/Source/WebCore/platform/network/soup/ResourceRequest.h
>@@ -95,7 +95,7 @@ namespace WebCore {
>         SoupMessageFlags soupMessageFlags() const { return m_soupFlags; }
>         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; }
> 
>         GUniquePtr<SoupURI> createSoupURI() const;
>@@ -108,7 +108,7 @@ namespace WebCore {
> 
>         bool m_acceptEncoding : 1;
>         SoupMessageFlags m_soupFlags;
>-        PageIdentifier m_initiatingPageID;
>+        Optional<PageIdentifier> m_initiatingPageID;
> 
>         void updateSoupMessageMembers(SoupMessage*) const;
>         void updateSoupMessageBody(SoupMessage*) const;
>@@ -157,7 +157,7 @@ bool ResourceRequest::decodeWithPlatformData(Decoder& decoder)
>         return false;
>     m_soupFlags = static_cast<SoupMessageFlags>(soupMessageFlags);
> 
>-    Optional<PageIdentifier> initiatingPageID;
>+    Optional<Optional<PageIdentifier>> initiatingPageID;
>     decoder >> initiatingPageID;
>     if (!initiatingPageID)
>         return false;
>diff --git a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>index 0ed25b37d5f80876812538770890af9b88e9364b..9601e66317b0594fb904d3b912f626c82f73cab9 100644
>--- a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>@@ -183,7 +183,7 @@ void ResourceRequest::updateSoupRequest(SoupRequest* soupRequest) const
> {
>     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);
>     }
> 
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp b/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>index 793cdbfd849d1aded46839c3ec0785bdd38c202c..debb8ee6e45a18fbb199f856b02593063bafcc97 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>@@ -84,7 +84,7 @@ WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitW
>     request->priv->webContext = webContext;
>     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;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 198485: 371363 | 371367