[webkit-changes] [275759] trunk

Fri, 09 Apr 2021 04:44:31 -0700

Title: [275759] trunk
Revision
275759
Author
[email protected]
Date
2021-04-09 04:43:11 -0700 (Fri, 09 Apr 2021)

Log Message

[GTK][WPE] Bump libsoup3 version to 2.99.3
https://bugs.webkit.org/show_bug.cgi?id=224362

Patch by Carlos Garcia Campos <[email protected]> on 2021-04-09
Reviewed by Žan Doberšek.

.:

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Source/WebCore:

* platform/network/soup/GUniquePtrSoup.h:
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::platformSuggestedFilename const):

Modified Paths

Diff

Modified: trunk/ChangeLog (275758 => 275759)


--- trunk/ChangeLog	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/ChangeLog	2021-04-09 11:43:11 UTC (rev 275759)
@@ -1,3 +1,13 @@
+2021-04-09  Carlos Garcia Campos  <[email protected]>
+
+        [GTK][WPE] Bump libsoup3 version to 2.99.3
+        https://bugs.webkit.org/show_bug.cgi?id=224362
+
+        Reviewed by Žan Doberšek.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2021-04-07  Michael Catanzaro  <[email protected]>
 
         [GTK] webkit://gpu should print runtime libwpe and wpebackend-fdo versions

Modified: trunk/Source/WebCore/ChangeLog (275758 => 275759)


--- trunk/Source/WebCore/ChangeLog	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/Source/WebCore/ChangeLog	2021-04-09 11:43:11 UTC (rev 275759)
@@ -1,3 +1,14 @@
+2021-04-09  Carlos Garcia Campos  <[email protected]>
+
+        [GTK][WPE] Bump libsoup3 version to 2.99.3
+        https://bugs.webkit.org/show_bug.cgi?id=224362
+
+        Reviewed by Žan Doberšek.
+
+        * platform/network/soup/GUniquePtrSoup.h:
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::platformSuggestedFilename const):
+
 2021-04-09  Ziran Sun  <[email protected]>
 
         [css-flexbox] max-height percentages are wrongly resolved for replaced grid items in nested percentage flexboxes

Modified: trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h (275758 => 275759)


--- trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h	2021-04-09 11:43:11 UTC (rev 275759)
@@ -29,7 +29,6 @@
 namespace WTF {
 
 WTF_DEFINE_GPTR_DELETER(SoupCookie, soup_cookie_free)
-WTF_DEFINE_GPTR_DELETER(SoupMessageHeaders, soup_message_headers_free)
 #if SOUP_CHECK_VERSION(2, 67, 1)
 WTF_DEFINE_GPTR_DELETER(SoupHSTSPolicy, soup_hsts_policy_free)
 #endif
@@ -36,6 +35,11 @@
 #if USE(SOUP2)
 WTF_DEFINE_GPTR_DELETER(SoupURI, soup_uri_free)
 #endif
+#if SOUP_CHECK_VERSION(2, 99, 3)
+WTF_DEFINE_GPTR_DELETER(SoupMessageHeaders, soup_message_headers_unref)
+#else
+WTF_DEFINE_GPTR_DELETER(SoupMessageHeaders, soup_message_headers_free)
+#endif
 
 } // namespace WTF

Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (275758 => 275759)


--- trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp	2021-04-09 11:43:11 UTC (rev 275759)
@@ -24,6 +24,7 @@
 
 #include "ResourceResponse.h"
 
+#include "GUniquePtrSoup.h"
 #include "HTTPHeaderNames.h"
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
@@ -134,11 +135,10 @@
 
     if (contentDisposition.is8Bit())
         contentDisposition = String::fromUTF8WithLatin1Fallback(contentDisposition.characters8(), contentDisposition.length());
-    SoupMessageHeaders* soupHeaders = soup_message_headers_new(SOUP_MESSAGE_HEADERS_RESPONSE);
-    soup_message_headers_append(soupHeaders, "Content-Disposition", contentDisposition.utf8().data());
+    GUniquePtr<SoupMessageHeaders> soupHeaders(soup_message_headers_new(SOUP_MESSAGE_HEADERS_RESPONSE));
+    soup_message_headers_append(soupHeaders.get(), "Content-Disposition", contentDisposition.utf8().data());
     GRefPtr<GHashTable> params;
-    soup_message_headers_get_content_disposition(soupHeaders, nullptr, &params.outPtr());
-    soup_message_headers_free(soupHeaders);
+    soup_message_headers_get_content_disposition(soupHeaders.get(), nullptr, &params.outPtr());
     auto filename = params ? String::fromUTF8(static_cast<char*>(g_hash_table_lookup(params.get(), "filename"))) : String();
     return sanitizeFilename(filename);
 }

Modified: trunk/Source/cmake/OptionsGTK.cmake (275758 => 275759)


--- trunk/Source/cmake/OptionsGTK.cmake	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/Source/cmake/OptionsGTK.cmake	2021-04-09 11:43:11 UTC (rev 275759)
@@ -204,7 +204,7 @@
     set(SOUP_MINIMUM_VERSION 2.54.0)
     set(SOUP_API_VERSION 2.4)
 else ()
-    set(SOUP_MINIMUM_VERSION 2.99.2)
+    set(SOUP_MINIMUM_VERSION 2.99.3)
     set(SOUP_API_VERSION 3.0)
 endif ()
 find_package(LibSoup ${SOUP_MINIMUM_VERSION} REQUIRED)

Modified: trunk/Source/cmake/OptionsWPE.cmake (275758 => 275759)


--- trunk/Source/cmake/OptionsWPE.cmake	2021-04-09 11:35:30 UTC (rev 275758)
+++ trunk/Source/cmake/OptionsWPE.cmake	2021-04-09 11:43:11 UTC (rev 275759)
@@ -122,7 +122,7 @@
     set(WPE_API_VERSION 1.0)
     set(WPE_API_DOC_VERSION 1.0)
 else ()
-    set(SOUP_MINIMUM_VERSION 2.99.2)
+    set(SOUP_MINIMUM_VERSION 2.99.3)
     set(SOUP_API_VERSION 3.0)
     set(WPE_API_VERSION 1.1)
     # No API changes in 1.1, so keep using the same API documentation.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to