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

[diegohcg at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c6aaea8534d9aa9e03d34120acec0301283829b5
Author: diegohcg at webkit.org <diegohcg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 23:00:57 2010 +0000

    2010-09-06  Diego Gonzalez  <diegohcg at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Update NetworkAccessManager in Qt FrameNetworkingContext
            https://bugs.webkit.org/show_bug.cgi?id=45231
    
            Make possible to get the current QNAM when NetwokingContext request it.
    
            * WebCoreSupport/FrameNetworkingContextQt.cpp:
            (WebCore::FrameNetworkingContextQt::networkAccessManager):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 20f90e4..c44e532 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-06  Diego Gonzalez  <diegohcg at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Update NetworkAccessManager in Qt FrameNetworkingContext
+        https://bugs.webkit.org/show_bug.cgi?id=45231
+
+        Make possible to get the current QNAM when NetwokingContext request it.
+
+        * WebCoreSupport/FrameNetworkingContextQt.cpp:
+        (WebCore::FrameNetworkingContextQt::networkAccessManager):
+
 2010-09-06  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
index e502e2a..b3b0f00 100644
--- a/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
@@ -23,6 +23,8 @@
 
 #include <QNetworkAccessManager>
 #include <QObject>
+#include <QWebFrame>
+#include <QWebPage>
 
 namespace WebCore {
 
@@ -45,7 +47,7 @@ QObject* FrameNetworkingContextQt::originatingObject() const
 
 QNetworkAccessManager* FrameNetworkingContextQt::networkAccessManager() const
 {
-    return m_networkAccessManager;
+    return (qobject_cast<QWebFrame*>(m_originatingObject))->page()->networkAccessManager();
 }
 
 }

-- 
WebKit Debian packaging