third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerLinkResource.cpp - Issue 2796653003: Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2)

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/ServiceWorkerLinkResource.cpp

Issue 2796653003: Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2) (Closed)

Patch Set: Rebase 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/ServiceWorkerContainerTest.cpp ('k') | third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bef1adc9711079d21cd39858a993765f97c7ca74..0ebdff0cf3f59d8ad9e65fdbf1686c9c4f44f6d6 100644

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

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

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

#include "bindings/core/v8/ExceptionState.h"

#include "bindings/core/v8/ScriptState.h"

+#include "bindings/core/v8/V8Binding.h"

#include "core/dom/Document.h"

#include "core/frame/DOMWindow.h"

#include "core/frame/LocalFrame.h"

@@ -82,7 +83,7 @@ void ServiceWorkerLinkResource::process() {

String errorMessage;

ServiceWorkerContainer* container = NavigatorServiceWorker::serviceWorker(

- ScriptState::forMainWorld(m_owner->document().frame()),

+ toScriptStateForMainWorld(m_owner->document().frame()),

*document.frame()->domWindow()->navigator(), errorMessage);

if (!container) {