[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
benjamin.poulain at nokia.com
benjamin.poulain at nokia.com
Fri Jan 21 15:11:52 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 446efa15b4952454ec89d2d1bc28e89ed03846a9
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 9 01:30:26 2011 +0000
2011-01-08 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Navigator.cookiesEnabled return true for Qt even if there is no cookie jar
https://bugs.webkit.org/show_bug.cgi?id=52081
Test for the availability of cookie jar to return if cookies are enabled or not. The network access
manager always exist, not the cookie jar.
* platform/qt/CookieJarQt.cpp:
(WebCore::cookiesEnabled):
2011-01-08 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Navigator.cookiesEnabled return true for Qt even if there is no cookie jar
https://bugs.webkit.org/show_bug.cgi?id=52081
Add an autotest for checking the result of Navigator.cookiesEnabled depending
on the status of the cookie jar.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::navigatorCookieEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75337 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e409e3c..0d7e1e1 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-08 Benjamin Poulain <benjamin.poulain at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Navigator.cookiesEnabled return true for Qt even if there is no cookie jar
+ https://bugs.webkit.org/show_bug.cgi?id=52081
+
+ Test for the availability of cookie jar to return if cookies are enabled or not. The network access
+ manager always exist, not the cookie jar.
+
+ * platform/qt/CookieJarQt.cpp:
+ (WebCore::cookiesEnabled):
+
2011-01-08 Charlie Reis <creis at chromium.org>
Reviewed by Mihai Parparita.
diff --git a/Source/WebCore/platform/qt/CookieJarQt.cpp b/Source/WebCore/platform/qt/CookieJarQt.cpp
index 53e39b9..2479f55 100644
--- a/Source/WebCore/platform/qt/CookieJarQt.cpp
+++ b/Source/WebCore/platform/qt/CookieJarQt.cpp
@@ -114,7 +114,7 @@ String cookieRequestHeaderFieldValue(const Document* document, const KURL &url)
bool cookiesEnabled(const Document* document)
{
- return !!networkAccessManager(document);
+ return !!networkAccessManager(document)->cookieJar();
}
bool getRawCookies(const Document*, const KURL&, Vector<Cookie>& rawCookies)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d59d413..b8c2215 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-08 Benjamin Poulain <benjamin.poulain at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Navigator.cookiesEnabled return true for Qt even if there is no cookie jar
+ https://bugs.webkit.org/show_bug.cgi?id=52081
+
+ Add an autotest for checking the result of Navigator.cookiesEnabled depending
+ on the status of the cookie jar.
+
+ * tests/qwebpage/tst_qwebpage.cpp:
+ (tst_QWebPage::navigatorCookieEnabled):
+
2011-01-07 Adam Barth <abarth at webkit.org>
Rubber-stamped by Eric Seidel.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index b71f665..d4eed21 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -34,6 +34,7 @@
#include <qgraphicsscene.h>
#include <qgraphicsview.h>
#include <qgraphicswebview.h>
+#include <qnetworkcookiejar.h>
#include <qnetworkrequest.h>
#include <qwebdatabase.h>
#include <qwebelement.h>
@@ -131,6 +132,7 @@ private slots:
void supportedContentType();
void infiniteLoopJS();
void networkAccessManagerOnDifferentThread();
+ void navigatorCookieEnabled();
#ifdef Q_OS_MAC
void macCopyUnicodeToClipboard();
@@ -2710,6 +2712,17 @@ void tst_QWebPage::networkAccessManagerOnDifferentThread()
QCOMPARE(m_page->mainFrame()->childFrames()[0]->url(), QUrl("qrc:///resources/frame_a.html"));
}
+void tst_QWebPage::navigatorCookieEnabled()
+{
+ m_page->networkAccessManager()->setCookieJar(0);
+ QVERIFY(!m_page->networkAccessManager()->cookieJar());
+ QVERIFY(!m_page->mainFrame()->evaluateJavaScript("navigator.cookieEnabled").toBool());
+
+ m_page->networkAccessManager()->setCookieJar(new QNetworkCookieJar());
+ QVERIFY(m_page->networkAccessManager()->cookieJar());
+ QVERIFY(m_page->mainFrame()->evaluateJavaScript("navigator.cookieEnabled").toBool());
+}
+
#ifdef Q_OS_MAC
void tst_QWebPage::macCopyUnicodeToClipboard()
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list