third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp - Issue 1366883002: [Reland] Post loading tasks on the appropriate WebFrameScheduler's queue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp

Issue 1366883002: [Reland] Post loading tasks on the appropriate WebFrameScheduler's queue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix UAF in BackgroundHTMLParser Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.cpp ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('j') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..35b125805a36d86cb15f679ac219c67f9e660a3f 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->loadingTaskRunner());

}

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->loadingTaskRunner());

}

ASSERT(pendingScript.resource());