Diff
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (221034 => 221035)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2017-08-22 19:56:39 UTC (rev 221034)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2017-08-22 20:09:38 UTC (rev 221035)
@@ -1,3 +1,11 @@
+2017-08-22 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix after r221017.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebPlatformStrategies::cookiesForDOM): Update for new signature.
+ * WebCoreSupport/WebPlatformStrategies.h:
+
2017-08-22 Alex Christensen <[email protected]>
Remove ChromeClient::scrollbarsModeDidChange
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp (221034 => 221035)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2017-08-22 19:56:39 UTC (rev 221034)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2017-08-22 20:09:38 UTC (rev 221035)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,9 +70,9 @@
return new BlobRegistryImpl;
}
-String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+std::pair<String, bool> WebPlatformStrategies::cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, WebCore::IncludeSecureCookies includeSecureCookies) override
{
- return WebCore::cookiesForDOM(session, firstParty, url);
+ return WebCore::cookiesForDOM(session, firstParty, url, includeSecureCookies);
}
void WebPlatformStrategies::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h (221034 => 221035)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h 2017-08-22 19:56:39 UTC (rev 221034)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.h 2017-08-22 20:09:38 UTC (rev 221035)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
virtual WebCore::BlobRegistry* createBlobRegistry();
// WebCore::CookiesStrategy
- virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
+ 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&);
