third_party/WebKit/Source/core/dom/ScriptLoader.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/dom/ScriptLoader.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/dom/Document.cpp ('k') | third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp » ('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/dom/ScriptLoader.cpp

diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

index e63ea29dcc23656e3a09858b8302f45a2f43b89d..8f8b6174bfca9c544374003f42e4646086a72d63 100644

--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

@@ -50,6 +50,7 @@

#include "core/svg/SVGScriptElement.h"

#include "platform/MIMETypeRegistry.h"

#include "platform/weborigin/SecurityOrigin.h"

+#include "public/platform/WebFrameScheduler.h"

#include "wtf/StdLibExtras.h"

#include "wtf/text/StringBuilder.h"

#include "wtf/text/StringHash.h"

@@ -259,7 +260,7 @@ bool ScriptLoader::prepareScript(const TextPosition& scriptStartPosition, Legacy

if (frame) {

ScriptState* scriptState = ScriptState::forMainWorld(frame);

if (scriptState->contextIsValid())

- ScriptStreamer::startStreaming(m_pendingScript, PendingScript::Async, frame->settings(), scriptState);

+ ScriptStreamer::startStreaming(m_pendingScript, PendingScript::Async, frame->settings(), scriptState, frame->frameScheduler()->loadingTaskRunner());

}

contextDocument->scriptRunner()->queueScriptForExecution(this, ScriptRunner::ASYNC_EXECUTION);

// Note that watchForLoad can immediately call notifyFinished.