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

Unified Diff: Source/modules/serviceworkers/ServiceWorker.cpp

Issue 313553002: Add the navigator.serviceWorker.waiting property. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Bring patch to head. Created 6 years, 6 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: Source/modules/serviceworkers/ServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp
index 686bda0f9ab6e9330c62a375e6424cfef5447327..5c4afb4342b5bf8c8813287eec98f6e63ccae863 100644
--- a/Source/modules/serviceworkers/ServiceWorker.cpp
+++ b/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -137,21 +137,21 @@ const AtomicString& ServiceWorker::state() const
}
}
-PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptState* scriptState, WebType* worker)
+PassRefPtr<ServiceWorker> ServiceWorker::from(ExecutionContext* executionContext, WebType* worker)
{
blink::WebServiceWorkerProxy* proxy = worker->proxy();
ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0;
if (existingServiceWorker) {
- ASSERT(existingServiceWorker->executionContext() == scriptState->executionContext());
+ ASSERT(existingServiceWorker->executionContext() == executionContext);
return existingServiceWorker;
}
- return create(scriptState->executionContext(), adoptPtr(worker));
+ return create(executionContext, adoptPtr(worker));
}
PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext* resolver, WebType* worker)
{
- RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState(), worker);
+ RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState()->executionContext(), worker);
ScriptState::Scope scope(resolver->scriptState());
serviceWorker->waitOnPromise(resolver->promise());
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorker.h ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698