[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 51ff91cda5aa51253db204af106c7bef07b8d4bd
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 04:32:02 2010 +0000

    2010-11-07  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Adam Barth.
    
            Assert that a non-null PassRefPtr<Document> has a non-null frame in Frame::setDocument()
            https://bugs.webkit.org/show_bug.cgi?id=49152
    
            Add an ASSERT to ensure that a non-null Document has a non-null Frame
            in Frame::setDocument().
    
            Currently, whenever Frame::setDocument() is called with a non-null
            Document the Document has a non-null Frame. We should assert this
            invariant.
    
            * page/Frame.cpp:
            (WebCore::Frame::setDocument):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c28b06..4775b08 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-07  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Adam Barth.
+
+        Assert that a non-null PassRefPtr<Document> has a non-null frame in Frame::setDocument()
+        https://bugs.webkit.org/show_bug.cgi?id=49152
+
+        Add an ASSERT to ensure that a non-null Document has a non-null Frame
+        in Frame::setDocument().
+
+        Currently, whenever Frame::setDocument() is called with a non-null
+        Document the Document has a non-null Frame. We should assert this
+        invariant.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::setDocument):
+
 2010-11-07  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 9816662..867b68e 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -276,6 +276,7 @@ void Frame::setView(PassRefPtr<FrameView> view)
 
 void Frame::setDocument(PassRefPtr<Document> newDoc)
 {
+    ASSERT(!newDoc || newDoc->frame());
     if (m_doc && m_doc->attached() && !m_doc->inPageCache()) {
         // FIXME: We don't call willRemove here. Why is that OK?
         m_doc->detach();

-- 
WebKit Debian packaging