Changeset 20355 in webkit

Timestamp:

Mar 20, 2007 6:24:02 PM (17 years ago)

Author:

aroben

Message:

Rubberstamped by Adele.

Roll out r20348 because it was causing crashes.

• page/FrameView.cpp: (WebCore::FrameViewPrivate::FrameViewPrivate): (WebCore::FrameView::layout): (WebCore::FrameView::scheduleEvent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-20  Adam Roben  <aroben@apple.com>
+
+        Rubberstamped by Adele.
+
+        Roll out r20348 because it was causing crashes.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::FrameViewPrivate):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::scheduleEvent):
+
 2007-03-20  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -56 +56 @@
         : layoutTimer(view, &FrameView::layoutTimerFired)
         , m_mediaType("screen")
+        , m_enqueueEvents(0)
         , m_overflowStatusDirty(true)
         , m_viewportRenderer(0)
@@ -108 +109 @@
     String m_mediaType;
     
+    unsigned m_enqueueEvents;
     Vector<ScheduledEvent*> m_scheduledEvents;
     
@@ -418 +420 @@
             root->recalcMinMaxWidths();
     }
+    d->m_enqueueEvents++;
     root->layout();
     d->layoutRoot = 0;
@@ -465 +468 @@
     // Dispatch events scheduled during layout
     dispatchScheduledEvents();
+    d->m_enqueueEvents--;
 }
 
@@ -737 +741 @@
 void FrameView::scheduleEvent(PassRefPtr<Event> event, PassRefPtr<EventTargetNode> eventTarget, bool tempEvent)
 {
+    if (!d->m_enqueueEvents) {
+        ExceptionCode ec = 0;
+        eventTarget->dispatchEvent(event, ec, tempEvent);
+        return;
+    }
+
     ScheduledEvent* scheduledEvent = new ScheduledEvent;
     scheduledEvent->m_event = event;