Commit ae7b85a8 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot

Remove WorkerReportingProxy::DidInitializeWorkerContext()

ServiceWorkerGlobalScopeProxy was the only subclass that implemented
the method but after crrev.com/c/1786523 it became no-op.

This is a follow-up CL of crrev.com/c/1775856

Bug: N/A
Change-Id: Ic6a2780d135339432d131d73b275c1f94bb8a237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786892Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693620}
parent 4376b2a9
...@@ -68,12 +68,6 @@ class CORE_EXPORT WorkerReportingProxy { ...@@ -68,12 +68,6 @@ class CORE_EXPORT WorkerReportingProxy {
// WorkerThread::InitializeOnWorkerThread. // WorkerThread::InitializeOnWorkerThread.
virtual void DidCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) {} virtual void DidCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) {}
// Invoked when the WorkerGlobalScope is initialized on
// WorkerThread::InitializeOnWorkerThread. This is synchronously called after
// WillInitializeWorkerContext().
// TODO(bashi): Remove this.
virtual void DidInitializeWorkerContext() {}
// Invoked when the worker's main script is loaded on // Invoked when the worker's main script is loaded on
// WorkerThread::InitializeOnWorkerThread(). Only invoked when the script was // WorkerThread::InitializeOnWorkerThread(). Only invoked when the script was
// loaded on the worker thread, i.e., via InstalledScriptsManager rather than // loaded on the worker thread, i.e., via InstalledScriptsManager rather than
......
...@@ -568,7 +568,6 @@ void WorkerThread::InitializeOnWorkerThread( ...@@ -568,7 +568,6 @@ void WorkerThread::InitializeOnWorkerThread(
debugger->WorkerThreadCreated(this); debugger->WorkerThreadCreated(this);
GlobalScope()->ScriptController()->Initialize(url_for_debugger); GlobalScope()->ScriptController()->Initialize(url_for_debugger);
worker_reporting_proxy_.DidInitializeWorkerContext();
v8::HandleScope handle_scope(GetIsolate()); v8::HandleScope handle_scope(GetIsolate());
Platform::Current()->WorkerContextCreated( Platform::Current()->WorkerContextCreated(
GlobalScope()->ScriptController()->GetContext()); GlobalScope()->ScriptController()->GetContext());
......
...@@ -98,9 +98,6 @@ void CreateNestedWorkerThenTerminateParent( ...@@ -98,9 +98,6 @@ void CreateNestedWorkerThenTerminateParent(
EXPECT_CALL(*nested_worker_helper->reporting_proxy, EXPECT_CALL(*nested_worker_helper->reporting_proxy,
DidCreateWorkerGlobalScope(_)) DidCreateWorkerGlobalScope(_))
.Times(1); .Times(1);
EXPECT_CALL(*nested_worker_helper->reporting_proxy,
DidInitializeWorkerContext())
.Times(1);
EXPECT_CALL(*nested_worker_helper->reporting_proxy, EXPECT_CALL(*nested_worker_helper->reporting_proxy,
WillEvaluateClassicScriptMock(_, _)) WillEvaluateClassicScriptMock(_, _))
.Times(1); .Times(1);
...@@ -191,7 +188,6 @@ class WorkerThreadTest : public testing::Test { ...@@ -191,7 +188,6 @@ class WorkerThreadTest : public testing::Test {
protected: protected:
void ExpectReportingCalls() { void ExpectReportingCalls() {
EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1); EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1);
EXPECT_CALL(*reporting_proxy_, DidInitializeWorkerContext()).Times(1);
EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _)) EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _))
.Times(1); .Times(1);
EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(true)).Times(1); EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(true)).Times(1);
...@@ -201,8 +197,6 @@ class WorkerThreadTest : public testing::Test { ...@@ -201,8 +197,6 @@ class WorkerThreadTest : public testing::Test {
void ExpectReportingCallsForWorkerPossiblyTerminatedBeforeInitialization() { void ExpectReportingCallsForWorkerPossiblyTerminatedBeforeInitialization() {
EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1); EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1);
EXPECT_CALL(*reporting_proxy_, DidInitializeWorkerContext())
.Times(AtMost(1));
EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _)) EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _))
.Times(AtMost(1)); .Times(AtMost(1));
EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(_)) EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(_))
...@@ -214,7 +208,6 @@ class WorkerThreadTest : public testing::Test { ...@@ -214,7 +208,6 @@ class WorkerThreadTest : public testing::Test {
void ExpectReportingCallsForWorkerForciblyTerminated() { void ExpectReportingCallsForWorkerForciblyTerminated() {
EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1); EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1);
EXPECT_CALL(*reporting_proxy_, DidInitializeWorkerContext()).Times(1);
EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _)) EXPECT_CALL(*reporting_proxy_, WillEvaluateClassicScriptMock(_, _))
.Times(1); .Times(1);
EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(false)).Times(1); EXPECT_CALL(*reporting_proxy_, DidEvaluateClassicScript(false)).Times(1);
...@@ -380,7 +373,6 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunningOnInitialization) { ...@@ -380,7 +373,6 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunningOnInitialization) {
SetForcibleTerminationDelay(kDelay); SetForcibleTerminationDelay(kDelay);
EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1); EXPECT_CALL(*reporting_proxy_, DidCreateWorkerGlobalScope(_)).Times(1);
EXPECT_CALL(*reporting_proxy_, DidInitializeWorkerContext()).Times(1);
EXPECT_CALL(*reporting_proxy_, WillDestroyWorkerGlobalScope()).Times(1); EXPECT_CALL(*reporting_proxy_, WillDestroyWorkerGlobalScope()).Times(1);
EXPECT_CALL(*reporting_proxy_, DidTerminateWorkerThread()).Times(1); EXPECT_CALL(*reporting_proxy_, DidTerminateWorkerThread()).Times(1);
......
...@@ -173,7 +173,6 @@ class MockWorkerReportingProxy final : public WorkerReportingProxy { ...@@ -173,7 +173,6 @@ class MockWorkerReportingProxy final : public WorkerReportingProxy {
~MockWorkerReportingProxy() override = default; ~MockWorkerReportingProxy() override = default;
MOCK_METHOD1(DidCreateWorkerGlobalScope, void(WorkerOrWorkletGlobalScope*)); MOCK_METHOD1(DidCreateWorkerGlobalScope, void(WorkerOrWorkletGlobalScope*));
MOCK_METHOD0(DidInitializeWorkerContext, void());
MOCK_METHOD2(WillEvaluateClassicScriptMock, MOCK_METHOD2(WillEvaluateClassicScriptMock,
void(size_t scriptSize, size_t cachedMetadataSize)); void(size_t scriptSize, size_t cachedMetadataSize));
MOCK_METHOD1(DidEvaluateClassicScript, void(bool success)); MOCK_METHOD1(DidEvaluateClassicScript, void(bool success));
......
...@@ -160,10 +160,6 @@ void ServiceWorkerGlobalScopeProxy::DidCreateWorkerGlobalScope( ...@@ -160,10 +160,6 @@ void ServiceWorkerGlobalScopeProxy::DidCreateWorkerGlobalScope(
Client().WorkerContextStarted(this, std::move(worker_task_runner)); Client().WorkerContextStarted(this, std::move(worker_task_runner));
} }
void ServiceWorkerGlobalScopeProxy::DidInitializeWorkerContext() {
DCHECK_CALLED_ON_VALID_THREAD(worker_thread_checker_);
}
void ServiceWorkerGlobalScopeProxy::DidLoadClassicScript() { void ServiceWorkerGlobalScopeProxy::DidLoadClassicScript() {
DCHECK_CALLED_ON_VALID_THREAD(worker_thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(worker_thread_checker_);
Client().WorkerScriptLoadedOnWorkerThread(); Client().WorkerScriptLoadedOnWorkerThread();
......
...@@ -104,7 +104,6 @@ class ServiceWorkerGlobalScopeProxy final : public WebServiceWorkerContextProxy, ...@@ -104,7 +104,6 @@ class ServiceWorkerGlobalScopeProxy final : public WebServiceWorkerContextProxy,
SourceLocation*) override; SourceLocation*) override;
void WillInitializeWorkerContext() override; void WillInitializeWorkerContext() override;
void DidCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) override; void DidCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) override;
void DidInitializeWorkerContext() override;
void DidLoadClassicScript() override; void DidLoadClassicScript() override;
void DidFailToLoadClassicScript() override; void DidFailToLoadClassicScript() override;
void DidFetchScript() override; void DidFetchScript() override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment