Remove ExecutionContext::activeDOMObjectsAreStopped()

third_party/WebKit/Source/modules/cachestorage/CacheStorage.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/cachestorage/CacheStorage.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 34 matching lines @@
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::Callbacks final
     : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
   WTF_MAKE_NONCOPYABLE(Callbacks);
 
  public:
   explicit Callbacks(ScriptPromiseResolver* resolver) : m_resolver(resolver) {}
   ~Callbacks() override {}
 
   void onSuccess() override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     m_resolver->resolve(true);
     m_resolver.clear();
   }
 
   void onError(WebServiceWorkerCacheError reason) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     if (reason == WebServiceWorkerCacheErrorNotFound)
       m_resolver->resolve(false);
     else
       m_resolver->reject(CacheStorageError::createException(reason));
     m_resolver.clear();
   }
 
  private:
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::WithCacheCallbacks final
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
   WTF_MAKE_NONCOPYABLE(WithCacheCallbacks);
 
  public:
   WithCacheCallbacks(const String& cacheName,
                      CacheStorage* cacheStorage,
                      ScriptPromiseResolver* resolver)
       : m_cacheName(cacheName),
         m_cacheStorage(cacheStorage),
         m_resolver(resolver) {}
   ~WithCacheCallbacks() override {}
 
   void onSuccess(std::unique_ptr<WebServiceWorkerCache> webCache) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher,
                                  wrapUnique(webCache.release()));
     m_resolver->resolve(cache);
     m_resolver.clear();
   }
 
   void onError(WebServiceWorkerCacheError reason) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     if (reason == WebServiceWorkerCacheErrorNotFound)
       m_resolver->resolve();
     else
       m_resolver->reject(CacheStorageError::createException(reason));
     m_resolver.clear();
   }
 
  private:
   String m_cacheName;
   Persistent<CacheStorage> m_cacheStorage;
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::MatchCallbacks
     : public WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks {
   WTF_MAKE_NONCOPYABLE(MatchCallbacks);
 
  public:
   explicit MatchCallbacks(ScriptPromiseResolver* resolver)
       : m_resolver(resolver) {}
 
   void onSuccess(const WebServiceWorkerResponse& webResponse) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     ScriptState::Scope scope(m_resolver->getScriptState());
     m_resolver->resolve(
         Response::create(m_resolver->getScriptState(), webResponse));
     m_resolver.clear();
   }
 
   void onError(WebServiceWorkerCacheError reason) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     if (reason == WebServiceWorkerCacheErrorNotFound ||
         reason == WebServiceWorkerCacheErrorCacheNameNotFound)
       m_resolver->resolve();
     else
       m_resolver->reject(CacheStorageError::createException(reason));
     m_resolver.clear();
   }
 
  private:
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::DeleteCallbacks final
     : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
   WTF_MAKE_NONCOPYABLE(DeleteCallbacks);
 
  public:
   DeleteCallbacks(const String& cacheName,
                   CacheStorage* cacheStorage,
                   ScriptPromiseResolver* resolver)
       : m_cacheName(cacheName),
         m_cacheStorage(cacheStorage),
         m_resolver(resolver) {}
   ~DeleteCallbacks() override {}
 
   void onSuccess() override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     m_resolver->resolve(true);
     m_resolver.clear();
   }
 
   void onError(WebServiceWorkerCacheError reason) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     if (reason == WebServiceWorkerCacheErrorNotFound)
       m_resolver->resolve(false);
     else
       m_resolver->reject(CacheStorageError::createException(reason));
     m_resolver.clear();
   }
 
  private:
   String m_cacheName;
   Persistent<CacheStorage> m_cacheStorage;
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::KeysCallbacks final
     : public WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks {
   WTF_MAKE_NONCOPYABLE(KeysCallbacks);
 
  public:
   explicit KeysCallbacks(ScriptPromiseResolver* resolver)
       : m_resolver(resolver) {}
   ~KeysCallbacks() override {}
 
   void onSuccess(const WebVector<WebString>& keys) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     Vector<String> wtfKeys;
     for (size_t i = 0; i < keys.size(); ++i)
       wtfKeys.append(keys[i]);
     m_resolver->resolve(wtfKeys);
     m_resolver.clear();
   }
 
   void onError(WebServiceWorkerCacheError reason) override {
-    if (!m_resolver->getExecutionContext() ||
-        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+    if (!m_resolver->getExecutionContext())
       return;
     m_resolver->reject(CacheStorageError::createException(reason));
     m_resolver.clear();
   }
 
  private:
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 CacheStorage* CacheStorage::create(
@@ skipping 120 matching lines @@
 
 void CacheStorage::dispose() {
   m_webCacheStorage.reset();
 }
 
 DEFINE_TRACE(CacheStorage) {
   visitor->trace(m_scopedFetcher);
 }
 
 }  // namespace blink