third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp - Issue 1728803002: Rename WorkerThread to WorkerScript

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/loader/WorkerThreadableLoader.cpp

Issue 1728803002: Rename WorkerThread to WorkerScript Base URL: https://chromium.googlesource.com/chromium/src.git@workerscript-controller

Patch Set: Created 4 years, 10 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

« third_party/WebKit/Source/core/inspector/WorkerThreadDebugger.h ('K') | « third_party/WebKit/Source/core/loader/ThreadableLoader.cpp ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | third_party/WebKit/Source/core/workers/WorkerScript.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp

index e109d21b7f41e65815d24e7e0567b1e02840708d..128c5092e5921e9e41e69f06aed3373b5fc5921d 100644

--- a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp

@@ -36,7 +36,7 @@

#include "core/timing/WorkerGlobalScopePerformance.h"

#include "core/workers/WorkerGlobalScope.h"

#include "core/workers/WorkerLoaderProxy.h"

-#include "core/workers/WorkerThread.h"

+#include "core/workers/WorkerScript.h"

#include "platform/ThreadSafeFunctional.h"

#include "platform/WaitableEvent.h"

#include "platform/heap/SafePoint.h"

@@ -268,7 +268,7 @@ WorkerThreadableLoader::MainThreadAsyncBridge::MainThreadAsyncBridge(

PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,

const ThreadableLoaderOptions& options,

const ResourceLoaderOptions& resourceLoaderOptions)

- : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())

+ : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.workerScript()->workerLoaderProxy())

{

createLoaderInMainThread(options, resourceLoaderOptions);

}

@@ -297,7 +297,7 @@ WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge(

PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,

const ThreadableLoaderOptions& options,

const ResourceLoaderOptions& resourceLoaderOptions)

- : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())

+ : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.workerScript()->workerLoaderProxy())

, m_done(false)

{

createLoaderInMainThread(options, resourceLoaderOptions);

@@ -305,7 +305,7 @@ WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge(

void WorkerThreadableLoader::MainThreadSyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope)

{

- WaitableEvent* shutdownEvent = workerGlobalScope.thread()->shutdownEvent();

+ WaitableEvent* shutdownEvent = workerGlobalScope.workerScript()->shutdownEvent();

m_loaderDoneEvent = adoptPtr(new WaitableEvent());

startInMainThread(request, workerGlobalScope);