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 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-23  Sam Weinig  <sam@webkit.org>
+
+        Fix incorrect assertion causing all pages with subframes to crash.
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::appendChild):
+
 2010-12-23  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 23dc740..d3a36f9 100644 (file)
--- 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