Modified: trunk/Source/WebCore/ChangeLog (198631 => 198632)
--- trunk/Source/WebCore/ChangeLog 2016-03-24 17:54:40 UTC (rev 198631)
+++ trunk/Source/WebCore/ChangeLog 2016-03-24 18:04:46 UTC (rev 198632)
@@ -1,3 +1,21 @@
+2016-03-24 Alex Christensen <[email protected]>
+
+ Clean up cookie jar after r198195
+ https://bugs.webkit.org/show_bug.cgi?id=155484
+
+ Reviewed by Tim Horton.
+
+ Get rid of a now unneeded macro.
+
+ * loader/CookieJar.cpp:
+ (WebCore::storageSession):
+ (WebCore::cookies):
+ (WebCore::setCookies):
+ (WebCore::cookiesEnabled):
+ (WebCore::cookieRequestHeaderFieldValue):
+ (WebCore::getRawCookies):
+ (WebCore::deleteCookie):
+
2016-03-24 Youenn Fablet <[email protected]>
[Fetch API] Add basic loading of resources
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (198631 => 198632)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2016-03-24 17:54:40 UTC (rev 198631)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2016-03-24 18:04:46 UTC (rev 198632)
@@ -53,42 +53,35 @@
NetworkingContext* context = networkingContext(document);
return context ? context->storageSession() : NetworkStorageSession::defaultStorageSession();
}
-#define LOCAL_SESSION(document) NetworkStorageSession& session = storageSession(document);
String cookies(const Document* document, const URL& url)
{
- LOCAL_SESSION(document)
- return platformStrategies()->cookiesStrategy()->cookiesForDOM(session, document->firstPartyForCookies(), url);
+ return platformStrategies()->cookiesStrategy()->cookiesForDOM(storageSession(document), document->firstPartyForCookies(), url);
}
void setCookies(Document* document, const URL& url, const String& cookieString)
{
- LOCAL_SESSION(document)
- platformStrategies()->cookiesStrategy()->setCookiesFromDOM(session, document->firstPartyForCookies(), url, cookieString);
+ platformStrategies()->cookiesStrategy()->setCookiesFromDOM(storageSession(document), document->firstPartyForCookies(), url, cookieString);
}
bool cookiesEnabled(const Document* document)
{
- LOCAL_SESSION(document)
- return platformStrategies()->cookiesStrategy()->cookiesEnabled(session, document->firstPartyForCookies(), document->cookieURL());
+ return platformStrategies()->cookiesStrategy()->cookiesEnabled(storageSession(document), document->firstPartyForCookies(), document->cookieURL());
}
String cookieRequestHeaderFieldValue(const Document* document, const URL& url)
{
- LOCAL_SESSION(document)
- return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(session, document->firstPartyForCookies(), url);
+ return platformStrategies()->cookiesStrategy()->cookieRequestHeaderFieldValue(storageSession(document), document->firstPartyForCookies(), url);
}
bool getRawCookies(const Document* document, const URL& url, Vector<Cookie>& cookies)
{
- LOCAL_SESSION(document)
- return platformStrategies()->cookiesStrategy()->getRawCookies(session, document->firstPartyForCookies(), url, cookies);
+ return platformStrategies()->cookiesStrategy()->getRawCookies(storageSession(document), document->firstPartyForCookies(), url, cookies);
}
void deleteCookie(const Document* document, const URL& url, const String& cookieName)
{
- LOCAL_SESSION(document)
- platformStrategies()->cookiesStrategy()->deleteCookie(session, url, cookieName);
+ platformStrategies()->cookiesStrategy()->deleteCookie(storageSession(document), url, cookieName);
}
}
