diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-21 08:57:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-21 08:57:52 -0800 |
| commit | 3564cd0fbfa8c6c1de224aca4c7bd0dd92f5161d (patch) | |
| tree | 2364333e0b9f9d7fedc368cba6dc6d567701be1f /WebCore | |
| parent | 36f687f9f79b594e08a1fb84059d381521f58949 (diff) | |
| parent | 8457f5dc1324682e3874821191e733aa37d95edb (diff) | |
| download | external_webkit-3564cd0fbfa8c6c1de224aca4c7bd0dd92f5161d.zip external_webkit-3564cd0fbfa8c6c1de224aca4c7bd0dd92f5161d.tar.gz external_webkit-3564cd0fbfa8c6c1de224aca4c7bd0dd92f5161d.tar.bz2 | |
Merge change I8457f5dc
* changes:
Update the cookie code in platform/network to match the code upstreamed in
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.mk | 2 | ||||
| -rw-r--r-- | WebCore/platform/network/android/AuthenticationChallenge.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/network/android/CookieJarAndroid.cpp (renamed from WebCore/platform/network/android/Cookie.cpp) | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 46d9caa..1fdbcbb 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -514,7 +514,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/network/ResourceRequestBase.cpp \ platform/network/ResourceResponseBase.cpp \ \ - platform/network/android/Cookie.cpp \ + platform/network/android/CookieJarAndroid.cpp \ platform/network/android/NetworkStateNotifierAndroid.cpp \ platform/network/android/ResourceHandleAndroid.cpp \ platform/network/android/ResourceRequestAndroid.cpp \ 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); |