Remove ContextLifecycleObserver from NavigatorServiceWorker

third_party/WebKit/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 27 matching lines @@
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/MessagePort.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "modules/EventTargetModules.h"
+#include "modules/serviceworkers/NavigatorServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerMessageEvent.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorker.h"
@@ skipping 58 matching lines @@
           m_ready->getExecutionContext(), WTF::wrapUnique(handle.release())));
     }
   }
 
  private:
   Persistent<ReadyProperty> m_ready;
   WTF_MAKE_NONCOPYABLE(GetRegistrationForReadyCallback);
 };
 
 ServiceWorkerContainer* ServiceWorkerContainer::create(
-    ExecutionContext* executionContext) {
-  return new ServiceWorkerContainer(executionContext);
+    ExecutionContext* executionContext,
+    NavigatorServiceWorker* navigator) {
+  return new ServiceWorkerContainer(executionContext, navigator);
 }
 
 ServiceWorkerContainer::~ServiceWorkerContainer() {
   ASSERT(!m_provider);
 }
 
 void ServiceWorkerContainer::contextDestroyed() {
   if (m_provider) {
     m_provider->setClient(0);
     m_provider = nullptr;
   }
+  if (m_navigator)

[Wez, 2016/12/15 17:57:43]

Why check m_navigator here? It doesn't look like it is valid for it to be
nullptr.

[haraken, 2016/12/16 01:08:31]

It happens only in testing. I can pass in a dummy Navigator if you prefer it.

[Wez, 2016/12/16 01:28:35]

That would be my suggestion, since it leads to a simpler API contract (passing a
null Navigator is definitely an error), but this was a drive-by comment so feeel
free to ignore. :)

+    m_navigator->clearServiceWorker();
 }
 
 DEFINE_TRACE(ServiceWorkerContainer) {
   visitor->trace(m_controller);
   visitor->trace(m_ready);
+  visitor->trace(m_navigator);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 void ServiceWorkerContainer::registerServiceWorkerImpl(
     ExecutionContext* executionContext,
     const KURL& rawScriptURL,
     const KURL& scope,
     std::unique_ptr<RegistrationCallbacks> callbacks) {
   if (!m_provider) {
@@ skipping 298 matching lines @@
   dispatchEvent(ServiceWorkerMessageEvent::create(
       ports, value, source,
       getExecutionContext()->getSecurityOrigin()->toString()));
 }
 
 const AtomicString& ServiceWorkerContainer::interfaceName() const {
   return EventTargetNames::ServiceWorkerContainer;
 }
 
 ServiceWorkerContainer::ServiceWorkerContainer(
-    ExecutionContext* executionContext)
-    : ContextLifecycleObserver(executionContext), m_provider(0) {
+    ExecutionContext* executionContext,
+    NavigatorServiceWorker* navigator)
+    : ContextLifecycleObserver(executionContext),
+      m_provider(0),
+      m_navigator(navigator) {
   if (!executionContext)
     return;
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::from(executionContext)) {
     m_provider = client->provider();
     if (m_provider)
       m_provider->setClient(this);
   }
 }
 
 }  // namespace blink