Merge 112623

Source/WebCore/dom/GenericEventQueue.cpp

 /*
  * Copyright (C) 2012 Victor Carbune (victor@rosedu.org)
  *
  * 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 13 matching lines @@
  */
 
 #include "config.h"
 
 #include "GenericEventQueue.h"
 
 #include "Event.h"
 
 namespace WebCore {
 
-GenericEventQueue::GenericEventQueue()
-    : m_timer(this, &GenericEventQueue::timerFired)
+PassOwnPtr<GenericEventQueue> GenericEventQueue::create(EventTarget* owner)
+{
+    return adoptPtr(new GenericEventQueue(owner));
+}
+
+GenericEventQueue::GenericEventQueue(EventTarget* owner)
+    : m_owner(owner)
+    , m_timer(this, &GenericEventQueue::timerFired)
     , m_isClosed(false)
 {
 }
 
 GenericEventQueue::~GenericEventQueue()
 {
 }
 
 bool GenericEventQueue::enqueueEvent(PassRefPtr<Event> event)
 {
     if (m_isClosed)
         return false;
 
     ASSERT(event->target());
+    if (event->target() == m_owner)
+        event->setTarget(0);
+
     m_pendingEvents.append(event);
 
     if (!m_timer.isActive())
         m_timer.startOneShot(0);
 
     return true;
 }
 
 bool GenericEventQueue::cancelEvent(Event* event)
 {
     bool found = m_pendingEvents.contains(event);
 
     if (found)
         m_pendingEvents.remove(m_pendingEvents.find(event));
 
     if (m_pendingEvents.isEmpty())
         m_timer.stop();
 
     return found;
 }
 
 void GenericEventQueue::timerFired(Timer<GenericEventQueue>*)
 {
     ASSERT(!m_timer.isActive());
     ASSERT(!m_pendingEvents.isEmpty());
 
     Vector<RefPtr<Event> > pendingEvents;
     m_pendingEvents.swap(pendingEvents);
 
-    for (unsigned i = 0; i < pendingEvents.size(); ++i)
-        pendingEvents[i]->target()->dispatchEvent(pendingEvents[i].release());
+    for (unsigned i = 0; i < pendingEvents.size(); ++i) {
+        EventTarget* target = pendingEvents[i]->target() ? pendingEvents[i]->target() : m_owner;
+        target->dispatchEvent(pendingEvents[i].release());
+    }
 }
 
 void GenericEventQueue::close()
 {
     m_isClosed = true;
 
     m_timer.stop();
     m_pendingEvents.clear();
 }
 
 void GenericEventQueue::cancelAllEvents()
 {
     m_timer.stop();
     m_pendingEvents.clear();
 }
 
 bool GenericEventQueue::hasPendingEvents() const
 {
     return m_pendingEvents.size();
 }
 
 }