Cache Storage: Add Platform API to retrieve CacheStorage for origin

Source/modules/serviceworkers/InspectorServiceWorkerCacheAgent.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 "config.h"
 #include "modules/serviceworkers/InspectorServiceWorkerCacheAgent.h"
 
 #include "core/InspectorBackendDispatcher.h"
 #include "core/InspectorTypeBuilder.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "platform/JSONValues.h"
 #include "platform/heap/Handle.h"
+#include "platform/weborigin/DatabaseIdentifier.h"
+#include "public/platform/Platform.h"
 #include "public/platform/WebServiceWorkerCache.h"
 #include "public/platform/WebServiceWorkerCacheError.h"
 #include "public/platform/WebServiceWorkerCacheStorage.h"
 #include "public/platform/WebServiceWorkerRequest.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebVector.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
@@ skipping 10 matching lines @@
 
 typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::DeleteCacheCallback DeleteCacheCallback;
 typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::RequestCacheNamesCallback RequestCacheNamesCallback;
 typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::RequestEntriesCallback RequestEntriesCallback;
 typedef blink::InspectorBackendDispatcher::CallbackBase RequestCallback;
 
 namespace blink {
 
 namespace {
 
-WebServiceWorkerCacheStorage* assertCacheStorage(ErrorString* errorString, ServiceWorkerGlobalScope* globalScope)
+PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorage(ErrorString* errorString, ServiceWorkerGlobalScope* globalScope)
 {
-    ServiceWorkerGlobalScopeClient* client = ServiceWorkerGlobalScopeClient::from(globalScope);
-    if (!client) {
-        *errorString = "Could not find service worker global scope.";
+    String identifier = createDatabaseIdentifierFromSecurityOrigin(globalScope->securityOrigin());
+    OwnPtr<WebServiceWorkerCacheStorage> caches = adoptPtr(Platform::current()->cacheStorage(identifier));
+    if (!caches) {
+        *errorString = "Cache Storage not available in global scope.";
         return nullptr;
     }
-    WebServiceWorkerCacheStorage* cache = client->cacheStorage();
-    if (!cache) {
-        *errorString = "Cache not available on service worker global client.";
-        return nullptr;
-    }
-    return cache;
+    return caches.release();
 }
 
 CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError* error)
 {
     switch (*error) {
     case WebServiceWorkerCacheErrorNotImplemented:
         return CString("not implemented.");
         break;
     case WebServiceWorkerCacheErrorNotFound:
         return CString("not found.");
@@ skipping 233 matching lines @@
 
 InspectorServiceWorkerCacheAgent::~InspectorServiceWorkerCacheAgent() { }
 
 DEFINE_TRACE(InspectorServiceWorkerCacheAgent)
 {
     InspectorBaseAgent::trace(visitor);
 }
 
 void InspectorServiceWorkerCacheAgent::requestCacheNames(ErrorString* errorString, PassRefPtrWillBeRawPtr<RequestCacheNamesCallback> callback)
 {
-    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, m_globalScope);
+    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);

[kinuko, 2015/03/25 03:57:23]

Oh ok- so we create and delete the storage interface each time these inspector
hook is called. (But it should be fine since it's just a stub class for sending
messages to the browser)

[michaeln, 2015/03/25 18:52:24]

This is ok. If we ever decide to have per-origin or per-cache state maintained
in renderers, multiple stub objects can refer to shared state.

     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchKeys(new RequestCacheNames(callback));
 }
 
 
 void InspectorServiceWorkerCacheAgent::requestEntries(ErrorString* errorString, const String& cacheName, int skipCount, int pageSize, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
 {
-    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, m_globalScope);
+    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     DataRequestParams params;
     params.cacheName = cacheName;
     params.pageSize = pageSize;
     params.skipCount = skipCount;
     cache->dispatchOpen(new GetCacheForRequestData(params, callback), WebString(cacheName));
 }
 
 void InspectorServiceWorkerCacheAgent::deleteCache(ErrorString* errorString, const String& cacheName, PassRefPtrWillBeRawPtr<DeleteCacheCallback> callback)
 {
-    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, m_globalScope);
+    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchDelete(new DeleteCache(callback), WebString(cacheName));
 }
 
 } // namespace blink