Merge 113291

Source/WebCore/workers/WorkerEventQueue.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 40 matching lines @@
     close();
 }
 
 class WorkerEventQueue::EventDispatcherTask : public ScriptExecutionContext::Task {
 public:
     static PassOwnPtr<EventDispatcherTask> create(PassRefPtr<Event> event, WorkerEventQueue* eventQueue)
     {
         return adoptPtr(new EventDispatcherTask(event, eventQueue));
     }
 
+    virtual ~EventDispatcherTask()
+    {
+        if (m_event)
+            m_eventQueue->removeEvent(m_event.get());
+    }
+
     void dispatchEvent(ScriptExecutionContext*, PassRefPtr<Event> event)
     {
         event->target()->dispatchEvent(event);
     }
 
     virtual void performTask(ScriptExecutionContext* context)
     {
         if (m_isCancelled)
             return;
         m_eventQueue->removeEvent(m_event.get());
         dispatchEvent(context, m_event);
+        m_event.clear();
     }
 
     void cancel()
     {
         m_isCancelled = true;
         m_event.clear();
     }
 
 private:
     EventDispatcherTask(PassRefPtr<Event> event, WorkerEventQueue* eventQueue)
@@ skipping 38 matching lines @@
 {
     m_isClosed = true;
     for (EventTaskMap::iterator it = m_eventTaskMap.begin(); it != m_eventTaskMap.end(); ++it) {
         EventDispatcherTask* task = it->second;
         task->cancel();
     }
     m_eventTaskMap.clear();
 }
 
 }