Use EventSender class in HTMLSourceElement

Source/core/html/HTMLSourceElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2010 Apple 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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 "core/html/HTMLSourceElement.h"
 
 #include "HTMLNames.h"
-#include "core/events/Event.h"
+#include "core/events/EventSender.h"
 #include "core/html/HTMLMediaElement.h"
 #include "platform/Logging.h"
 
 using namespace std;
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
+static SourceEventSender& sourceErrorEventSender()
+{
+    DEFINE_STATIC_LOCAL(SourceEventSender, sharedErrorEventSender, (EventTypeNames::error));
+    return sharedErrorEventSender;
+}
+
 inline HTMLSourceElement::HTMLSourceElement(Document& document)
     : HTMLElement(sourceTag, document)
-    , m_errorEventTimer(this, &HTMLSourceElement::errorEventTimerFired)
 {
     WTF_LOG(Media, "HTMLSourceElement::HTMLSourceElement - %p", this);
     ScriptWrappable::init(this);
 }
 
 PassRefPtr<HTMLSourceElement> HTMLSourceElement::create(Document& document)
 {
     return adoptRef(new HTMLSourceElement(document));
 }
 
+HTMLSourceElement::~HTMLSourceElement()
+{
+    sourceErrorEventSender().cancelEvent(this);
+}
+
 Node::InsertionNotificationRequest HTMLSourceElement::insertedInto(ContainerNode* insertionPoint)
 {
     HTMLElement::insertedInto(insertionPoint);
     Element* parent = parentElement();
     if (isHTMLMediaElement(parent))
         toHTMLMediaElement(parent)->sourceWasAdded(this);
     return InsertionDone;
 }
 
 void HTMLSourceElement::removedFrom(ContainerNode* removalRoot)
@@ skipping 17 matching lines @@
 }
 
 void HTMLSourceElement::setType(const AtomicString& type)
 {
     setAttribute(typeAttr, type);
 }
 
 void HTMLSourceElement::scheduleErrorEvent()
 {
     WTF_LOG(Media, "HTMLSourceElement::scheduleErrorEvent - %p", this);
-    if (m_errorEventTimer.isActive())
-        return;
-
-    m_errorEventTimer.startOneShot(0, FROM_HERE);
+    sourceErrorEventSender().dispatchEventSoon(this);
 }
 
 void HTMLSourceElement::cancelPendingErrorEvent()
 {
     WTF_LOG(Media, "HTMLSourceElement::cancelPendingErrorEvent - %p", this);
-    m_errorEventTimer.stop();
+    sourceErrorEventSender().cancelEvent(this);
 }
 
-void HTMLSourceElement::errorEventTimerFired(Timer<HTMLSourceElement>*)
+void HTMLSourceElement::dispatchPendingEvent(SourceEventSender* eventSender)
 {
-    WTF_LOG(Media, "HTMLSourceElement::errorEventTimerFired - %p", this);
+    ASSERT_UNUSED(eventSender, eventSender == &sourceErrorEventSender());
+    WTF_LOG(Media, "HTMLSourceElement::dispatchPendingEvent - %p", this);

[esprehn, 2014/04/24 20:49:56]

All these logs seem kind of silly.

     dispatchEvent(Event::createCancelable(EventTypeNames::error));
 }
 
 bool HTMLSourceElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name() == srcAttr || HTMLElement::isURLAttribute(attribute);
 }
 
 }