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

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

Issue 306133002: WebServiceWorkerProxy instances can be unwrapped to ServiceWorkers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Crib from WebNode: make m_private protected to avoid unused field warnings. Created 6 years, 7 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 | « Source/modules/serviceworkers/ServiceWorker.h ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/ServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp
index f3466226b62bada0059713d99cb9c44f1a36cd33..686bda0f9ab6e9330c62a375e6424cfef5447327 100644
--- a/Source/modules/serviceworkers/ServiceWorker.cpp
+++ b/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -137,11 +137,25 @@ const AtomicString& ServiceWorker::state() const
}
}
+PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptState* scriptState, WebType* worker)
+{
+ blink::WebServiceWorkerProxy* proxy = worker->proxy();
+ ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0;
+ if (existingServiceWorker) {
+ ASSERT(existingServiceWorker->executionContext() == scriptState->executionContext());
+ return existingServiceWorker;
+ }
+
+ return create(scriptState->executionContext(), adoptPtr(worker));
+}
+
PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext* resolver, WebType* worker)
{
+ RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState(), worker);
+
ScriptState::Scope scope(resolver->scriptState());
- RefPtr<ServiceWorker> serviceWorker = create(resolver->scriptState()->executionContext(), adoptPtr(worker));
serviceWorker->waitOnPromise(resolver->promise());
+
return serviceWorker;
}
@@ -169,6 +183,7 @@ PassRefPtr<ServiceWorker> ServiceWorker::create(ExecutionContext* executionConte
ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<blink::WebServiceWorker> worker)
: AbstractWorker(executionContext)
+ , WebServiceWorkerProxy(this)
, m_outerWorker(worker)
, m_isPromisePending(false)
{
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorker.h ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698