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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 537fecb3b4642a10f6a44ca60ddf42d8f64ddb23
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 18:30:20 2010 +0000

    2010-08-25  Leo Yang  <leo.yang at torchmobile.com.cn>
    
            Reviewed by Simon Hausmann.
    
            In FrameLoaderClientQt::createFrame we should call loadURLIntoChildFrame
            with parent frame's loader instead of child frame's loader.
            https://bugs.webkit.org/show_bug.cgi?id=43930
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::createFrame):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66030 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3d57a39..9969ebd 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-25  Leo Yang  <leo.yang at torchmobile.com.cn>
+
+        Reviewed by Simon Hausmann.
+
+        In FrameLoaderClientQt::createFrame we should call loadURLIntoChildFrame
+        with parent frame's loader instead of child frame's loader.
+        https://bugs.webkit.org/show_bug.cgi?id=43930
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createFrame):
+
 2010-08-25  Gabor Loki  <loki at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 69c6c24..59f6ac6 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1190,7 +1190,7 @@ PassRefPtr<Frame> FrameLoaderClientQt::createFrame(const KURL& url, const String
 
     // ### set override encoding if we have one
 
-    frameData.frame->loader()->loadURLIntoChildFrame(frameData.url, frameData.referrer, frameData.frame.get());
+    m_frame->loader()->loadURLIntoChildFrame(frameData.url, frameData.referrer, frameData.frame.get());
 
     // The frame's onload handler may have removed it from the document.
     if (!frameData.frame->tree()->parent())

-- 
WebKit Debian packaging