third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp - Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5)

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/modules/serviceworkers/ServiceWorkerContainer.cpp

Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)

Patch Set: Revert Created 3 years, 8 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/modules/serviceworkers/ServiceWorkerClients.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

index 2b93e2c2d6c584cdc95deb5489edb7879591e0b7..87ceca0eaae9fe283357b4c7552698af58cc8fb1 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

@@ -279,7 +279,7 @@ ScriptPromise ServiceWorkerContainer::registerServiceWorker(

return promise;

}

- ExecutionContext* execution_context = ExecutionContext::From(script_state);

+ ExecutionContext* execution_context = script_state->GetExecutionContext();

// FIXME: May be null due to worker termination: http://crbug.com/413518.

if (!execution_context)

return ScriptPromise();

@@ -316,7 +316,7 @@ ScriptPromise ServiceWorkerContainer::getRegistration(

return promise;

}

- ExecutionContext* execution_context = ExecutionContext::From(script_state);

+ ExecutionContext* execution_context = script_state->GetExecutionContext();

// FIXME: May be null due to worker termination: http://crbug.com/413518.

if (!execution_context)

return ScriptPromise();

@@ -373,7 +373,7 @@ ScriptPromise ServiceWorkerContainer::getRegistrations(

return promise;

}

- ExecutionContext* execution_context = ExecutionContext::From(script_state);

+ ExecutionContext* execution_context = script_state->GetExecutionContext();

RefPtr<SecurityOrigin> document_origin =

execution_context->GetSecurityOrigin();

String error_message;