Modified: trunk/Source/WebKit2/ChangeLog (137656 => 137657)
--- trunk/Source/WebKit2/ChangeLog 2012-12-13 22:40:31 UTC (rev 137656)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-13 22:46:26 UTC (rev 137657)
@@ -1,3 +1,23 @@
+2012-12-13 Alexey Proskuryakov <[email protected]>
+
+ <rdar://problem/12838354> DOM cookie access functions should respect private browsing
+ https://bugs.webkit.org/show_bug.cgi?id=104691
+
+ Reviewed by Anders Carlsson.
+
+ Remove obsolete FIXMEs, and fix one function that I overlooked.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::cookiesForDOM):
+ (WebKit::NetworkConnectionToWebProcess::setCookiesFromDOM):
+ (WebKit::NetworkConnectionToWebProcess::cookiesEnabled):
+ (WebKit::NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue):
+ (WebKit::NetworkConnectionToWebProcess::getRawCookies):
+ (WebKit::NetworkConnectionToWebProcess::deleteCookie):
+ (WebKit::NetworkConnectionToWebProcess::getHostnamesWithCookies):
+ (WebKit::NetworkConnectionToWebProcess::deleteCookiesForHostname):
+ (WebKit::NetworkConnectionToWebProcess::deleteAllCookies):
+
2012-12-13 Anders Carlsson <[email protected]>
DownloadManager shouldn't call the web process directly
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (137656 => 137657)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2012-12-13 22:40:31 UTC (rev 137656)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2012-12-13 22:46:26 UTC (rev 137657)
@@ -167,43 +167,36 @@
void NetworkConnectionToWebProcess::cookiesForDOM(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, String& result)
{
- // FIXME (NetworkProcess): Use a correct storage session.
result = WebCore::cookiesForDOM(networkingContext(privateBrowsingEnabled), firstParty, url);
}
void NetworkConnectionToWebProcess::setCookiesFromDOM(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, const String& cookieString)
{
- // FIXME (NetworkProcess): Use a correct storage session.
WebCore::setCookiesFromDOM(networkingContext(privateBrowsingEnabled), firstParty, url, cookieString);
}
void NetworkConnectionToWebProcess::cookiesEnabled(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, bool& result)
{
- // FIXME (NetworkProcess): Use a correct storage session.
result = WebCore::cookiesEnabled(networkingContext(privateBrowsingEnabled), firstParty, url);
}
void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, String& result)
{
- // FIXME (NetworkProcess): Use a correct storage session.
- result = WebCore::cookieRequestHeaderFieldValue(0, firstParty, url);
+ result = WebCore::cookieRequestHeaderFieldValue(networkingContext(privateBrowsingEnabled), firstParty, url);
}
void NetworkConnectionToWebProcess::getRawCookies(bool privateBrowsingEnabled, const KURL& firstParty, const KURL& url, Vector<Cookie>& result)
{
- // FIXME (NetworkProcess): Use a correct storage session.
WebCore::getRawCookies(networkingContext(privateBrowsingEnabled), firstParty, url, result);
}
void NetworkConnectionToWebProcess::deleteCookie(bool privateBrowsingEnabled, const KURL& url, const String& cookieName)
{
- // FIXME (NetworkProcess): Use a correct storage session.
WebCore::deleteCookie(networkingContext(privateBrowsingEnabled), url, cookieName);
}
void NetworkConnectionToWebProcess::getHostnamesWithCookies(bool privateBrowsingEnabled, Vector<String>& hostnames)
{
- // FIXME (NetworkProcess): Use a correct storage session.
HashSet<String> hostnamesSet;
WebCore::getHostnamesWithCookies(networkingContext(privateBrowsingEnabled), hostnamesSet);
WTF::copyToVector(hostnamesSet, hostnames);
@@ -211,13 +204,11 @@
void NetworkConnectionToWebProcess::deleteCookiesForHostname(bool privateBrowsingEnabled, const String& hostname)
{
- // FIXME (NetworkProcess): Use a correct storage session.
WebCore::deleteCookiesForHostname(networkingContext(privateBrowsingEnabled), hostname);
}
void NetworkConnectionToWebProcess::deleteAllCookies(bool privateBrowsingEnabled)
{
- // FIXME (NetworkProcess): Use a correct storage session.
WebCore::deleteAllCookies(networkingContext(privateBrowsingEnabled));
}
