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

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f1d7e7ddc695acc7a7ce7d2cb56a723d70e87e26
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 6 00:42:21 2010 +0000

    2010-11-05  Jian Li  <jianli at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            Need to check if page is detached in Frame::transferChildFrameToNewDocument to avoid occasional crash
            https://bugs.webkit.org/show_bug.cgi?id=49116
    
            The fix is to add the check.
    
            * page/Frame.cpp:
            (WebCore::Frame::transferChildFrameToNewDocument):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb9b0f7..00c1501 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-05  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Need to check if page is detached in Frame::transferChildFrameToNewDocument to avoid occasional crash
+        https://bugs.webkit.org/show_bug.cgi?id=49116
+
+        The fix is to add the check.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::transferChildFrameToNewDocument):
+
 2010-11-04  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 7cc7469..9816662 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -716,11 +716,12 @@ void Frame::transferChildFrameToNewDocument()
     Page* newPage = newParent ? newParent->page() : 0;
     Page* oldPage = m_page;
     if (m_page != newPage) {
-        if (page()->focusController()->focusedFrame() == this)
-            page()->focusController()->setFocusedFrame(0);
+        if (m_page) {
+            if (m_page->focusController()->focusedFrame() == this)
+                m_page->focusController()->setFocusedFrame(0);
 
-        if (m_page)
-            m_page->decrementFrameCount();
+             m_page->decrementFrameCount();
+        }
 
         m_page = newPage;
 

-- 
WebKit Debian packaging