Changeset 231862 in webkit

Timestamp:

May 16, 2018 12:34:19 PM (6 years ago)

Author:

dbates@webkit.org

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarDB.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-16  Daniel Bates  <dabates@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  <dabates@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp

@@ -317 +317 @@
             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();