Chromium Code Reviews| Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp |
| diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp |
| index f966de158b6a7b134acaf53c78bd0cc1b3b8990e..9bb62c1fe4d8d54d4c7f7de058d6b1dfd3a6ef24 100644 |
| --- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp |
| +++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp |
| @@ -141,6 +141,21 @@ private: |
| UndefinedValue(); |
| }; |
| +class BooleanValue { |
| +public: |
| + typedef bool WebType; |
| + static bool take(ScriptPromiseResolver* resolver, WebType* boolean) |
| + { |
| + return boolean; |
| + } |
| + static void dispose(WebType* boolean) |
| + { |
| + } |
| + |
| +private: |
| + BooleanValue(); |
| +}; |
| + |
| ScriptPromise ServiceWorkerContainer::unregisterServiceWorker(ScriptState* scriptState, const String& pattern) |
| { |
| ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled()); |
| @@ -167,8 +182,11 @@ ScriptPromise ServiceWorkerContainer::unregisterServiceWorker(ScriptState* scrip |
| resolver->reject(DOMException::create(SecurityError, "The scope must match the current origin.")); |
| return promise; |
| } |
| - |
| +#ifdef SERVICEWORKER_UNREGISTER_DISABLE_NEW_FEATURE |
|
nhiroki
2014/08/28 10:13:20
"NEW_FEATURE" would be ambiguous. How about "_UNRE
shimazu
2014/08/29 07:07:07
Done.
|
| m_provider->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter<UndefinedValue, ServiceWorkerError>(resolver)); |
| +#else |
| + m_provider->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver)); |
| +#endif |
| return promise; |
| } |