third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp - Issue 1402933002: Revert "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/HTMLDocumentParser.cpp

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge 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/HTMLDocumentParser.h ('k') | third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

index 80f5c230a6944b5491b1c1372e8246f6ea88a9bc..070fd43924a08a505c108ad8e510c3443f218e3c 100644

--- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

+++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

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

#include "platform/TraceEvent.h"

#include "platform/heap/Handle.h"

#include "public/platform/Platform.h"

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

#include "public/platform/WebScheduler.h"

#include "public/platform/WebThread.h"

#include "wtf/RefCounted.h"

@@ -144,8 +143,7 @@ HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors

, m_tokenizer(syncPolicy == ForceSynchronousParsing ? HTMLTokenizer::create(m_options) : nullptr)

, m_scriptRunner(HTMLScriptRunner::create(&document, this))

, m_treeBuilder(HTMLTreeBuilder::create(this, &document, parserContentPolicy(), reportErrors, m_options))

- , m_loadingTaskRunner(adoptPtr(document.loadingTaskRunner()->clone()))

- , m_parserScheduler(HTMLParserScheduler::create(this, m_loadingTaskRunner.get()))

+ , m_parserScheduler(HTMLParserScheduler::create(this))

, m_xssAuditorDelegate(&document)

, m_weakFactory(this)

, m_preloader(HTMLResourcePreloader::create(document))

@@ -168,7 +166,6 @@ HTMLDocumentParser::HTMLDocumentParser(DocumentFragment* fragment, Element* cont

, m_token(adoptPtr(new HTMLToken))

, m_tokenizer(HTMLTokenizer::create(m_options))

, m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, this->parserContentPolicy(), m_options))

- , m_loadingTaskRunner(adoptPtr(fragment->document().loadingTaskRunner()->clone()))

, m_xssAuditorDelegate(&fragment->document())

, m_weakFactory(this)

, m_shouldUseThreading(false)

@@ -804,7 +801,7 @@ void HTMLDocumentParser::startBackgroundParser()

ASSERT(config->xssAuditor->isSafeToSendToAnotherThread());

ASSERT(config->preloadScanner->isSafeToSendToAnotherThread());

HTMLParserThread::shared()->postTask(threadSafeBind(&BackgroundHTMLParser::start, reference.release(), config.release(),

- adoptPtr(m_loadingTaskRunner->clone())));

+ AllowCrossThreadAccess(Platform::current()->currentThread()->scheduler())));

}

void HTMLDocumentParser::stopBackgroundParser()