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

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

Issue 515083002: ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (1/4) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporate the reviews in patch set 3, and rebase Created 6 years, 4 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/ServiceWorkerRegistration.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
index f67669ca0e77c8ae39493c02ce92e7b2ea58dd8d..05143bed93162240915e36493db5e78a3465c3dc 100644
--- a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
@@ -20,6 +20,7 @@
namespace blink {
+#ifdef DISABLE_SERVICEWORKER_UNREGISTER_RESOLVE_TO_BOOLEAN
class UndefinedValue {
public:
typedef WebServiceWorkerRegistration WebType;
@@ -36,6 +37,20 @@ public:
private:
UndefinedValue();
};
+#else
+class BooleanValue {
+public:
+ typedef bool WebType;
+ static bool take(ScriptPromiseResolver* resolver, WebType* boolean)
+ {
+ return *boolean;
+ }
+ static void dispose(WebType* boolean) { }
+
+private:
+ BooleanValue();
+};
+#endif
static void deleteIfNoExistingOwner(WebServiceWorker* serviceWorker)
{
@@ -115,7 +130,11 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
return promise;
}
+#ifdef DISABLE_SERVICEWORKER_UNREGISTER_RESOLVE_TO_BOOLEAN
m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<UndefinedValue, ServiceWorkerError>(resolver));
+#else
+ m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
+#endif
return promise;
}
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerContainer.cpp ('k') | public/platform/WebServiceWorkerProvider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698