[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a47662d252d8d88f596262e35df4caac06179172
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 13:16:42 2010 +0000

    2010-09-14  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Andreas Kling.
    
            [Qt] Cookie operations should use NetworkingContext
            https://bugs.webkit.org/show_bug.cgi?id=45745
            No new functionality so no new tests.
    
            * platform/qt/CookieJarQt.cpp:
            (WebCore::cookieJar): Use the NetworkingContext for obtaining the QNetworkAccessManager
            instead of directly accessing the FrameLoaderClient.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9011972..9bb73c8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Cookie operations should use NetworkingContext
+        https://bugs.webkit.org/show_bug.cgi?id=45745
+        No new functionality so no new tests.
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::cookieJar): Use the NetworkingContext for obtaining the QNetworkAccessManager
+        instead of directly accessing the FrameLoaderClient.
+
 2010-09-14  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r67449.
diff --git a/WebCore/platform/qt/CookieJarQt.cpp b/WebCore/platform/qt/CookieJarQt.cpp
index 15053eb..4e1de23 100644
--- a/WebCore/platform/qt/CookieJarQt.cpp
+++ b/WebCore/platform/qt/CookieJarQt.cpp
@@ -31,6 +31,7 @@
 #include "Cookie.h"
 #include "Document.h"
 #include "KURL.h"
+#include "NetworkingContext.h"
 #include "PlatformString.h"
 
 #include "qwebpage.h"
@@ -51,9 +52,7 @@ static QNetworkCookieJar *cookieJar(const Document *document)
     FrameLoader *loader = frame->loader();
     if (!loader)
         return 0;
-    QWebFrame* webFrame = static_cast<FrameLoaderClientQt*>(loader->client())->webFrame();
-    QWebPage* page = webFrame->page();
-    QNetworkAccessManager* manager = page->networkAccessManager();
+    QNetworkAccessManager* manager = loader->networkingContext()->networkAccessManager();
     QNetworkCookieJar* jar = manager->cookieJar();
     return jar;
 }

-- 
WebKit Debian packaging