diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/qt/CookieJarQt.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/qt/CookieJarQt.cpp')
| -rw-r--r-- | WebCore/platform/qt/CookieJarQt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/qt/CookieJarQt.cpp b/WebCore/platform/qt/CookieJarQt.cpp index 4077407..40d9309 100644 --- a/WebCore/platform/qt/CookieJarQt.cpp +++ b/WebCore/platform/qt/CookieJarQt.cpp @@ -28,11 +28,11 @@ #include "config.h" #include "CookieJar.h" +#include "Document.h" #include "KURL.h" #include "PlatformString.h" #if QT_VERSION >= 0x040400 -#include "Document.h" #include "qwebpage.h" #include "qwebframe.h" #include "FrameLoaderClientQt.h" @@ -61,10 +61,10 @@ static QNetworkCookieJar *cookieJar(const Document *document) } #endif -void setCookies(Document* document, const KURL& url, const KURL& policyURL, const String& value) +void setCookies(Document* document, const KURL& url, const String& value) { QUrl u(url); - QUrl p(policyURL); + QUrl p(document->firstPartyForCookies()); #if QT_VERSION >= 0x040400 QNetworkCookieJar* jar = cookieJar(document); if (!jar) |