Merge 77355 - 2011-02-01 Mihai Parparita <mihaip@chromium.org>...

Source/WebCore/dom/EventQueue.cpp

 /*
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
  */
 
 #include "config.h"
 #include "EventQueue.h"
 
 #include "DOMWindow.h"
-#include "Document.h"
 #include "Event.h"
 #include "EventNames.h"
+#include "ScriptExecutionContext.h"
+#include "SuspendableTimer.h"
 
 namespace WebCore {
 
-EventQueue::EventQueue()
-    : m_pendingEventTimer(this, &EventQueue::pendingEventTimerFired)
+class EventQueueTimer : public SuspendableTimer {
+    WTF_MAKE_NONCOPYABLE(EventQueueTimer);
+public:
+    EventQueueTimer(EventQueue* eventQueue, ScriptExecutionContext* context)
+        : SuspendableTimer(context)
+        , m_eventQueue(eventQueue) { }
+
+private:
+    virtual void fired() { m_eventQueue->pendingEventTimerFired(); }
+    EventQueue* m_eventQueue;    
+};
+
+EventQueue::EventQueue(ScriptExecutionContext* context)
+    : m_pendingEventTimer(adoptPtr(new EventQueueTimer(this, context)))
+{
+}
+
+EventQueue::~EventQueue()
 {
 }
 
 void EventQueue::enqueueEvent(PassRefPtr<Event> event)
 {
     ASSERT(event->target()->toNode() || event->target()->toDOMWindow());
     m_queuedEvents.append(event);
     
-    if (!m_pendingEventTimer.isActive())
-        m_pendingEventTimer.startOneShot(0);
+    if (!m_pendingEventTimer->isActive())
+        m_pendingEventTimer->startOneShot(0);
 }
 
 void EventQueue::enqueueScrollEvent(PassRefPtr<Node> target, ScrollEventTargetType targetType)
 {
     if (!m_nodesWithQueuedScrollEvents.add(target.get()).second)
         return;
 
     // Per the W3C CSSOM View Module, scroll events fired at the document should bubble, others should not.
     bool canBubble = targetType == ScrollEventDocumentTarget;
     RefPtr<Event> scrollEvent = Event::create(eventNames().scrollEvent, canBubble, false /* non cancelleable */);
     scrollEvent->setTarget(target);
     enqueueEvent(scrollEvent.release());
 }
 
-void EventQueue::pendingEventTimerFired(Timer<EventQueue>*)
+void EventQueue::pendingEventTimerFired()
 {
-    ASSERT(!m_pendingEventTimer.isActive());
+    ASSERT(!m_pendingEventTimer->isActive());
 
     Vector<RefPtr<Event> > queuedEvents;
     queuedEvents.swap(m_queuedEvents);
     
     m_nodesWithQueuedScrollEvents.clear();
 
     for (size_t i = 0; i < queuedEvents.size(); i++)
         dispatchEvent(queuedEvents[i].release());
 }
 
 void EventQueue::dispatchEvent(PassRefPtr<Event> event)
 {
     EventTarget* eventTarget = event->target();
     if (eventTarget->toNode())
         eventTarget->dispatchEvent(event);
     else if (eventTarget->toDOMWindow())
         eventTarget->toDOMWindow()->dispatchEvent(event, 0);
     else
         ASSERT_NOT_REACHED();
 }
 
 }