Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Issue 2691333002: Replace [CallWith=ExecutionContext] with [CallWith=ScriptState] (Closed)
Patch Set: Created 3 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
Index: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
index ea09389dd824fe6804084a897e33bf4620136458..b3194623a417ce2f5edbc823c476a67b017a40b1 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
@@ -4,6 +4,7 @@
#include "modules/serviceworkers/NavigatorServiceWorker.h"
+#include "bindings/core/v8/ScriptState.h"
#include "core/dom/Document.h"
#include "core/frame/LocalDOMWindow.h"
#include "core/frame/LocalFrame.h"
@@ -51,9 +52,10 @@ const char* NavigatorServiceWorker::supplementName() {
}
ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
- ExecutionContext* executionContext,
+ ScriptState* scriptState,
Navigator& navigator,
ExceptionState& exceptionState) {
+ ExecutionContext* executionContext = scriptState->getExecutionContext();
DCHECK(!navigator.frame() ||
executionContext->getSecurityOrigin()->canAccessCheckSuborigins(
navigator.frame()->securityContext()->getSecurityOrigin()));
@@ -62,9 +64,10 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
}
ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
- ExecutionContext* executionContext,
+ ScriptState* scriptState,
Navigator& navigator,
String& errorMessage) {
+ ExecutionContext* executionContext = scriptState->getExecutionContext();
DCHECK(!navigator.frame() ||
executionContext->getSecurityOrigin()->canAccessCheckSuborigins(
navigator.frame()->securityContext()->getSecurityOrigin()));

Powered by Google App Engine
This is Rietveld 408576698