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

[dimich at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit dec022d3577a0be21022d8988df110393c063cae
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 03:06:21 2010 +0000

    Crash when iframe transfers from one page to another and has child frames.
    https://bugs.webkit.org/show_bug.cgi?id=50200
    
    Reviewed by David Levin.
    
    * page/Frame.cpp:
    (WebCore::Frame::transferChildFrameToNewDocument):
    avoid overriding 'didTransfer' which has the result of previous check.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 04181bc..46116ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-29  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by David Levin.
+
+        Crash when iframe transfers from one page to another and has child frames.
+        https://bugs.webkit.org/show_bug.cgi?id=50200
+
+        * page/Frame.cpp:
+        (WebCore::Frame::transferChildFrameToNewDocument):
+        avoid overriding 'didTransfer' which has the result of previous check.
+
 2010-11-19  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 5030c72..85523c6 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -734,7 +734,7 @@ void Frame::transferChildFrameToNewDocument()
     }
 
     // Update the frame tree.
-    didTransfer = newParent->tree()->transferChild(this);
+    didTransfer = newParent->tree()->transferChild(this) || didTransfer;
 
     // Avoid unnecessary calls to client and frame subtree if the frame ended
     // up on the same page and under the same parent frame.

-- 
WebKit Debian packaging