ServiceWorker: Remove navigator.serviceWorker.{installing,waiting,active} (Blink)

Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 56 matching lines @@
 void ServiceWorkerContainer::willBeDetachedFromFrame()
 {
     if (m_provider) {
         m_provider->setClient(0);
         m_provider = nullptr;
     }
 }
 
 void ServiceWorkerContainer::trace(Visitor* visitor)
 {
-    visitor->trace(m_active);
     visitor->trace(m_controller);
-    visitor->trace(m_installing);
-    visitor->trace(m_waiting);
     visitor->trace(m_readyRegistration);
     visitor->trace(m_ready);
 }
 
 ScriptPromise ServiceWorkerContainer::registerServiceWorker(ScriptState* scriptState, const String& url, const Dictionary& dictionary)
 {
     RegistrationOptionList options(dictionary);
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
@@ skipping 102 matching lines @@
     if (serviceWorker && !serviceWorker->proxy())
         delete serviceWorker;
 }
 
 static void deleteIfNoExistingOwner(WebServiceWorkerRegistration* registration)
 {
     if (registration && !registration->proxy())
         delete registration;
 }
 
+void ServiceWorkerContainer::setController(WebServiceWorker* serviceWorker)

[tkent, 2014/09/05 07:43:53]

nit: please don't move unaffected code.  Reviewers need to check if the code is
changed.

+{
+    if (!executionContext()) {
+        deleteIfNoExistingOwner(serviceWorker);
+        return;
+    }
+    m_controller = ServiceWorker::from(executionContext(), serviceWorker);
+}
+
 void ServiceWorkerContainer::setReadyRegistration(WebServiceWorkerRegistration* registration)
 {
     if (!executionContext()) {
         deleteIfNoExistingOwner(registration);
         return;
     }
 
     ServiceWorkerRegistration* readyRegistration = ServiceWorkerRegistration::from(executionContext(), registration);
     ASSERT(readyRegistration->active());
 
     if (m_readyRegistration) {
         ASSERT(m_readyRegistration == readyRegistration);
         ASSERT(m_ready->state() == ReadyProperty::Resolved);
         return;
     }
 
     m_readyRegistration = readyRegistration;
     m_ready->resolve(readyRegistration);
 }
 
-void ServiceWorkerContainer::setActive(WebServiceWorker* serviceWorker)
-{
-    if (!executionContext()) {
-        deleteIfNoExistingOwner(serviceWorker);
-        return;
-    }
-    m_active = ServiceWorker::from(executionContext(), serviceWorker);
-}
-
-void ServiceWorkerContainer::setController(WebServiceWorker* serviceWorker)
-{
-    if (!executionContext()) {
-        deleteIfNoExistingOwner(serviceWorker);
-        return;
-    }
-    m_controller = ServiceWorker::from(executionContext(), serviceWorker);
-}
-
-void ServiceWorkerContainer::setInstalling(WebServiceWorker* serviceWorker)
-{
-    if (!executionContext()) {
-        deleteIfNoExistingOwner(serviceWorker);
-        return;
-    }
-    m_installing = ServiceWorker::from(executionContext(), serviceWorker);
-}
-
-void ServiceWorkerContainer::setWaiting(WebServiceWorker* serviceWorker)
-{
-    if (!executionContext()) {
-        deleteIfNoExistingOwner(serviceWorker);
-        return;
-    }
-    m_waiting = ServiceWorker::from(executionContext(), serviceWorker);
-}
-
 void ServiceWorkerContainer::dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray& webChannels)
 {
     if (!executionContext() || !executionContext()->executingWindow())
         return;
 
     OwnPtrWillBeRawPtr<MessagePortArray> ports = MessagePort::toMessagePortArray(executionContext(), webChannels);
     RefPtr<SerializedScriptValue> value = SerializedScriptValue::createFromWire(message);
     executionContext()->executingWindow()->dispatchEvent(MessageEvent::create(ports.release(), value));
 }
 
 ServiceWorkerContainer::ServiceWorkerContainer(ExecutionContext* executionContext)
     : ContextLifecycleObserver(executionContext)
     , m_provider(0)
 {
     ScriptWrappable::init(this);
 
     if (!executionContext)
         return;
 
     m_ready = createReadyProperty();
 
     if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
         m_provider = client->provider();
         if (m_provider)
             m_provider->setClient(this);
     }
 }
 
 } // namespace blink