[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

weinig at apple.com weinig at apple.com
Fri Jan 21 14:38:57 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 5190686d5752b157b70d2b7dbb4bbbd9f6a61b88
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 22:49:10 2010 +0000

    Fix incorrect assertion causing all pages with subframes to crash.
    
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::appendChild):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9e52b31..b2591ca 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-23  Sam Weinig  <sam at webkit.org>
+
+        Fix incorrect assertion causing all pages with subframes to crash.
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::appendChild):
+
 2010-12-23  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 23dc740..d3a36f9 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -189,11 +189,11 @@ void WebFrameProxy::appendChild(WebFrameProxy* child)
 
     child->m_parentFrame = this;
 
-    ASSERT(!m_lastChild->m_nextSibling);
     WebFrameProxy* oldLast = m_lastChild;
     m_lastChild = child;
 
     if (oldLast) {
+        ASSERT(!oldLast->m_nextSibling);
         child->m_previousSibling = oldLast;
         oldLast->m_nextSibling = child;
     } else

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list