Reduce ActiveDOMObjects from core/

third_party/WebKit/Source/core/html/PublicURLManager.cpp

 /*
  * Copyright (C) 2012 Motorola Mobility Inc.
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 18 matching lines @@
 #include "core/fetch/MemoryCache.h"
 #include "core/html/URLRegistry.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 PassOwnPtrWillBeRawPtr<PublicURLManager> PublicURLManager::create(ExecutionContext* context)
 {
-    OwnPtrWillBeRawPtr<PublicURLManager> publicURLManager = adoptPtrWillBeNoop(new PublicURLManager(context));
-    publicURLManager->suspendIfNeeded();
-    return publicURLManager.release();
+    return adoptPtrWillBeNoop(new PublicURLManager(context));
 }
 
 PublicURLManager::PublicURLManager(ExecutionContext* context)
-    : ActiveDOMObject(context)
-    , m_isStopped(false)
+    : ContextLifecycleObserver(context)
 {
 }
 
 void PublicURLManager::registerURL(SecurityOrigin* origin, const KURL& url, URLRegistrable* registrable, const String& uuid)
 {
-    if (m_isStopped)
+    if (!executionContext())

[haraken, 2016/03/03 15:31:35]

Sigbjorn: Should we revert this CL for the same reason as 
https://codereview.chromium.org/1744973002/?

[sof, 2016/03/03 15:43:53]

Reinstating m_isStopped for PublicURLManager as a followup is perhaps better?
This CL is otherwise a worthy addition.

         return;
 
     RegistryURLMap::ValueType* found = m_registryToURL.add(&registrable->registry(), URLMap()).storedValue;
     found->key->registerURL(origin, url, registrable);
     found->value.add(url.string(), uuid);
 }
 
 void PublicURLManager::revoke(const KURL& url)
 {
     for (auto& registryUrl : m_registryToURL) {
@@ skipping 19 matching lines @@
                 registry->unregisterURL(url);
                 urlsToRemove.append(registeredUrl.key);
             }
         }
         for (unsigned j = 0; j < urlsToRemove.size(); j++)
             registeredURLs.remove(urlsToRemove[j]);
         urlsToRemove.clear();
     }
 }
 
-void PublicURLManager::stop()
+void PublicURLManager::contextDestroyed()
 {
-    if (m_isStopped)
+    if (!executionContext())
         return;
 
-    m_isStopped = true;
     for (auto& registryUrl : m_registryToURL) {
         for (auto& url : registryUrl.value)
             registryUrl.key->unregisterURL(KURL(ParsedURLString, url.key));
     }
 
     m_registryToURL.clear();
 }
 
 DEFINE_TRACE(PublicURLManager)
 {
-    ActiveDOMObject::trace(visitor);
+    ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink