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

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 38ea28c6bab1c3b64a4245be8e92d03486a4cc72
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 20:08:20 2010 +0000

    2010-11-19  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Antonio Gomes.
    
            Replace null checks of newParent in Frame::transferChildFrameToNewDocument() with ASSERT
            https://bugs.webkit.org/show_bug.cgi?id=49489
    
            Substitute ASSERT(newParent) for null-checks for newParent in
            Frame::transferChildFrameToNewDocument() since newParent is
            never null.
    
            When Frame::transferChildFrameToNewDocument() is called the child
            frame's owner element has already been transferred to the new
            document D and D is attached (i.e. has a frame).
    
            * page/Frame.cpp:
            (WebCore::Frame::transferChildFrameToNewDocument):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72423 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0dc7e6e..9f79db7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-19  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Antonio Gomes.
+
+        Replace null checks of newParent in Frame::transferChildFrameToNewDocument() with ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=49489
+
+        Substitute ASSERT(newParent) for null-checks for newParent in
+        Frame::transferChildFrameToNewDocument() since newParent is
+        never null.
+
+        When Frame::transferChildFrameToNewDocument() is called the child
+        frame's owner element has already been transferred to the new
+        document D and D is attached (i.e. has a frame).
+
+        * page/Frame.cpp:
+        (WebCore::Frame::transferChildFrameToNewDocument):
+
 2010-11-19  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 970078e..5030c72 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -711,10 +711,11 @@ void Frame::transferChildFrameToNewDocument()
 {
     ASSERT(m_ownerElement);
     Frame* newParent = m_ownerElement->document()->frame();
+    ASSERT(newParent);
     bool didTransfer = false;
 
     // Switch page.
-    Page* newPage = newParent ? newParent->page() : 0;
+    Page* newPage = newParent->page();
     Page* oldPage = m_page;
     if (m_page != newPage) {
         if (m_page) {
@@ -732,10 +733,8 @@ void Frame::transferChildFrameToNewDocument()
         didTransfer = true;
     }
 
-    if (newParent) {
-        // Update the frame tree.
-        didTransfer = newParent->tree()->transferChild(this);
-    }
+    // Update the frame tree.
+    didTransfer = newParent->tree()->transferChild(this);
 
     // 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