Revert of Make AbstractWorker a ContextLifecycleObserver rather than an ActiveDOMObject

third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.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 93 matching lines @@
     }
 }
 
 ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
 {
     return getOrCreate(executionContext, handle);
 }
 
 bool ServiceWorker::hasPendingActivity() const
 {
-    if (!executionContext())
+    if (AbstractWorker::hasPendingActivity())
+        return true;
+    if (m_wasStopped)
         return false;
     return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant;
 }
 
+void ServiceWorker::stop()
+{
+    m_wasStopped = true;
+}
+
 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
 {
     if (!handle)
         return nullptr;
 
     ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceWorker()->proxy());
     if (existingWorker) {
         ASSERT(existingWorker->executionContext() == executionContext);
         return existingWorker;
     }
 
-    return new ServiceWorker(executionContext, handle);
+    ServiceWorker* newWorker = new ServiceWorker(executionContext, handle);
+    newWorker->suspendIfNeeded();
+    return newWorker;
 }
 
 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle)
     : AbstractWorker(executionContext)
     , m_handle(handle)
+    , m_wasStopped(false)
 {
     ASSERT(m_handle);
     m_handle->serviceWorker()->setProxy(this);
 }
 
 ServiceWorker::~ServiceWorker()
 {
 }
 
 } // namespace blink