Changeset 221050 in webkit

Timestamp:

Aug 22, 2017, 2:54:40 PM (9 years ago)

Author:

Brent Fulgham

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarCurl.cpp (modified) (2 diffs)
• platform/network/curl/CookieJarCurl.h (modified) (2 diffs)
• platform/network/soup/CookieJarSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-22  Brent Fulgham  <bfulgham@apple.com>
+
+        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  <cdumez@apple.com>
 

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

@@ -288 +288 @@
 }
 
-String CookieJarCurlFileSystem::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
-    return cookiesForSession(session, firstParty, url, false);
+std::pair<String, bool> CookieJarCurlFileSystem::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, IncludeSecureCookies)
+{
+    // FIXME: This should filter secure cookies out if the caller requests it.
+    return { cookiesForSession(session, firstParty, url, false), false };
 }
 
@@ -337 +338 @@
 // dispatcher functions
 
-String cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
-{
-    return CurlContext::singleton().cookieJar().cookiesForDOM(session, firstParty, 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, includeSecureCookies);
 }
 

trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h

@@ -29 +29 @@
 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;
@@ -42 +42 @@
 
 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;

trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp

@@ -89 +89 @@
 }
 
-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);
 }