Remove EventSender from HTMLLinkElement

third_party/WebKit/Source/core/html/HTMLLinkElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 15 matching lines @@
 
 #include "bindings/core/v8/ScriptEventListener.h"
 #include "core/HTMLNames.h"
 #include "core/css/MediaList.h"
 #include "core/css/MediaQueryEvaluator.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/dom/StyleEngine.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
-#include "core/events/EventSender.h"
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/SubresourceIntegrity.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/CrossOriginAttribute.h"
 #include "core/html/LinkManifest.h"
 #include "core/html/imports/LinkImport.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/NetworkHintsInterface.h"
 #include "core/origin_trials/OriginTrials.h"
 #include "core/style/StyleInheritedData.h"
 #include "platform/ContentType.h"
 #include "platform/Histogram.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/WebIconSizesParser.h"
 #include "public/platform/WebSize.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-static LinkEventSender& linkLoadEventSender()
-{
-    DEFINE_STATIC_LOCAL(LinkEventSender, sharedLoadEventSender, (LinkEventSender::create(EventTypeNames::load)));
-    return sharedLoadEventSender;
-}
-
 static bool styleSheetTypeIsSupported(const String& type)
 {
     String trimmedType = ContentType(type).type();
     return trimmedType.isEmpty() || MIMETypeRegistry::isSupportedStyleSheetMIMEType(trimmedType);
 }
 
 inline HTMLLinkElement::HTMLLinkElement(Document& document, bool createdByParser)
     : HTMLElement(linkTag, document)
     , m_linkLoader(LinkLoader::create(this))
     , m_sizes(DOMTokenList::create(this))
@@ skipping 218 matching lines @@
     DCHECK(linkStyle());
     return linkStyle()->sheetLoaded();
 }
 
 void HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources(LoadedSheetErrorStatus errorStatus)
 {
     DCHECK(linkStyle());
     linkStyle()->notifyLoadedSheetAndAllCriticalSubresources(errorStatus);
 }
 
-void HTMLLinkElement::dispatchPendingLoadEvents()
+void HTMLLinkElement::dispatchPendingEvent(std::unique_ptr<IncrementLoadEventDelayCount>)
 {
-    linkLoadEventSender().dispatchPendingEvents();
-}
-
-void HTMLLinkElement::dispatchPendingEvent(LinkEventSender* eventSender)
-{
-    DCHECK_EQ(eventSender, &linkLoadEventSender());
     DCHECK(m_link);
     if (m_link->hasLoaded())
         linkLoaded();
     else
         linkLoadingErrored();
 }
 
 void HTMLLinkElement::scheduleEvent()
 {
-    linkLoadEventSender().dispatchEventSoon(this);
+    TaskRunnerHelper::getLoadingTaskRunner(&document())->postTask(BLINK_FROM_HERE, WTF::bind(&HTMLLinkElement::dispatchPendingEvent, wrapPersistent(this), passed(IncrementLoadEventDelayCount::create(document()))));

[haraken, 2016/09/01 17:48:37]

TaskRunnerHelper::getXXXTaskRunner has been deprecated (sorry I should have
removed them). Use TaskRunnerHelper::get().

Per the spec
(https://html.spec.whatwg.org/multipage/semantics.html#the-link-element), we
should use TaskType::DOMManipulation.

[hiroshige, 2016/09/02 10:11:26]

Thanks! Modified.

 }
 
 void HTMLLinkElement::startLoadingDynamicSheet()
 {
     DCHECK(linkStyle());
     linkStyle()->startLoadingDynamicSheet();
 }
 
 bool HTMLLinkElement::isURLAttribute(const Attribute& attribute) const
 {
@@ skipping 387 matching lines @@
 }
 
 DEFINE_TRACE(LinkStyle)
 {
     visitor->trace(m_sheet);
     LinkResource::trace(visitor);
     ResourceOwner<StyleSheetResource>::trace(visitor);
 }
 
 } // namespace blink