Unreviewed attempt to fix Windows build after r230875.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Apr 2018 04:22:25 +0000 (04:22 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Apr 2018 04:22:25 +0000 (04:22 +0000)
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::cookieRequestHeaderFieldValue):
* platform/network/curl/CookieJarCurlDatabase.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Source/WebCore/platform/network/curl/CookieJarCurlDatabase.cpp

index 34a7a06..39ec1bd 100644 (file)
@@ -1,5 +1,13 @@
 2018-04-20  Chris Dumez  <cdumez@apple.com>
 
+        Unreviewed attempt to fix Windows build after r230875.
+
+        * platform/network/cf/CookieJarCFNet.cpp:
+        (WebCore::cookieRequestHeaderFieldValue):
+        * platform/network/curl/CookieJarCurlDatabase.cpp:
+
+2018-04-20  Chris Dumez  <cdumez@apple.com>
+
         REGRESSION (r229828): web view doesn’t update or respond to resizing until client calls policy decision handler
         https://bugs.webkit.org/show_bug.cgi?id=184210
         <rdar://problem/39072354>
index 0ca2287..181d86b 100644 (file)
@@ -29,6 +29,7 @@
 #if USE(CFURLCONNECTION)
 
 #include "Cookie.h"
+#include "CookieRequestHeaderFieldProxy.h"
 #include "CookiesStrategy.h"
 #include "NetworkStorageSession.h"
 #include "NotImplemented.h"
@@ -231,6 +232,11 @@ std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSessio
     return { cookieString, didAccessSecureCookies };
 }
 
+std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const CookieRequestHeaderFieldProxy& headerFieldProxy)
+{
+    return cookieRequestHeaderFieldValue(session, headerFieldProxy.m_firstParty, headerFieldProxy.m_url, headerFieldProxy.m_frameID, headerFieldProxy.m_pageID, headerFieldProxy.m_includeSecureCookies);
+}
+
 bool cookiesEnabled(const NetworkStorageSession& session)
 {
     CFHTTPCookieStorageAcceptPolicy policy = CFHTTPCookieStorageGetCookieAcceptPolicy(session.cookieStorage().get());
index d699db9..d79f0ea 100644 (file)
@@ -28,6 +28,7 @@
 #if USE(CURL)
 #include "Cookie.h"
 #include "CookieJarDB.h"
+#include "CookieRequestHeaderFieldProxy.h"
 #include "NetworkStorageSession.h"
 #include "NotImplemented.h"
 #include "URL.h"