Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

Issue 2163983004: Pass per-frame task runners to Workers (when possible) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 5 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/web/WebSharedWorkerImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
index 7141b9e1595e5dba575c9d0cfa3e47eb9ccfc144..37b71ddc14f637a45cd4bcaeb72427bf1d654673 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
@@ -39,6 +39,7 @@
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/FrameLoader.h"
#include "core/page/Page.h"
+#include "core/workers/ParentFrameTaskRunners.h"
#include "core/workers/SharedWorkerGlobalScope.h"
#include "core/workers/SharedWorkerThread.h"
#include "core/workers/WorkerClients.h"
@@ -271,6 +272,8 @@ void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread()
void WebSharedWorkerImpl::postTaskToLoader(std::unique_ptr<ExecutionContextTask> task)
{
+ // TODO(hiroshige,yuryu): Make this not use ExecutionContextTask and
+ // consider using m_mainThreadTaskRunners->getLoadingTaskRunner() instead.
m_mainFrame->frame()->document()->postTask(BLINK_FROM_HERE, std::move(task));
}
@@ -351,6 +354,13 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
m_mainScriptLoader->responseAddressSpace(),
m_mainScriptLoader->originTrialTokens(),
std::move(workerSettings));
+
+ // We have a dummy document here for loading but it doesn't really represent
+ // the document/frame of associated document(s) for this worker. Here we
+ // populate the task runners with null document not to confuse the frame
+ // scheduler (which will end up using the thread's default task runner).
+ m_mainThreadTaskRunners = ParentFrameTaskRunners::create(nullptr);
+
m_loaderProxy = WorkerLoaderProxy::create(this);
m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this);
InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script());
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698