[Storage] Cache storage inspection on all the frames!

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 "platform/weborigin/SecurityOrigin.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"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 
 #include <algorithm>
 
 using blink::TypeBuilder::Array;
-using blink::TypeBuilder::ServiceWorkerCache::DataEntry;
+using blink::TypeBuilder::CacheStorage::DataEntry;
 
-typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::DeleteCacheCallback DeleteCacheCallback;
-typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::RequestCacheNamesCallback RequestCacheNamesCallback;
-typedef blink::InspectorBackendDispatcher::ServiceWorkerCacheCommandHandler::RequestEntriesCallback RequestEntriesCallback;
+typedef blink::InspectorBackendDispatcher::CacheStorageCommandHandler::DeleteCacheCallback DeleteCacheCallback;
+typedef blink::InspectorBackendDispatcher::CacheStorageCommandHandler::RequestCacheNamesCallback RequestCacheNamesCallback;
+typedef blink::InspectorBackendDispatcher::CacheStorageCommandHandler::RequestEntriesCallback RequestEntriesCallback;
 typedef blink::InspectorBackendDispatcher::CallbackBase RequestCallback;
 
 namespace blink {
 
 namespace {
 
-PassOwnPtr<WebServiceWorkerCacheStorage> assertCacheStorage(ErrorString* errorString, ServiceWorkerGlobalScope* globalScope)
+WebServiceWorkerCacheStorage* assertCacheStorage(ErrorString* errorString, const String& securityOrigin)
 {
-    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;
-    }
-    return caches.release();
+    RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin);
+    String identifier = createDatabaseIdentifierFromSecurityOrigin(secOrigin.get());
+    WebServiceWorkerCacheStorage* cache =  Platform::current()->cacheStorage(identifier);

[horo, 2015/04/03 01:23:46]

nit: unnecessary apace after =

[horo, 2015/04/03 01:23:46]

Who deletes this |cache|?

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...
    // The caller is responsible for deleting the returned object.
    virtual WebServiceWorkerCacheStorage* cacheStorage(const WebString&
originIdentifier) { return nullptr; }

[jsbell, 2015/04/03 03:21:08]

Agreed - this this should keep the PassOwnPtr<WebServiceWorkerCacheStorage>
return type, and be captured into (temporary) OwnPtr<> by the callers to clean
it up.

[dmurph, 2015/04/08 19:35:35]

Done.

+    if (!cache)
+        *errorString = "Could not find cache storage.";
+    return cache;
 }
 
 CString serviceWorkerCacheErrorString(WebServiceWorkerCacheError* error)
 {
     switch (*error) {
     case WebServiceWorkerCacheErrorNotImplemented:
         return CString("not implemented.");
         break;
     case WebServiceWorkerCacheErrorNotFound:
         return CString("not found.");
@@ skipping 218 matching lines @@
     {
         m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     RefPtrWillBePersistent<DeleteCacheCallback> m_callback;
 };
 
 } // namespace
 
-InspectorServiceWorkerCacheAgent::InspectorServiceWorkerCacheAgent(ServiceWorkerGlobalScope* scope)
-    : InspectorBaseAgent<blink::InspectorServiceWorkerCacheAgent, InspectorFrontend::ServiceWorkerCache>("ServiceWorkerCache")
-    , m_globalScope(scope)
+InspectorServiceWorkerCacheAgent::InspectorServiceWorkerCacheAgent()
+    : InspectorBaseAgent<InspectorServiceWorkerCacheAgent, InspectorFrontend::CacheStorage>("CacheStorage")
 {
 }
 
 InspectorServiceWorkerCacheAgent::~InspectorServiceWorkerCacheAgent() { }
 
 DEFINE_TRACE(InspectorServiceWorkerCacheAgent)
 {
     InspectorBaseAgent::trace(visitor);
 }
 
-void InspectorServiceWorkerCacheAgent::requestCacheNames(ErrorString* errorString, PassRefPtrWillBeRawPtr<RequestCacheNamesCallback> callback)
+void InspectorServiceWorkerCacheAgent::requestCacheNames(ErrorString* errorString, const String& securityOrigin, PassRefPtrWillBeRawPtr<RequestCacheNamesCallback> callback)
 {
-    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);
+    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, securityOrigin);
     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)
+void InspectorServiceWorkerCacheAgent::requestEntries(ErrorString* errorString, const String& securityOrigin, const String& cacheName, int skipCount, int pageSize, PassRefPtrWillBeRawPtr<RequestEntriesCallback> callback)
 {
-    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);
+    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, securityOrigin);
     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)
+void InspectorServiceWorkerCacheAgent::deleteCache(ErrorString* errorString, const String& securityOrigin, const String& cacheName, PassRefPtrWillBeRawPtr<DeleteCacheCallback> callback)
 {
-    OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, m_globalScope);
+    WebServiceWorkerCacheStorage* cache = assertCacheStorage(errorString, securityOrigin);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchDelete(new DeleteCache(callback), WebString(cacheName));
 }
 
 } // namespace blink