Changeset 436 for trunk/WebCore/page/Frame.cpp

Timestamp:

08/13/08 13:49:09 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35706

Files:

• trunk/WebCore/page/Frame.cpp (modified) (1 diff)

trunk/WebCore/page/Frame.cpp

@@ -129 +129 @@
-    else {
-        page->incrementFrameCount();
+        // Make sure we will not end up with two frames referencing the same owner element.
+        ASSERT((!(ownerElement->m_contentFrame)) || (ownerElement->m_contentFrame->ownerElement() != ownerElement));        
-        ownerElement->m_contentFrame = this;
-    }