Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Unified Diff: third_party/WebKit/Source/modules/cachestorage/Cache.cpp

Issue 2433773006: Remove ExecutionContext::activeDOMObjectsAreStopped()
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/cachestorage/Cache.cpp
diff --git a/third_party/WebKit/Source/modules/cachestorage/Cache.cpp b/third_party/WebKit/Source/modules/cachestorage/Cache.cpp
index 20bdce75e123fcc76e4e992ea2bcf4c10d4f4f91..71e9b111e5ce29b14bff5fff6594b9ff0bd54e1a 100644
--- a/third_party/WebKit/Source/modules/cachestorage/Cache.cpp
+++ b/third_party/WebKit/Source/modules/cachestorage/Cache.cpp
@@ -37,8 +37,7 @@ class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks {
: 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(
@@ -47,8 +46,7 @@ class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks {
}
void onError(WebServiceWorkerCacheError reason) override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
if (reason == WebServiceWorkerCacheErrorNotFound)
m_resolver->resolve();
@@ -72,8 +70,7 @@ class CacheWithResponsesCallbacks
void onSuccess(
const WebVector<WebServiceWorkerResponse>& webResponses) override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
ScriptState::Scope scope(m_resolver->getScriptState());
HeapVector<Member<Response>> responses;
@@ -85,8 +82,7 @@ class CacheWithResponsesCallbacks
}
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();
@@ -105,16 +101,14 @@ class CacheDeleteCallback : public WebServiceWorkerCache::CacheBatchCallbacks {
: m_resolver(resolver) {}
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);
@@ -138,8 +132,7 @@ class CacheWithRequestsCallbacks
void onSuccess(
const WebVector<WebServiceWorkerRequest>& webRequests) override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
ScriptState::Scope scope(m_resolver->getScriptState());
HeapVector<Member<Request>> requests;
@@ -151,8 +144,7 @@ class CacheWithRequestsCallbacks
}
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();
@@ -298,8 +290,7 @@ class Cache::BarrierCallbackForPut final
ASSERT(index < m_batchOperations.size());
if (m_completed)
return;
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
m_batchOperations[index] = batchOperation;
if (--m_numberOfRemainingOperations != 0)
@@ -313,8 +304,7 @@ class Cache::BarrierCallbackForPut final
if (m_completed)
return;
m_completed = true;
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
ScriptState* state = m_resolver->getScriptState();
ScriptState::Scope scope(state);

Powered by Google App Engine
This is Rietveld 408576698