Changeset 29002 in webkit

Timestamp:

Dec 27, 2007 12:54:03 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Eric Seidel.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16490 ASSERT in ~FrameView while viewing/reloading WICD test case

Test: fast/dynamic/paused-event-dispatch.html

• page/FrameView.cpp: (WebCore::FrameView::~FrameView): (WebCore::FrameView::layout): Changed to always pause event dispatch and always resume event dispatch, regardless of whether the post-layout task time is active. However, if it is active, assert that event dispatch is still paused.

LayoutTests:

Reviewed by Eric Seidel.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=16490 ASSERT in ~FrameView while viewing/reloading WICD test case

• fast/dynamic/paused-event-dispatch-expected.txt: Added.
• fast/dynamic/paused-event-dispatch.html: Added.
• fast/dynamic/resources/paused-event-dispatch-iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/paused-event-dispatch-expected.txt (added)
• LayoutTests/fast/dynamic/paused-event-dispatch.html (added)
• LayoutTests/fast/dynamic/resources/paused-event-dispatch-iframe.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-27  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=16490
+          ASSERT in ~FrameView while viewing/reloading WICD test case
+
+        * fast/dynamic/paused-event-dispatch-expected.txt: Added.
+        * fast/dynamic/paused-event-dispatch.html: Added.
+        * fast/dynamic/resources/paused-event-dispatch-iframe.html: Added.
+
 2007-12-27  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-27  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16490
+          ASSERT in ~FrameView while viewing/reloading WICD test case
+
+        Test: fast/dynamic/paused-event-dispatch.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::~FrameView):
+        (WebCore::FrameView::layout): Changed to always pause event dispatch and
+        always resume event dispatch, regardless of whether the post-layout
+        task time is active. However, if it is active, assert that event
+        dispatch is still paused.
+
 2007-12-27  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/page/FrameView.cpp

@@ -156 +156 @@
 
     ASSERT(m_refCount == 0);
-    ASSERT(d->m_scheduledEvents.isEmpty() && !d->m_enqueueEvents);
+    ASSERT(d->m_scheduledEvents.isEmpty());
+    ASSERT(!d->m_enqueueEvents);
 
     if (m_frame) {
@@ -445 +446 @@
     RenderLayer* layer = root->enclosingLayer();
 
-    if (!d->postLayoutTasksTimer.isActive())
-        pauseScheduledEvents();
+    pauseScheduledEvents();
 
     if (subtree)
@@ -505 +505 @@
             layout();
         }
+    } else {
+        resumeScheduledEvents();
+        ASSERT(d->m_enqueueEvents);
     }