Commit bcb39e8b authored by gavinp@chromium.org's avatar gavinp@chromium.org

Fix Has dispatch ServiceWorker CacheStorage API.

While we're here, remove silly DCHECKs on pointers that are
dereferenced in the next line anyway.

R=asanka@chromium.org,jsbell@chromium.org
TBR=falken@chromium.org,dominicc@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/461343006

Cr-Commit-Position: refs/heads/master@{#291247}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291247 0039d316-1c4b-4281-b951-d872f2087c98
parent e34fd7dd
...@@ -74,7 +74,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetSuccess( ...@@ -74,7 +74,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetSuccess(
int cache_id) { int cache_id) {
CacheStorageWithCacheCallbacks* callbacks = CacheStorageWithCacheCallbacks* callbacks =
get_callbacks_.Lookup(request_id); get_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onSuccess(NULL); callbacks->onSuccess(NULL);
get_callbacks_.Remove(request_id); get_callbacks_.Remove(request_id);
} }
...@@ -82,7 +81,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetSuccess( ...@@ -82,7 +81,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetSuccess(
void ServiceWorkerCacheStorageDispatcher::OnCacheStorageHasSuccess( void ServiceWorkerCacheStorageDispatcher::OnCacheStorageHasSuccess(
int request_id) { int request_id) {
CacheStorageCallbacks* callbacks = has_callbacks_.Lookup(request_id); CacheStorageCallbacks* callbacks = has_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onSuccess(); callbacks->onSuccess();
has_callbacks_.Remove(request_id); has_callbacks_.Remove(request_id);
} }
...@@ -92,7 +90,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateSuccess( ...@@ -92,7 +90,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateSuccess(
int cache_id) { int cache_id) {
CacheStorageWithCacheCallbacks* callbacks = CacheStorageWithCacheCallbacks* callbacks =
create_callbacks_.Lookup(request_id); create_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onSuccess(NULL); callbacks->onSuccess(NULL);
create_callbacks_.Remove(request_id); create_callbacks_.Remove(request_id);
} }
...@@ -100,7 +97,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateSuccess( ...@@ -100,7 +97,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateSuccess(
void ServiceWorkerCacheStorageDispatcher::OnCacheStorageDeleteSuccess( void ServiceWorkerCacheStorageDispatcher::OnCacheStorageDeleteSuccess(
int request_id) { int request_id) {
CacheStorageCallbacks* callbacks = delete_callbacks_.Lookup(request_id); CacheStorageCallbacks* callbacks = delete_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onSuccess(); callbacks->onSuccess();
delete_callbacks_.Remove(request_id); delete_callbacks_.Remove(request_id);
} }
...@@ -109,7 +105,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageKeysSuccess( ...@@ -109,7 +105,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageKeysSuccess(
int request_id, int request_id,
const std::vector<base::string16>& keys) { const std::vector<base::string16>& keys) {
CacheStorageKeysCallbacks* callbacks = keys_callbacks_.Lookup(request_id); CacheStorageKeysCallbacks* callbacks = keys_callbacks_.Lookup(request_id);
DCHECK(callbacks);
blink::WebVector<blink::WebString> webKeys(keys.size()); blink::WebVector<blink::WebString> webKeys(keys.size());
for (size_t i = 0; i < keys.size(); ++i) for (size_t i = 0; i < keys.size(); ++i)
webKeys[i] = keys[i]; webKeys[i] = keys[i];
...@@ -123,7 +118,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetError( ...@@ -123,7 +118,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageGetError(
blink::WebServiceWorkerCacheError reason) { blink::WebServiceWorkerCacheError reason) {
CacheStorageWithCacheCallbacks* callbacks = CacheStorageWithCacheCallbacks* callbacks =
get_callbacks_.Lookup(request_id); get_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onError(&reason); callbacks->onError(&reason);
get_callbacks_.Remove(request_id); get_callbacks_.Remove(request_id);
} }
...@@ -132,7 +126,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageHasError( ...@@ -132,7 +126,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageHasError(
int request_id, int request_id,
blink::WebServiceWorkerCacheError reason) { blink::WebServiceWorkerCacheError reason) {
CacheStorageCallbacks* callbacks = has_callbacks_.Lookup(request_id); CacheStorageCallbacks* callbacks = has_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onError(&reason); callbacks->onError(&reason);
has_callbacks_.Remove(request_id); has_callbacks_.Remove(request_id);
} }
...@@ -142,7 +135,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateError( ...@@ -142,7 +135,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageCreateError(
blink::WebServiceWorkerCacheError reason) { blink::WebServiceWorkerCacheError reason) {
CacheStorageWithCacheCallbacks* callbacks = CacheStorageWithCacheCallbacks* callbacks =
create_callbacks_.Lookup(request_id); create_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onError(&reason); callbacks->onError(&reason);
create_callbacks_.Remove(request_id); create_callbacks_.Remove(request_id);
} }
...@@ -151,7 +143,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageDeleteError( ...@@ -151,7 +143,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageDeleteError(
int request_id, int request_id,
blink::WebServiceWorkerCacheError reason) { blink::WebServiceWorkerCacheError reason) {
CacheStorageCallbacks* callbacks = delete_callbacks_.Lookup(request_id); CacheStorageCallbacks* callbacks = delete_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onError(&reason); callbacks->onError(&reason);
delete_callbacks_.Remove(request_id); delete_callbacks_.Remove(request_id);
} }
...@@ -160,7 +151,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageKeysError( ...@@ -160,7 +151,6 @@ void ServiceWorkerCacheStorageDispatcher::OnCacheStorageKeysError(
int request_id, int request_id,
blink::WebServiceWorkerCacheError reason) { blink::WebServiceWorkerCacheError reason) {
CacheStorageKeysCallbacks* callbacks = keys_callbacks_.Lookup(request_id); CacheStorageKeysCallbacks* callbacks = keys_callbacks_.Lookup(request_id);
DCHECK(callbacks);
callbacks->onError(&reason); callbacks->onError(&reason);
keys_callbacks_.Remove(request_id); keys_callbacks_.Remove(request_id);
} }
...@@ -176,7 +166,7 @@ void ServiceWorkerCacheStorageDispatcher::dispatchGet( ...@@ -176,7 +166,7 @@ void ServiceWorkerCacheStorageDispatcher::dispatchGet(
void ServiceWorkerCacheStorageDispatcher::dispatchHas( void ServiceWorkerCacheStorageDispatcher::dispatchHas(
CacheStorageCallbacks* callbacks, CacheStorageCallbacks* callbacks,
const blink::WebString& cacheName) { const blink::WebString& cacheName) {
int request_id = delete_callbacks_.Add(callbacks); int request_id = has_callbacks_.Add(callbacks);
script_context_->Send(new ServiceWorkerHostMsg_CacheStorageDelete( script_context_->Send(new ServiceWorkerHostMsg_CacheStorageDelete(
script_context_->GetRoutingID(), request_id, cacheName)); script_context_->GetRoutingID(), request_id, cacheName));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment