Changeset 65832 in webkit

Timestamp:

Aug 23, 2010 2:31:11 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Mihai Parparita <​mihaip@chromium.org>

Reviewed by David Hyatt.

Assertion failure in FrameView::layout when modifying the DOM during
pagehide with PageCache enabled
​https://bugs.webkit.org/show_bug.cgi?id=43152

Always unschedule any pending relayouts when changing the view, not just
when we're not using the page cache. Otherwise touching the DOM during
the pagehide handler can lead to layouts that will be done by the time
the view has changed, which triggers an assert.

• fast/loader/resources/unschedule-relayout-after-unload-target.html: Added.
• fast/loader/unschedule-relayout-after-unload-expected.txt: Added.
• fast/loader/unschedule-relayout-after-unload.html: Added.

2010-08-23 Mihai Parparita <​mihaip@chromium.org>

Reviewed by David Hyatt.

Assertion failure in FrameView::layout when modifying the DOM during
pagehide with PageCache enabled
​https://bugs.webkit.org/show_bug.cgi?id=43152

Always unschedule any pending relayouts when changing the view, not just
when we're not using the page cache. Otherwise touching the DOM during
the pagehide handler can lead to layouts that will be done by the time
the view has changed, which triggers an assert.

Test: fast/loader/unschedule-relayout-after-unload.html

• page/Frame.cpp: (WebCore::Frame::setView): move unscheduleRelayout outside page cache check.
• page/FrameView.cpp: (WebCore::FrameView::layout): remove early return now that assert should be correct (and the referenced rdar:// got fixed).

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html (added)
• LayoutTests/fast/loader/unschedule-relayout-after-unload-expected.txt (added)
• LayoutTests/fast/loader/unschedule-relayout-after-unload.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-23  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Assertion failure in FrameView::layout when modifying the DOM during
+        pagehide with PageCache enabled
+        https://bugs.webkit.org/show_bug.cgi?id=43152
+
+        Always unschedule any pending relayouts when changing the view, not just
+        when we're not using the page cache. Otherwise touching the DOM during
+        the pagehide handler can lead to layouts that will be done by the time
+        the view has changed, which triggers an assert.
+
+        * fast/loader/resources/unschedule-relayout-after-unload-target.html: Added.
+        * fast/loader/unschedule-relayout-after-unload-expected.txt: Added.
+        * fast/loader/unschedule-relayout-after-unload.html: Added.
+
 2010-08-20  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Assertion failure in FrameView::layout when modifying the DOM during
+        pagehide with PageCache enabled
+        https://bugs.webkit.org/show_bug.cgi?id=43152
+
+        Always unschedule any pending relayouts when changing the view, not just
+        when we're not using the page cache. Otherwise touching the DOM during
+        the pagehide handler can lead to layouts that will be done by the time
+        the view has changed, which triggers an assert.
+
+        Test: fast/loader/unschedule-relayout-after-unload.html
+
+        * page/Frame.cpp:
+        (WebCore::Frame::setView): move unscheduleRelayout outside page cache
+        check.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout): remove early return now that assert
+        should be correct (and the referenced rdar:// got fixed).
+
 2010-08-23  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/page/Frame.cpp

@@ -238 +238 @@
         // FIXME: We don't call willRemove here. Why is that OK?
         m_doc->detach();
-        if (m_view)
-            m_view->unscheduleRelayout();
-    }
+    }
+    
+    if (m_view)
+        m_view->unscheduleRelayout();
+    
     eventHandler()->clear();
 

trunk/WebCore/page/FrameView.cpp

@@ -634 +634 @@
 
     ASSERT(m_frame->view() == this);
-    // This early return should be removed when rdar://5598072 is resolved. In the meantime, there is a
-    // gigantic CrashTracer because of this issue, and the early return will hopefully cause graceful 
-    // failure instead.  
-    if (m_frame->view() != this)
-        return;
 
     Document* document = m_frame->document();