[webkit-changes] [221289] trunk/Source/WebKitLegacy/win

Mon, 28 Aug 2017 21:34:50 -0700

Title: [221289] trunk/Source/WebKitLegacy/win
Revision
221289
Author
[email protected]
Date
2017-08-28 21:33:36 -0700 (Mon, 28 Aug 2017)

Log Message

Unreviewed build fix #2 after r221275.

* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::cookieRequestHeaderFieldValue): Correct return type and arguments
to match new API.
* WebCoreSupport/WebPlatformStrategies.h: Update signatures.

Modified Paths

Diff

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (221288 => 221289)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2017-08-29 02:59:18 UTC (rev 221288)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2017-08-29 04:33:36 UTC (rev 221289)
@@ -1,5 +1,14 @@
 2017-08-28  Brent Fulgham  <[email protected]>
 
+        Unreviewed build fix #2 after r221275.
+
+        * WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebPlatformStrategies::cookieRequestHeaderFieldValue): Correct return type and arguments
+        to match new API.
+        * WebCoreSupport/WebPlatformStrategies.h: Update signatures.
+
+2017-08-28  Brent Fulgham  <[email protected]>
+
         Unreviewed build fix after r221275.
 
         * WebCoreSupport/WebPlatformStrategies.cpp:

Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp (221288 => 221289)


--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp	2017-08-29 02:59:18 UTC (rev 221288)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp	2017-08-29 04:33:36 UTC (rev 221289)
@@ -90,10 +90,10 @@
     return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url, includeSecureCookies);
 }
 
-String WebPlatformStrategies::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const URL& url)
+std::pair<String, bool> WebPlatformStrategies::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const URL& url, WebCore::IncludeSecureCookies includeSecureCookies)
 {
     auto& session = sessionID.isEphemeral() ? WebFrameNetworkingContext::ensurePrivateBrowsingSession() : NetworkStorageSession::defaultStorageSession();
-    return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
+    return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url, includeSecureCookies);
 }
 
 bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)

Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h (221288 => 221289)


--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h	2017-08-29 02:59:18 UTC (rev 221288)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h	2017-08-29 04:33:36 UTC (rev 221289)
@@ -48,8 +48,8 @@
     std::pair<String, bool> cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
     virtual void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
     virtual bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
-    virtual String cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
-    virtual String cookieRequestHeaderFieldValue(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&);
+    std::pair<String, bool> cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
+    std::pair<String, bool> cookieRequestHeaderFieldValue(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
     virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
     virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&);
 };

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

Reply via email to