summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/network
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2009-12-17 13:31:38 +0000
committerAndrei Popescu <andreip@google.com>2009-12-21 12:47:39 +0000
commit8457f5dc1324682e3874821191e733aa37d95edb (patch)
tree970db506e4b44fc90a645ae7a4b8917d6bc6b457 /WebCore/platform/network
parent06b4dc1467fbed1b6d97d688ece43f15686f8644 (diff)
downloadexternal_webkit-8457f5dc1324682e3874821191e733aa37d95edb.zip
external_webkit-8457f5dc1324682e3874821191e733aa37d95edb.tar.gz
external_webkit-8457f5dc1324682e3874821191e733aa37d95edb.tar.bz2
Update the cookie code in platform/network to match
the code upstreamed in https://bugs.webkit.org/show_bug.cgi?id=32559
Diffstat (limited to 'WebCore/platform/network')
-rw-r--r--WebCore/platform/network/android/AuthenticationChallenge.h2
-rw-r--r--WebCore/platform/network/android/CookieJarAndroid.cpp (renamed from WebCore/platform/network/android/Cookie.cpp)4
2 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/platform/network/android/AuthenticationChallenge.h b/WebCore/platform/network/android/AuthenticationChallenge.h
index e272d60..954bfd8 100644
--- a/WebCore/platform/network/android/AuthenticationChallenge.h
+++ b/WebCore/platform/network/android/AuthenticationChallenge.h
@@ -31,8 +31,6 @@
namespace WebCore {
-class ResourceHandle;
-
class AuthenticationChallenge : public AuthenticationChallengeBase {
};
diff --git a/WebCore/platform/network/android/Cookie.cpp b/WebCore/platform/network/android/CookieJarAndroid.cpp
index c0b7c7b..ba4b5dc 100644
--- a/WebCore/platform/network/android/Cookie.cpp
+++ b/WebCore/platform/network/android/CookieJarAndroid.cpp
@@ -25,12 +25,12 @@
#include "config.h"
+#include "CookieJar.h"
+
#include "PlatformBridge.h"
namespace WebCore {
-class Document;
-
void setCookies(Document*, const KURL& url, const String& value)
{
PlatformBridge::setCookies(url, value);