Attachment 373764 Details for Bug 199579 – Patch

[patch] Patch

bug-199579-20190709161510.patch (text/plain), 7.50 KB, created by Michael Catanzaro on 2019-07-09 14:15:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-07-09 14:15:11 PDT

Size: 7.50 KB

patch

obsolete

>Subversion Revision: 247278
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index e1f6502986d6669ee1affcbc38a4dd5b0bb36719..237a02b055957eaa484c589808c939441e75a9e3 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-09  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] GUniqueOutPtr::release should return a raw pointer
>+        https://bugs.webkit.org/show_bug.cgi?id=199579
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        GUniqueOutPtr::release should release to a raw pointer, rather than a GUniquePtr. If a
>+        GUniquePtr is desired, it's trivial to construct one from the raw pointer, but all existing
>+        callsites under Source/ would rather have a raw pointer. Currently they have to call
>+        release().release() to get the raw pointer, which is annoying.
>+
>+        * wtf/glib/GUniquePtr.h:
>+        (WTF::GUniqueOutPtr::release):
>+
> 2019-07-09  Alex Christensen  <achristensen@webkit.org>
> 
>         When parsing an IPv4 address, wait until after deciding it is indeed an IPv4 address before reporting syntax violations
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ddba794bf2158ffa293f0be88f12933c80697935..46736d1bb2d4ac61304d955d568eb7cf1a7ab225 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-07-09  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] GUniqueOutPtr::release should return a raw pointer
>+        https://bugs.webkit.org/show_bug.cgi?id=199579
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/glib/WebKitCachedResolver.cpp:
>+        (webkitCachedResolverLookupByNameAsync):
>+        (webkitCachedResolverLookupByNameWithFlagsAsync):
>+        * UIProcess/API/glib/WebKitFaviconDatabase.cpp:
>+        (processPendingIconsForPageURL):
>+        (webkit_favicon_database_get_favicon):
>+        * UIProcess/API/glib/WebKitUserContentFilterStore.cpp:
>+        (webkit_user_content_filter_store_save_from_file):
>+
> 2019-07-09  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r247230.
>diff --git a/Source/WTF/wtf/glib/GUniquePtr.h b/Source/WTF/wtf/glib/GUniquePtr.h
>index e1cff8ddea44f6da72fdf0f00f11ca188396a6ed..ef36f268242bbff86eed28586bf616c877251c34 100644
>--- a/Source/WTF/wtf/glib/GUniquePtr.h
>+++ b/Source/WTF/wtf/glib/GUniquePtr.h
>@@ -24,6 +24,7 @@
> #if USE(GLIB)
> 
> #include <gio/gio.h>
>+#include <utility>
> #include <wtf/Noncopyable.h>
> 
> namespace WTF {
>@@ -78,11 +79,9 @@ public:
>         return m_ptr;
>     }
> 
>-    GUniquePtr<T> release()
>+    T* release()
>     {
>-        GUniquePtr<T> ptr(m_ptr);
>-        m_ptr = nullptr;
>-        return ptr;
>+        return std::exchange(m_ptr, nullptr);
>     }
> 
>     T& operator*() const
>diff --git a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
>index 3deab9e46ed1ffd85d1af2022b51adb1fbb21dfe..2d17c22c9e15ad96e5bab37a82672f836acd970a 100644
>--- a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
>+++ b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
>@@ -108,7 +108,7 @@ static void webkitCachedResolverLookupByNameAsync(GResolver* resolver, const cha
>             priv->cache.update(asyncData->hostname, addressListGListToVector(addressList));
>             g_task_return_pointer(task.get(), addressList, reinterpret_cast<GDestroyNotify>(g_resolver_free_addresses));
>         } else
>-            g_task_return_error(task.get(), error.release().release());
>+            g_task_return_error(task.get(), error.release());
>     }, task.leakRef());
> }
> 
>@@ -170,7 +170,7 @@ static void webkitCachedResolverLookupByNameWithFlagsAsync(GResolver* resolver,
>             priv->cache.update(asyncData->hostname, addressListGListToVector(addressList), asyncData->dnsCacheType);
>             g_task_return_pointer(task.get(), addressList, reinterpret_cast<GDestroyNotify>(g_resolver_free_addresses));
>         } else
>-            g_task_return_error(task.get(), error.release().release());
>+            g_task_return_error(task.get(), error.release());
>     }, task.leakRef());
> }
> 
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp b/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>index e0164868171a5d8bee8a3e186ac6825c491d9700..218083e7697a51398f2ee094cdb068c20837b1fa 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
>@@ -175,7 +175,7 @@ static void processPendingIconsForPageURL(WebKitFaviconDatabase* database, const
>     for (size_t i = 0; i < pendingIconRequests->size(); ++i) {
>         GTask* task = pendingIconRequests->at(i).get();
>         if (error)
>-            g_task_return_error(task, error.release().release());
>+            g_task_return_error(task, error.release());
>         else {
>             GetFaviconSurfaceAsyncData* data = static_cast<GetFaviconSurfaceAsyncData*>(g_task_get_task_data(task));
>             data->icon = icon;
>@@ -413,7 +413,7 @@ void webkit_favicon_database_get_favicon(WebKitFaviconDatabase* database, const
>     data->shouldReleaseIconForPageURL = true;
> 
>     if (g_error_matches(error.get(), WEBKIT_FAVICON_DATABASE_ERROR, WEBKIT_FAVICON_DATABASE_ERROR_FAVICON_NOT_FOUND)) {
>-        g_task_return_error(task.get(), error.release().release());
>+        g_task_return_error(task.get(), error.release());
>         return;
>     }
> 
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>index 6241bb5a0d0c512ea2f6b1711ebbc1a9afd04cb8..42bd997c7de93e34de5ebcbfc0199fc9a00765b8 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentFilterStore.cpp
>@@ -307,7 +307,7 @@ void webkit_user_content_filter_store_save_from_file(WebKitUserContentFilterStor
>             SaveTaskData* data = static_cast<SaveTaskData*>(g_task_get_task_data(task.get()));
>             webkitUserContentFilterStoreSaveBytes(WTFMove(task), WTFMove(data->identifier), GRefPtr<GBytes>(g_bytes_new_take(sourceData, sourceSize)));
>         } else
>-            g_task_return_error(task.get(), error.release().release());
>+            g_task_return_error(task.get(), error.release());
>     }, task.leakRef());
> }
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2525ecd6102b420c36ee664ea9e15f387406c793..8938dea4ad72496785674a4a70465449b45a8fec 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-07-09  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] GUniqueOutPtr::release should return a raw pointer
>+        https://bugs.webkit.org/show_bug.cgi?id=199579
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp:
>+        (TestWebKitAPI::TEST):
>+
> 2019-07-09  Sihui Liu  <sihui_liu@apple.com>
> 
>         Only allow fetching and removing session credentials from WebsiteDataStore
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp b/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp
>index 11f02c7b0f7fd70d83f6071d71ae2468362cb7a8..288591c8e3f32737c550931ecdc2e9fede25ceb1 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp
>@@ -184,7 +184,7 @@ TEST(WTF_GUniquePtr, OutPtr)
>     {
>         GUniqueOutPtr<char> a;
>         returnOutChar(&a.outPtr());
>-        GUniquePtr<char> b = a.release();
>+        GUniquePtr<char> b(a.release());
>         ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
>         actual << "g_free(" << b.get() << ");";
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 199579: 373644 | 373654 | 373764