Index: third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp |
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp |
index 3d80848c512a4049eab467e75142ae88ca390b07..9dccbb459597b5c067df81c08797902d8d2e51b9 100644 |
--- a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp |
+++ b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp |
@@ -40,6 +40,7 @@ |
#include "core/html/parser/NestingLevelIncrementer.h" |
#include "platform/NotImplemented.h" |
#include "public/platform/Platform.h" |
+#include "public/platform/WebFrameScheduler.h" |
namespace blink { |
@@ -287,7 +288,7 @@ void HTMLScriptRunner::requestParsingBlockingScript(Element* element) |
if (m_document->frame()) { |
ScriptState* scriptState = ScriptState::forMainWorld(m_document->frame()); |
if (scriptState->contextIsValid()) |
- ScriptStreamer::startStreaming(m_parserBlockingScript, PendingScript::ParsingBlocking, m_document->frame()->settings(), scriptState); |
+ ScriptStreamer::startStreaming(m_parserBlockingScript, PendingScript::ParsingBlocking, m_document->frame()->settings(), scriptState, m_document->frame()->frameScheduler()->loadingTaskRunner()); |
Sami
2015/09/30 13:03:16
nit: use the new accessor here?
alex clarke (OOO till 29th)
2015/09/30 13:37:17
Done.
|
} |
m_parserBlockingScript.watchForLoad(this); |
@@ -303,7 +304,7 @@ void HTMLScriptRunner::requestDeferredScript(Element* element) |
if (m_document->frame() && !pendingScript.isReady()) { |
ScriptState* scriptState = ScriptState::forMainWorld(m_document->frame()); |
if (scriptState->contextIsValid()) |
- ScriptStreamer::startStreaming(pendingScript, PendingScript::Deferred, m_document->frame()->settings(), scriptState); |
+ ScriptStreamer::startStreaming(pendingScript, PendingScript::Deferred, m_document->frame()->settings(), scriptState, m_document->frame()->frameScheduler()->loadingTaskRunner()); |
Sami
2015/09/30 13:03:16
Ditto.
alex clarke (OOO till 29th)
2015/09/30 13:37:17
Done.
|
} |
ASSERT(pendingScript.resource()); |