Skip to content

Commit 40a5776

Browse files
author
[email protected]
committed
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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@221289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 2125863 commit 40a5776

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

‎Source/WebKitLegacy/win/ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-08-28 Brent Fulgham <[email protected]>
2+
3+
Unreviewed build fix #2 after r221275.
4+
5+
* WebCoreSupport/WebPlatformStrategies.cpp:
6+
(WebPlatformStrategies::cookieRequestHeaderFieldValue): Correct return type and arguments
7+
to match new API.
8+
* WebCoreSupport/WebPlatformStrategies.h: Update signatures.
9+
110
2017-08-28 Brent Fulgham <[email protected]>
211

312
Unreviewed build fix after r221275.

‎Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ std::pair<String, bool> WebPlatformStrategies::cookieRequestHeaderFieldValue(con
9090
return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url, includeSecureCookies);
9191
}
9292

93-
String WebPlatformStrategies::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const URL& url)
93+
std::pair<String, bool> WebPlatformStrategies::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const URL& url, WebCore::IncludeSecureCookies includeSecureCookies)
9494
{
9595
auto& session = sessionID.isEphemeral() ? WebFrameNetworkingContext::ensurePrivateBrowsingSession() : NetworkStorageSession::defaultStorageSession();
96-
return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
96+
return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url, includeSecureCookies);
9797
}
9898

9999
bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)

‎Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCor
4848
std::pair<String, bool> cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
4949
virtual void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
5050
virtual bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
51-
virtual String cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
52-
virtual String cookieRequestHeaderFieldValue(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&);
51+
std::pair<String, bool> cookieRequestHeaderFieldValue(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
52+
std::pair<String, bool> cookieRequestHeaderFieldValue(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
5353
virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
5454
virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&);
5555
};

0 commit comments

Comments
 (0)