Changeset 75411 in webkit

Timestamp:

Jan 10, 2011 12:30:14 PM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-01-10 Benjamin Poulain <​benjamin.poulain@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.

• platform/qt/CookieJarQt.cpp: (WebCore::cookiesEnabled):

2011-01-10 Benjamin Poulain <​benjamin.poulain@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):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/qt/CookieJarQt.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-10  Benjamin Poulain  <benjamin.poulain@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.
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::cookiesEnabled):
+
 2011-01-10  W. James MacLean  <wjmaclean@chromium.org>
 

trunk/Source/WebCore/platform/qt/CookieJarQt.cpp

@@ -115 +115 @@
 bool cookiesEnabled(const Document* document)
 {
-    return !!networkAccessManager(document);
+    if (QNetworkAccessManager* manager = networkAccessManager(document))
+        return !!manager->cookieJar();
+
+    return false;
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2011-01-10  Benjamin Poulain  <benjamin.poulain@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-09  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -35 +35 @@
 #include <qgraphicsview.h>
 #include <qgraphicswebview.h>
+#include <qnetworkcookiejar.h>
 #include <qnetworkrequest.h>
 #include <qwebdatabase.h>
@@ -132 +133 @@
     void infiniteLoopJS();
     void networkAccessManagerOnDifferentThread();
+    void navigatorCookieEnabled();
 
 #ifdef Q_OS_MAC
@@ -2711 +2713 @@
 }
 
+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()