Title: [231862] trunk/Source/WebCore
Revision
231862
Author
dba...@webkit.org
Date
2018-05-16 12:34:19 -0700 (Wed, 16 May 2018)

Log Message

Attempt to fix the WinCairo build following r231859
(https://bugs.webkit.org/show_bug.cgi?id=185654)

Instantiate Cookie as a struct and set applicable fields.

* platform/network/curl/CookieJarDB.cpp:
(WebCore::CookieJarDB::searchCookies):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (231861 => 231862)


--- trunk/Source/WebCore/ChangeLog	2018-05-16 19:11:54 UTC (rev 231861)
+++ trunk/Source/WebCore/ChangeLog	2018-05-16 19:34:19 UTC (rev 231862)
@@ -1,5 +1,15 @@
 2018-05-16  Daniel Bates  <daba...@apple.com>
 
+        Attempt to fix the WinCairo build following r231859
+        (https://bugs.webkit.org/show_bug.cgi?id=185654)
+
+        Instantiate Cookie as a struct and set applicable fields.
+
+        * platform/network/curl/CookieJarDB.cpp:
+        (WebCore::CookieJarDB::searchCookies):
+
+2018-05-16  Daniel Bates  <daba...@apple.com>
+
         Cleanup platform Cookie
         https://bugs.webkit.org/show_bug.cgi?id=185654
 

Modified: trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp (231861 => 231862)


--- trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp	2018-05-16 19:11:54 UTC (rev 231861)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp	2018-05-16 19:34:19 UTC (rev 231862)
@@ -316,20 +316,16 @@
         if (!isPathMatched)
             continue;
 
-        Cookie result(cookieName,
-            cookieValue,
-            cookieDomain,
-            cookiePath,
-            0,
-            cookieExpires,
-            cookieHttpOnly,
-            cookieSecure,
-            cookieSession,
-            String(),
-            URL(),
-            Vector<uint16_t>());
-
-        results.append(result);
+        Cookie cookie;
+        cookie.name = cookieName;
+        cookie.value = cookieValue;
+        cookie.domain = cookieDomain;
+        cookie.path = cookiePath;
+        cookie.expires = cookieExpires;
+        cookie.httpOnly = cookieHttpOnly;
+        cookie.secure = cookieSecure;
+        cookie.session = cookieSession;
+        results.append(WTFMove(cookie));
     }
     pstmt->finalize();
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to