ServiceWorker: Refer to the current provider in ServiceWorkerRegistration

third_party/WebKit/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 "modules/serviceworkers/ServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 53 matching lines @@
     return newRegistration;
 }
 
 String ServiceWorkerRegistration::scope() const
 {
     return m_handle->registration()->scope().string();
 }
 
 ScriptPromise ServiceWorkerRegistration::update(ScriptState* scriptState)
 {
+    ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(getExecutionContext());
+    if (!client || !client->provider())
+        return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Failed to update a ServiceWorkerRegistration: No associated provider is available."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
-
-    if (!m_provider) {
-        resolver->reject(DOMException::create(InvalidStateError, "Failed to update a ServiceWorkerRegistration: No associated provider is available."));
-        return promise;
-    }
-
-    m_handle->registration()->update(m_provider, new CallbackPromiseAdapter<void, ServiceWorkerError>(resolver));
+    m_handle->registration()->update(client->provider(), new CallbackPromiseAdapter<void, ServiceWorkerError>(resolver));
     return promise;
 }
 
 ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
 {
+    ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(getExecutionContext());
+    if (!client || !client->provider())
+        return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Failed to unregister a ServiceWorkerRegistration: No associated provider is available."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
-
-    if (!m_provider) {
-        resolver->reject(DOMException::create(InvalidStateError, "Failed to unregister a ServiceWorkerRegistration: No associated provider is available."));
-        return promise;
-    }
-
-    m_handle->registration()->unregister(m_provider, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
+    m_handle->registration()->unregister(client->provider(), new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
     return promise;
 }
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration::Handle> handle)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(executionContext)
     , m_handle(std::move(handle))
-    , m_provider(nullptr)
     , m_stopped(false)
 {
     ASSERT(m_handle);
     ASSERT(!m_handle->registration()->proxy());
     ThreadState::current()->registerPreFinalizer(this);
 
     if (!executionContext)
         return;
-    if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext))
-        m_provider = client->provider();
     m_handle->registration()->setProxy(this);
 }
 
 ServiceWorkerRegistration::~ServiceWorkerRegistration()
 {
 }
 
 void ServiceWorkerRegistration::dispose()
 {
     // Promptly clears a raw reference from content/ to an on-heap object
@@ skipping 18 matching lines @@
 
 void ServiceWorkerRegistration::stop()
 {
     if (m_stopped)
         return;
     m_stopped = true;
     m_handle->registration()->proxyStopped();
 }
 
 } // namespace blink