[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 849f91fd348e03d65d1fbc1366583188562e5579
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 02:38:24 2011 +0000

    2011-01-09  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r75337.
            http://trac.webkit.org/changeset/75337
            https://bugs.webkit.org/show_bug.cgi?id=52137
    
            It made fast/dom/navigator-detached-no-crash.html crash
            (Requested by Ossy on #webkit).
    
            * platform/qt/CookieJarQt.cpp:
            (WebCore::cookiesEnabled):
    2011-01-09  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r75337.
            http://trac.webkit.org/changeset/75337
            https://bugs.webkit.org/show_bug.cgi?id=52137
    
            It made fast/dom/navigator-detached-no-crash.html crash
            (Requested by Ossy on #webkit).
    
            * tests/qwebpage/tst_qwebpage.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index dc3c0f8..cbfc839 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-09  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r75337.
+        http://trac.webkit.org/changeset/75337
+        https://bugs.webkit.org/show_bug.cgi?id=52137
+
+        It made fast/dom/navigator-detached-no-crash.html crash
+        (Requested by Ossy on #webkit).
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::cookiesEnabled):
+
 2011-01-09  Mark Rowe  <mrowe at apple.com>
 
         Fix the build.
diff --git a/Source/WebCore/platform/qt/CookieJarQt.cpp b/Source/WebCore/platform/qt/CookieJarQt.cpp
index 2479f55..53e39b9 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)->cookieJar();
+    return !!networkAccessManager(document);
 }
 
 bool getRawCookies(const Document*, const KURL&, Vector<Cookie>& rawCookies)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d4e1b8c..d28c394 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-09  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r75337.
+        http://trac.webkit.org/changeset/75337
+        https://bugs.webkit.org/show_bug.cgi?id=52137
+
+        It made fast/dom/navigator-detached-no-crash.html crash
+        (Requested by Ossy on #webkit).
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+
 2011-01-09  Xianzhu Wang <phnixwxz at gmail.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index d4eed21..b71f665 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -34,7 +34,6 @@
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 #include <qgraphicswebview.h>
-#include <qnetworkcookiejar.h>
 #include <qnetworkrequest.h>
 #include <qwebdatabase.h>
 #include <qwebelement.h>
@@ -132,7 +131,6 @@ private slots:
     void supportedContentType();
     void infiniteLoopJS();
     void networkAccessManagerOnDifferentThread();
-    void navigatorCookieEnabled();
 
 #ifdef Q_OS_MAC
     void macCopyUnicodeToClipboard();
@@ -2712,17 +2710,6 @@ 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