ServiceWorker: register() should return the existing registration object if available

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"
@@ skipping 70 matching lines @@
         deleteIfNoExistingOwner(serviceWorker);
         return;
     }
     m_active = ServiceWorker::from(executionContext(), serviceWorker);
 }
 
 PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::take(ScriptPromiseResolver* resolver, WebType* registration)
 {
     if (!registration)
         return nullptr;
-    return create(resolver->scriptState()->executionContext(), adoptPtr(registration));
+    return getOrCreate(resolver->scriptState()->executionContext(), adoptPtr(registration));
 }
 
 void ServiceWorkerRegistration::dispose(WebType* registration)
 {
     delete registration;
 }
 
 String ServiceWorkerRegistration::scope() const
 {
     return m_outerRegistration->scope().string();
@@ skipping 14 matching lines @@
     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;
     }
 
     m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<UndefinedValue, ServiceWorkerError>(resolver));
     return promise;
 }
 
-PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::create(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
+PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
 {
+    if (!outerRegistration)
+        return nullptr;
+
+    WebServiceWorkerRegistrationProxy* proxy = outerRegistration->proxy();
+    if (proxy) {
+        ServiceWorkerRegistration* existingRegistration = *proxy;
+        if (existingRegistration) {
+            ASSERT(existingRegistration->executionContext() == executionContext);
+            return existingRegistration;
+        }
+    }
+
     RefPtrWillBeRawPtr<ServiceWorkerRegistration> registration = adoptRefWillBeRefCountedGarbageCollected(new ServiceWorkerRegistration(executionContext, outerRegistration));
     registration->suspendIfNeeded();
     return registration.release();
 }
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
     : ActiveDOMObject(executionContext)
+    , WebServiceWorkerRegistrationProxy(this)
     , m_outerRegistration(outerRegistration)
     , m_provider(0)
 {
     ASSERT(m_outerRegistration);
     ScriptWrappable::init(this);
 
     if (!executionContext)
         return;
     if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext))
         m_provider = client->provider();
     m_outerRegistration->setProxy(this);
 }
 
 void ServiceWorkerRegistration::trace(Visitor* visitor)
 {
     visitor->trace(m_installing);
     visitor->trace(m_waiting);
     visitor->trace(m_active);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink