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

Tue, 22 Aug 2017 14:54:59 -0700

Title: [221050] trunk/Source/WebCore
Revision
221050
Author
[email protected]
Date
2017-08-22 14:54:40 -0700 (Tue, 22 Aug 2017)

Log Message

Correct SOUP and cURL builds after r221017.
https://bugs.webkit.org/show_bug.cgi?id=175846

Reviewed by Michael Catanzaro.

Correct the method signatures for 'cookiesForDOM' on the SOUP and cURL backends.
Note that these ports will need to add specific logic to find/filter secure cookies
if requested by the caller.

* platform/network/curl/CookieJarCurl.cpp:
(WebCore::CookieJarCurlFileSystem::cookiesForDOM):
(WebCore::cookiesForDOM):
* platform/network/curl/CookieJarCurl.h:
* platform/network/soup/CookieJarSoup.cpp:
(WebCore::cookiesForDOM):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (221049 => 221050)


--- trunk/Source/WebCore/ChangeLog	2017-08-22 21:37:59 UTC (rev 221049)
+++ trunk/Source/WebCore/ChangeLog	2017-08-22 21:54:40 UTC (rev 221050)
@@ -1,3 +1,21 @@
+2017-08-22  Brent Fulgham  <[email protected]>
+
+        Correct SOUP and cURL builds after r221017.
+        https://bugs.webkit.org/show_bug.cgi?id=175846
+
+        Reviewed by Michael Catanzaro.
+
+        Correct the method signatures for 'cookiesForDOM' on the SOUP and cURL backends.
+        Note that these ports will need to add specific logic to find/filter secure cookies
+        if requested by the caller.
+
+        * platform/network/curl/CookieJarCurl.cpp:
+        (WebCore::CookieJarCurlFileSystem::cookiesForDOM):
+        (WebCore::cookiesForDOM):
+        * platform/network/curl/CookieJarCurl.h:
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::cookiesForDOM):
+
 2017-08-22  Chris Dumez  <[email protected]>
 
         [EnabledBySetting] in WebIDL uses Document but does not include Document.h

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


--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp	2017-08-22 21:37:59 UTC (rev 221049)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp	2017-08-22 21:54:40 UTC (rev 221050)
@@ -287,9 +287,10 @@
     return cookies;
 }
 
-String CookieJarCurlFileSystem::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+std::pair<String, bool> CookieJarCurlFileSystem::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, IncludeSecureCookies)
 {
-    return cookiesForSession(session, firstParty, url, false);
+    // FIXME: This should filter secure cookies out if the caller requests it.
+    return { cookiesForSession(session, firstParty, url, false), false };
 }
 
 String CookieJarCurlFileSystem::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
@@ -336,9 +337,9 @@
 
 // dispatcher functions
 
-String cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+std::pair<String, bool> cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, IncludeSecureCookies includeSecureCookies)
 {
-    return CurlContext::singleton().cookieJar().cookiesForDOM(session, firstParty, url);
+    return CurlContext::singleton().cookieJar().cookiesForDOM(session, firstParty, url, includeSecureCookies);
 }
 
 void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& value)

Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h (221049 => 221050)


--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h	2017-08-22 21:37:59 UTC (rev 221049)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h	2017-08-22 21:54:40 UTC (rev 221050)
@@ -28,7 +28,7 @@
 
 class CookieJarCurl {
 public:
-    virtual String cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const URL&) = 0;
+    virtual std::pair<String, bool> cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies) = 0;
     virtual void setCookiesFromDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, const String&) = 0;
     virtual bool cookiesEnabled(const NetworkStorageSession&, const URL& firstParty, const URL&) = 0;
     virtual String cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&) = 0;
@@ -41,7 +41,7 @@
 };
 
 class CookieJarCurlFileSystem : public CookieJarCurl {
-    String cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const URL&) override;
+    std::pair<String, bool> cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies) override;
     void setCookiesFromDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, const String&) override;
     bool cookiesEnabled(const NetworkStorageSession&, const URL& firstParty, const URL&) override;
     String cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&) override;

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


--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp	2017-08-22 21:37:59 UTC (rev 221049)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp	2017-08-22 21:54:40 UTC (rev 221050)
@@ -88,8 +88,9 @@
     return String::fromUTF8(cookies.get());
 }
 
-String cookiesForDOM(const NetworkStorageSession& session, const URL&, const URL& url)
+std::pair<String, bool> cookiesForDOM(const NetworkStorageSession& session, const URL&, const URL& url, IncludeSecureCookies)
 {
+    // FIXME: SOUP concept of secure cookies should be filtered here.
     return cookiesForSession(session, url, false);
 }
 

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

Reply via email to