diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/qt/CookieJarQt.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/qt/CookieJarQt.cpp')
| -rw-r--r-- | Source/WebCore/platform/qt/CookieJarQt.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebCore/platform/qt/CookieJarQt.cpp b/Source/WebCore/platform/qt/CookieJarQt.cpp index b7ff5d1..e5a2dcd 100644 --- a/Source/WebCore/platform/qt/CookieJarQt.cpp +++ b/Source/WebCore/platform/qt/CookieJarQt.cpp @@ -114,10 +114,12 @@ String cookieRequestHeaderFieldValue(const Document* document, const KURL &url) bool cookiesEnabled(const Document* document) { - if (QNetworkAccessManager* manager = networkAccessManager(document)) - return !!manager->cookieJar(); + QNetworkAccessManager* manager = networkAccessManager(document); + if (!manager) + return false; - return false; + QtNAMThreadSafeProxy managerProxy(manager); + return managerProxy.hasCookieJar(); } bool getRawCookies(const Document*, const KURL&, Vector<Cookie>& rawCookies) |