third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h - Issue 2116113002: [worklets] Make WorkerThread handle both Worker and Worklet global scopes.

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/workers/WorkerThreadTestHelper.h

Issue 2116113002: [worklets] Make WorkerThread handle both Worker and Worklet global scopes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. 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

« third_party/WebKit/Source/core/workers/WorkerReportingProxy.h ('K') | « third_party/WebKit/Source/core/workers/WorkerThread.cpp ('k') | third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

index 3b48da656fde80d1a204b0b0c60bb682260b3968..4073191ec134ab02f47c7074997ee484b61810b6 100644

--- a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

+++ b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

@@ -9,6 +9,7 @@

#include "core/inspector/ConsoleMessage.h"

#include "core/workers/WorkerBackingThread.h"

#include "core/workers/WorkerClients.h"

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

#include "core/workers/WorkerLoaderProxy.h"

#include "core/workers/WorkerReportingProxy.h"

#include "core/workers/WorkerThread.h"

@@ -62,7 +63,7 @@ public:

MOCK_METHOD1(reportConsoleMessage, void(ConsoleMessage*));

MOCK_METHOD1(postMessageToPageInspector, void(const String&));

MOCK_METHOD1(didEvaluateWorkerScript, void(bool success));

- MOCK_METHOD1(workerGlobalScopeStarted, void(WorkerGlobalScope*));

+ MOCK_METHOD1(workerGlobalScopeStarted, void(WorkerOrWorkletGlobalScope*));

MOCK_METHOD0(workerGlobalScopeClosed, void());

MOCK_METHOD0(workerThreadTerminated, void());

MOCK_METHOD0(willDestroyWorkerGlobalScope, void());

@@ -92,8 +93,9 @@ public:

~WorkerThreadForTest() override { }

WorkerBackingThread& workerBackingThread() override { return *m_workerBackingThread; }

+ ConsoleMessageStorage* consoleMessageStorage() final { return toWorkerGlobalScope(globalScope())->consoleMessageStorage(); }

- WorkerGlobalScope* createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData>) override;

+ WorkerOrWorkletGlobalScope* createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData>) override;

void waitUntilScriptLoaded()

{

@@ -171,7 +173,7 @@ private:

WorkerThreadForTest* m_thread;

};

-inline WorkerGlobalScope* WorkerThreadForTest::createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData> startupData)

+inline WorkerOrWorkletGlobalScope* WorkerThreadForTest::createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData> startupData)

{

return new FakeWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, this, std::move(startupData->m_starterOriginPrivilegeData), std::move(startupData->m_workerClients));

}