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

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

Issue 26004002: Decouple ScriptPromise creation from ScriptPromiseResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 7 years, 2 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/NavigatorServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
index 3eafb9b6144b8290eb7632968d8a0a7ce75dffe8..83984c9c591990cc8bb373afc6e61f21adbeea9b 100644
--- a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
@@ -119,9 +119,10 @@ ScriptPromise NavigatorServiceWorker::registerServiceWorker(ExecutionContext* ex
return ScriptPromise();
}
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
+ ScriptPromise promise = ScriptPromise::createPending(executionContext);
+ RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, executionContext);
ensureProvider()->registerServiceWorker(patternURL, scriptURL, new CallbackPromiseAdapter(resolver, executionContext));
- return resolver->promise();
+ return promise;
}
ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ExecutionContext* context, Navigator* navigator, const String& pattern, ExceptionState& es)
@@ -146,9 +147,10 @@ ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ExecutionContext*
return ScriptPromise();
}
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
+ ScriptPromise promise = ScriptPromise::createPending(executionContext);
+ RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, executionContext);
ensureProvider()->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter(resolver, executionContext));
- return resolver->promise();
+ return promise;
}
void NavigatorServiceWorker::willDetachGlobalObjectFromFrame()
« Source/bindings/v8/ScriptPromise.h ('K') | « Source/modules/imagebitmap/ImageBitmapFactories.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698