Changeset 230981 in webkit

Timestamp:

Apr 24, 2018 8:28:25 PM (6 years ago)

Author:

Fujii Hironori

Message:

Implement Same-Site cookies
​https://bugs.webkit.org/show_bug.cgi?id=159464
<rdar://problem/27196358>

Unreviewed build fix.

WinCairo WebKit2 can't compile since r230921.

• NetworkProcess/curl/NetworkDataTaskCurl.cpp:

(WebKit::NetworkDataTaskCurl::appendCookieHeader):
CookieJarCurlDatabase::cookieRequestHeaderFieldValue needs
SameSiteInfo.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/curl/NetworkDataTaskCurl.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Implement Same-Site cookies
+        https://bugs.webkit.org/show_bug.cgi?id=159464
+        <rdar://problem/27196358>
+
+        Unreviewed build fix.
+
+        WinCairo WebKit2 can't compile since r230921.
+
+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+        (WebKit::NetworkDataTaskCurl::appendCookieHeader):
+        CookieJarCurlDatabase::cookieRequestHeaderFieldValue needs
+        SameSiteInfo.
+
 2018-04-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp

@@ -35 +35 @@
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceError.h>
+#include <WebCore/SameSiteInfo.h>
 
 using namespace WebCore;
@@ -380 +381 @@
     const auto& cookieJar = storageSession.cookieStorage();
     auto includeSecureCookies = request.url().protocolIs("https") ? IncludeSecureCookies::Yes : IncludeSecureCookies::No;
-    auto cookieHeaderField = cookieJar.cookieRequestHeaderFieldValue(storageSession, request.firstPartyForCookies(), request.url(), std::nullopt, std::nullopt, includeSecureCookies).first;
+    auto cookieHeaderField = cookieJar.cookieRequestHeaderFieldValue(storageSession, request.firstPartyForCookies(), WebCore::SameSiteInfo::create(request), request.url(), std::nullopt, std::nullopt, includeSecureCookies).first;
     if (!cookieHeaderField.isEmpty())
         request.addHTTPHeaderField(HTTPHeaderName::Cookie, cookieHeaderField);