ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (1/4)

Source/modules/serviceworkers/ServiceWorkerRegistration.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "ServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "modules/EventTargetModules.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "public/platform/WebServiceWorkerProvider.h"
 
 namespace blink {
 
 class UndefinedValue {

[horo, 2014/08/29 07:18:35]

I think the class definition of UndefinedValue and BooleanValue should be
wrapped in #ifdef.

[shimazu, 2014/09/01 05:13:47]

Done.

 public:
     typedef WebServiceWorkerRegistration WebType;
     static V8UndefinedType take(ScriptPromiseResolver* resolver, WebType* registration)
     {
         ASSERT(!registration); // Anything passed here will be leaked.
         return V8UndefinedType();
     }
     static void dispose(WebType* registration)
     {
         ASSERT(!registration); // Anything passed here will be leaked.
     }
 
 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())
         delete serviceWorker;
 }
 
 const AtomicString& ServiceWorkerRegistration::interfaceName() const
 {
     return EventTargetNames::ServiceWorkerRegistration;
 }
@@ skipping 58 matching lines @@
     }
 
     RefPtr<SecurityOrigin> documentOrigin = scriptState->executionContext()->securityOrigin();
     KURL scopeURL = scriptState->executionContext()->completeURL(scope());
     scopeURL.removeFragmentIdentifier();
     if (!scope().isEmpty() && !documentOrigin->canRequest(scopeURL)) {
         resolver->reject(DOMException::create(SecurityError, "Can only unregister for scopes in the document's origin."));
         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;
 }
 
 PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
 {
     if (!outerRegistration)
         return nullptr;
 
     WebServiceWorkerRegistrationProxy* proxy = outerRegistration->proxy();
     if (proxy) {
@@ skipping 41 matching lines @@
 
 void ServiceWorkerRegistration::stop()
 {
     if (m_stopped)
         return;
     m_stopped = true;
     m_outerRegistration->proxyStopped();
 }
 
 } // namespace blink