Diff
Modified: trunk/Source/WebCore/ChangeLog (222937 => 222938)
--- trunk/Source/WebCore/ChangeLog 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/ChangeLog 2017-10-05 22:43:02 UTC (rev 222938)
@@ -1,3 +1,25 @@
+2017-10-05 Chris Dumez <[email protected]>
+
+ Drop unused parameters for CookiesStrategy::cookiesEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=177957
+
+ Reviewed by Alex Christensen.
+
+ * loader/CookieJar.cpp:
+ (WebCore::cookiesEnabled):
+ * platform/CookiesStrategy.h:
+ * platform/network/PlatformCookieJar.h:
+ * platform/network/cf/CookieJarCFNet.cpp:
+ (WebCore::cookiesEnabled):
+ * platform/network/curl/CookieJarCurl.cpp:
+ (WebCore::CookieJarCurlFileSystem::cookiesEnabled):
+ (WebCore::cookiesEnabled):
+ * platform/network/curl/CookieJarCurl.h:
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookiesEnabled):
+ * platform/network/soup/CookieJarSoup.cpp:
+ (WebCore::cookiesEnabled):
+
2017-10-05 Zalan Bujtas <[email protected]>
RenderListItem should not hold raw pointers to RenderListMarker.
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (222937 => 222938)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -73,7 +73,7 @@
bool cookiesEnabled(const Document& document)
{
- return platformStrategies()->cookiesStrategy()->cookiesEnabled(storageSession(document), document.firstPartyForCookies(), document.cookieURL());
+ return platformStrategies()->cookiesStrategy()->cookiesEnabled(storageSession(document));
}
String cookieRequestHeaderFieldValue(Document& document, const URL& url)
Modified: trunk/Source/WebCore/platform/CookiesStrategy.h (222937 => 222938)
--- trunk/Source/WebCore/platform/CookiesStrategy.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/CookiesStrategy.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -43,7 +43,7 @@
public:
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& cookieString) = 0;
- virtual bool cookiesEnabled(const NetworkStorageSession&, const URL& firstParty, const URL&) = 0;
+ virtual bool cookiesEnabled(const NetworkStorageSession&) = 0;
virtual std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies) = 0;
virtual std::pair<String, bool> cookieRequestHeaderFieldValue(PAL::SessionID, const URL& firstParty, const URL&, IncludeSecureCookies) = 0;
virtual bool getRawCookies(const NetworkStorageSession&, const URL& firstParty, const URL&, Vector<Cookie>&) = 0;
Modified: trunk/Source/WebCore/platform/network/PlatformCookieJar.h (222937 => 222938)
--- trunk/Source/WebCore/platform/network/PlatformCookieJar.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/PlatformCookieJar.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -43,7 +43,7 @@
WEBCORE_EXPORT std::pair<String, bool> cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies);
WEBCORE_EXPORT void setCookiesFromDOM(const NetworkStorageSession&, const URL& firstParty, const URL&, const String&);
-WEBCORE_EXPORT bool cookiesEnabled(const NetworkStorageSession&, const URL& firstParty, const URL&);
+WEBCORE_EXPORT bool cookiesEnabled(const NetworkStorageSession&);
WEBCORE_EXPORT std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies);
WEBCORE_EXPORT bool getRawCookies(const NetworkStorageSession&, const URL& firstParty, const URL&, Vector<Cookie>&);
WEBCORE_EXPORT void deleteCookie(const NetworkStorageSession&, const URL&, const String&);
Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (222937 => 222938)
--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -203,7 +203,7 @@
return { cookieString, didAccessSecureCookies };
}
-bool cookiesEnabled(const NetworkStorageSession& session, const URL& /*firstParty*/, const URL& /*url*/)
+bool cookiesEnabled(const NetworkStorageSession& session)
{
CFHTTPCookieStorageAcceptPolicy policy = CFHTTPCookieStorageGetCookieAcceptPolicy(session.cookieStorage().get());
return policy == CFHTTPCookieStorageAcceptPolicyOnlyFromMainDocumentDomain || policy == CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain || policy == CFHTTPCookieStorageAcceptPolicyAlways;
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (222937 => 222938)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -299,7 +299,7 @@
return { cookiesForSession(session, firstParty, url, true), false };
}
-bool CookieJarCurlFileSystem::cookiesEnabled(const NetworkStorageSession&, const URL& firstParty, const URL&)
+bool CookieJarCurlFileSystem::cookiesEnabled(const NetworkStorageSession&)
{
return true;
}
@@ -353,9 +353,9 @@
return CurlContext::singleton().cookieJar().cookieRequestHeaderFieldValue(session, firstParty, url, includeSecureCookies);
}
-bool cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+bool cookiesEnabled(const NetworkStorageSession& session)
{
- return CurlContext::singleton().cookieJar().cookiesEnabled(session, firstParty, url);
+ return CurlContext::singleton().cookieJar().cookiesEnabled(session);
}
bool getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h (222937 => 222938)
--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -30,7 +30,7 @@
public:
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 bool cookiesEnabled(const NetworkStorageSession&) = 0;
virtual std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies) = 0;
virtual bool getRawCookies(const NetworkStorageSession&, const URL& firstParty, const URL&, Vector<Cookie>&) = 0;
virtual void deleteCookie(const NetworkStorageSession&, const URL&, const String&) = 0;
@@ -43,7 +43,7 @@
class CookieJarCurlFileSystem : public CookieJarCurl {
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;
+ bool cookiesEnabled(const NetworkStorageSession&) override;
std::pair<String, bool> cookieRequestHeaderFieldValue(const NetworkStorageSession&, const URL& firstParty, const URL&, IncludeSecureCookies) override;
bool getRawCookies(const NetworkStorageSession&, const URL& firstParty, const URL&, Vector<Cookie>&) override;
void deleteCookie(const NetworkStorageSession&, const URL&, const String&) override;
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (222937 => 222938)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2017-10-05 22:43:02 UTC (rev 222938)
@@ -280,7 +280,7 @@
return static_cast<NSHTTPCookieAcceptPolicy>(CFHTTPCookieStorageGetCookieAcceptPolicy(cookieStorage));
}
-bool cookiesEnabled(const NetworkStorageSession& session, const URL& /*firstParty*/, const URL& /*url*/)
+bool cookiesEnabled(const NetworkStorageSession& session)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (222937 => 222938)
--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -127,7 +127,7 @@
return cookiesForSession(session, url, true, includeSecureCookies);
}
-bool cookiesEnabled(const NetworkStorageSession& session, const URL& /*firstParty*/, const URL& /*url*/)
+bool cookiesEnabled(const NetworkStorageSession& session)
{
auto policy = soup_cookie_jar_get_accept_policy(session.cookieStorage());
return policy == SOUP_COOKIE_JAR_ACCEPT_ALWAYS || policy == SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
Modified: trunk/Source/WebKit/ChangeLog (222937 => 222938)
--- trunk/Source/WebKit/ChangeLog 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/ChangeLog 2017-10-05 22:43:02 UTC (rev 222938)
@@ -1,3 +1,18 @@
+2017-10-05 Chris Dumez <[email protected]>
+
+ Drop unused parameters for CookiesStrategy::cookiesEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=177957
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::cookiesEnabled):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::cookiesEnabled):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
2017-10-05 Tim Horton <[email protected]>
Make progress toward properly-formed XPC services in the Mac CMake build
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (222937 => 222938)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -358,9 +358,9 @@
WebCore::setCookiesFromDOM(storageSession(sessionID), firstParty, url, cookieString);
}
-void NetworkConnectionToWebProcess::cookiesEnabled(PAL::SessionID sessionID, const URL& firstParty, const URL& url, bool& result)
+void NetworkConnectionToWebProcess::cookiesEnabled(PAL::SessionID sessionID, bool& result)
{
- result = WebCore::cookiesEnabled(storageSession(sessionID), firstParty, url);
+ result = WebCore::cookiesEnabled(storageSession(sessionID));
}
void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const URL& url, IncludeSecureCookies includeSecureCookies, String& cookieString, bool& secureCookiesAccessed)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (222937 => 222938)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -103,7 +103,7 @@
void cookiesForDOM(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies, String& cookieString, bool& secureCookiesAccessed);
void setCookiesFromDOM(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
- void cookiesEnabled(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, bool& result);
+ void cookiesEnabled(PAL::SessionID, bool& result);
void cookieRequestHeaderFieldValue(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies, String& cookieString, bool& secureCookiesAccessed);
void getRawCookies(PAL::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
void deleteCookie(PAL::SessionID, const WebCore::URL&, const String& cookieName);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (222937 => 222938)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-10-05 22:43:02 UTC (rev 222938)
@@ -35,7 +35,7 @@
CookiesForDOM(PAL::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, enum WebCore::IncludeSecureCookies includeSecureCookies) -> (String cookieString, bool didAccessSecureCookies)
SetCookiesFromDOM(PAL::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, String cookieString)
- CookiesEnabled(PAL::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (bool enabled)
+ CookiesEnabled(PAL::SessionID sessionID) -> (bool enabled)
CookieRequestHeaderFieldValue(PAL::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, enum WebCore::IncludeSecureCookies includeSecureCookies) -> (String cookieString, bool didAccessSecureCookies)
GetRawCookies(PAL::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
DeleteCookie(PAL::SessionID sessionID, WebCore::URL url, String cookieName)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (222937 => 222938)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -124,10 +124,10 @@
WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(session.sessionID(), firstParty, url, cookieString), 0);
}
-bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session)
{
bool result;
- if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(session.sessionID(), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(session.sessionID()), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
return false;
return result;
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h (222937 => 222938)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -49,7 +49,7 @@
// WebCore::CookiesStrategy
std::pair<String, bool> cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&) override;
- bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
+ bool cookiesEnabled(const WebCore::NetworkStorageSession&) override;
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;
bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (222937 => 222938)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-05 22:43:02 UTC (rev 222938)
@@ -1,3 +1,14 @@
+2017-10-05 Chris Dumez <[email protected]>
+
+ Drop unused parameters for CookiesStrategy::cookiesEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=177957
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::cookiesEnabled):
+
2017-10-05 Youenn Fablet <[email protected]>
Make LibWebRTCProvider port agnostic
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h (222937 => 222938)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -50,7 +50,7 @@
// WebCore::CookiesStrategy
std::pair<String, bool> cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies) override;
void setCookiesFromDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, const String&) override;
- bool cookiesEnabled(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
+ bool cookiesEnabled(const WebCore::NetworkStorageSession&) override;
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;
bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm (222937 => 222938)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2017-10-05 22:43:02 UTC (rev 222938)
@@ -82,9 +82,9 @@
WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
}
-bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session)
{
- return WebCore::cookiesEnabled(session, firstParty, url);
+ return WebCore::cookiesEnabled(session);
}
std::pair<String, bool> WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url, IncludeSecureCookies includeSecureCookies)
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (222937 => 222938)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2017-10-05 22:43:02 UTC (rev 222938)
@@ -1,3 +1,14 @@
+2017-10-05 Chris Dumez <[email protected]>
+
+ Drop unused parameters for CookiesStrategy::cookiesEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=177957
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebPlatformStrategies::cookiesEnabled):
+ * WebCoreSupport/WebPlatformStrategies.h:
+
2017-10-03 Basuke Suzuki <[email protected]>
[Curl] Reimplement CurlDownload with CurlRequest
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp (222937 => 222938)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2017-10-05 22:43:02 UTC (rev 222938)
@@ -80,9 +80,9 @@
WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
}
-bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session)
{
- return WebCore::cookiesEnabled(session, firstParty, url);
+ return WebCore::cookiesEnabled(session);
}
std::pair<String, bool> WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url, WebCore::IncludeSecureCookies includeSecureCookies)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h (222937 => 222938)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:41:15 UTC (rev 222937)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h 2017-10-05 22:43:02 UTC (rev 222938)
@@ -47,7 +47,7 @@
// WebCore::CookiesStrategy
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 bool cookiesEnabled(const WebCore::NetworkStorageSession&);
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>&);
