Chromium Code Reviews| Index: third_party/WebKit/Source/core/html/HTMLLinkElement.cpp |
| diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp |
| index 28497acac361481243173c19b8c81a9b3edcfb91..13486a0133457b382f13901ef38608357c4c5726 100644 |
| --- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp |
| +++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp |
| @@ -33,8 +33,8 @@ |
| #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" |
| @@ -64,12 +64,6 @@ 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(); |
| @@ -308,14 +302,8 @@ void HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources(LoadedSheetErr |
| linkStyle()->notifyLoadedSheetAndAllCriticalSubresources(errorStatus); |
| } |
| -void HTMLLinkElement::dispatchPendingLoadEvents() |
| -{ |
| - linkLoadEventSender().dispatchPendingEvents(); |
| -} |
| - |
| -void HTMLLinkElement::dispatchPendingEvent(LinkEventSender* eventSender) |
| +void HTMLLinkElement::dispatchPendingEvent(std::unique_ptr<IncrementLoadEventDelayCount>) |
| { |
| - DCHECK_EQ(eventSender, &linkLoadEventSender()); |
| DCHECK(m_link); |
| if (m_link->hasLoaded()) |
| linkLoaded(); |
| @@ -325,7 +313,7 @@ void HTMLLinkElement::dispatchPendingEvent(LinkEventSender* eventSender) |
| 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 deprec
hiroshige
2016/09/02 10:11:26
Thanks! Modified.
|
| } |
| void HTMLLinkElement::startLoadingDynamicSheet() |