Chromium Code Reviews| Index: Source/modules/serviceworkers/ServiceWorkerRegistration.cpp |
| diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp |
| index f67669ca0e77c8ae39493c02ce92e7b2ea58dd8d..51fac02f7acc28b48a2512c29839871ad2f3f483 100644 |
| --- a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp |
| +++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp |
| @@ -37,6 +37,21 @@ private: |
| UndefinedValue(); |
| }; |
| +class BooleanValue { |
| +public: |
| + typedef bool WebType; |
| + static bool take(ScriptPromiseResolver* resolver, WebType* boolean) |
| + { |
| + return *boolean; |
| + } |
| + static void dispose(WebType* boolean) |
| + { |
| + } |
|
nhiroki
2014/08/29 07:17:53
ditto.
shimazu
2014/09/01 05:13:47
Done.
|
| + |
| +private: |
| + BooleanValue(); |
| +}; |
| + |
| static void deleteIfNoExistingOwner(WebServiceWorker* serviceWorker) |
| { |
| if (serviceWorker && !serviceWorker->proxy()) |
| @@ -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; |
| } |