summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorElliott Slaughter <eds@google.com>2010-08-18 11:05:15 -0700
committerElliott Slaughter <eds@google.com>2010-08-18 11:48:18 -0700
commit918f81255bd5490e0536420428111e71d31ae209 (patch)
treed28837703ed9b0a2a6258a05f753a1ea11efa787 /WebCore/platform
parent1272b79ac7617044b2bb907d03d71a4689269523 (diff)
downloadexternal_webkit-918f81255bd5490e0536420428111e71d31ae209.zip
external_webkit-918f81255bd5490e0536420428111e71d31ae209.tar.gz
external_webkit-918f81255bd5490e0536420428111e71d31ae209.tar.bz2
Fix for incognito mode cookies from WebCore.
Change-Id: Id7c2ae708c166da035f1fdda8351b921d86d78de
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/android/PlatformBridge.h7
-rw-r--r--WebCore/platform/network/android/CookieJarAndroid.cpp16
2 files changed, 12 insertions, 11 deletions
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index e8722e2..4eeaa6c 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -81,6 +81,7 @@ class NPObject;
namespace WebCore {
+class Document;
class FrameView;
class Widget;
@@ -100,9 +101,9 @@ public:
static WTF::Vector<String> getSupportedKeyStrengthList();
static String getSignedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL&);
// Cookies
- static void setCookies(const KURL&, const String& value);
- static String cookies(const KURL&);
- static bool cookiesEnabled();
+ static void setCookies(const Document*, const KURL&, const String& value);
+ static String cookies(const Document*, const KURL&);
+ static bool cookiesEnabled(const Document*);
// Plugin
static NPObject* pluginScriptableObject(Widget*);
// Popups
diff --git a/WebCore/platform/network/android/CookieJarAndroid.cpp b/WebCore/platform/network/android/CookieJarAndroid.cpp
index dd324c5..f3b343e 100644
--- a/WebCore/platform/network/android/CookieJarAndroid.cpp
+++ b/WebCore/platform/network/android/CookieJarAndroid.cpp
@@ -31,25 +31,25 @@
namespace WebCore {
-void setCookies(Document*, const KURL& url, const String& value)
+void setCookies(Document* document, const KURL& url, const String& value)
{
- PlatformBridge::setCookies(url, value);
+ PlatformBridge::setCookies(document, url, value);
}
-String cookies(const Document*, const KURL& url)
+String cookies(const Document* document, const KURL& url)
{
- return PlatformBridge::cookies(url);
+ return PlatformBridge::cookies(document, url);
}
-String cookieRequestHeaderFieldValue(const Document*, const KURL& url)
+String cookieRequestHeaderFieldValue(const Document* document, const KURL& url)
{
// FIXME: include HttpOnly cookie.
- return PlatformBridge::cookies(url);
+ return PlatformBridge::cookies(document, url);
}
-bool cookiesEnabled(const Document*)
+bool cookiesEnabled(const Document* document)
{
- return PlatformBridge::cookiesEnabled();
+ return PlatformBridge::cookiesEnabled(document);
}
}