[webkit-changes] [230923] trunk/Source/WebCore

Mon, 23 Apr 2018 14:11:37 -0700

Title: [230923] trunk/Source/WebCore
Revision
230923
Author
[email protected]
Date
2018-04-23 14:10:41 -0700 (Mon, 23 Apr 2018)

Log Message

Attempt to fix the build after r230921
(https://bugs.webkit.org/show_bug.cgi?id=159464)

Pass Same-Site info through.

* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::cookieRequestHeaderFieldValue):
* platform/network/curl/CookieJarCurl.cpp:
(WebCore::cookieRequestHeaderFieldValue):
* platform/network/curl/CookieJarCurlDatabase.cpp:
(WebCore::CookieJarCurlDatabase::cookieRequestHeaderFieldValue const):
* platform/network/soup/CookieJarSoup.cpp:
(WebCore::cookieRequestHeaderFieldValue):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230922 => 230923)


--- trunk/Source/WebCore/ChangeLog	2018-04-23 21:07:36 UTC (rev 230922)
+++ trunk/Source/WebCore/ChangeLog	2018-04-23 21:10:41 UTC (rev 230923)
@@ -1,3 +1,19 @@
+2018-04-23  Daniel Bates  <[email protected]>
+
+        Attempt to fix the build after r230921
+        (https://bugs.webkit.org/show_bug.cgi?id=159464)
+
+        Pass Same-Site info through.
+
+        * platform/network/cf/CookieJarCFNet.cpp:
+        (WebCore::cookieRequestHeaderFieldValue):
+        * platform/network/curl/CookieJarCurl.cpp:
+        (WebCore::cookieRequestHeaderFieldValue):
+        * platform/network/curl/CookieJarCurlDatabase.cpp:
+        (WebCore::CookieJarCurlDatabase::cookieRequestHeaderFieldValue const):
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::cookieRequestHeaderFieldValue):
+
 2018-04-23  Ryan Haddad  <[email protected]>
 
         Unreviewed, speculative macOS build fix attempt.

Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (230922 => 230923)


--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp	2018-04-23 21:07:36 UTC (rev 230922)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp	2018-04-23 21:10:41 UTC (rev 230923)
@@ -234,7 +234,7 @@
 
 std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
 {
-    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
+    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.sameSiteInfo, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
 }
 
 bool cookiesEnabled(const NetworkStorageSession& session)

Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (230922 => 230923)


--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp	2018-04-23 21:07:36 UTC (rev 230922)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp	2018-04-23 21:10:41 UTC (rev 230923)
@@ -47,7 +47,7 @@
 
 std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
 {
-    return session.cookieStorage().cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
+    return session.cookieStorage().cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.sameSiteInfo, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
 }
 
 bool cookiesEnabled(const NetworkStorageSession& session)

Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp (230922 => 230923)


--- trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp	2018-04-23 21:07:36 UTC (rev 230922)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp	2018-04-23 21:10:41 UTC (rev 230923)
@@ -96,7 +96,7 @@
 
 std::pair<String, bool> CookieJarCurlDatabase::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy) const
 {
-    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);    
+    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.sameSiteInfo, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
 }
 
 bool CookieJarCurlDatabase::cookiesEnabled(const NetworkStorageSession& session) const

Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (230922 => 230923)


--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp	2018-04-23 21:07:36 UTC (rev 230922)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp	2018-04-23 21:10:41 UTC (rev 230923)
@@ -138,7 +138,7 @@
 
 std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
 {
-    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
+    return cookieRequestHeaderFieldValue(session, headerFieldProxy.firstParty, headerFieldProxy.sameSiteInfo, headerFieldProxy.url, headerFieldProxy.frameID, headerFieldProxy.pageID, headerFieldProxy.includeSecureCookies);
 }
 
 bool cookiesEnabled(const NetworkStorageSession& session)

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

Reply via email to