Introducing the WebServiceWorkerCacheStorage

Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/CachePolyfill.h"
 #include "modules/CacheStoragePolyfill.h"
 #include "modules/EventTargetModules.h"
-#include "modules/serviceworkers/CacheStorage.h"
 #include "modules/serviceworkers/FetchManager.h"
+#include "modules/serviceworkers/FetchStores.h"
 #include "modules/serviceworkers/Request.h"
 #include "modules/serviceworkers/ServiceWorkerClients.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebURL.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
@@ skipping 24 matching lines @@
 void ServiceWorkerGlobalScope::stopFetch()
 {
     m_fetchManager.clear();
 }
 
 String ServiceWorkerGlobalScope::scope(ExecutionContext* context)
 {
     return ServiceWorkerGlobalScopeClient::from(context)->scope().string();
 }
 
-PassRefPtrWillBeRawPtr<CacheStorage> ServiceWorkerGlobalScope::caches(ExecutionContext* context)
+PassRefPtrWillBeRawPtr<FetchStores> ServiceWorkerGlobalScope::fetchStores(ExecutionContext* context)
 {
-    if (!m_cacheStorage)
-        m_cacheStorage = CacheStorage::create();
-    return m_cacheStorage;
+    if (!m_fetchStores)
+        m_fetchStores = FetchStores::create(ServiceWorkerGlobalScopeClient::from(context)->fetchStores());
+    return m_fetchStores;
 }
 
 ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, Request* request)
 {
     if (!m_fetchManager)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError("ServiceWorkerGlobalScope is shutting down.", scriptState->isolate()));
     // "Let |r| be the associated request of the result of invoking the initial
     // value of Request as constructor with |input| and |init| as arguments. If
     // this throws an exception, reject |p| with it."
     TrackExceptionState exceptionState;
@@ skipping 61 matching lines @@
 }
 
 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const
 {
     return EventTargetNames::ServiceWorkerGlobalScope;
 }
 
 void ServiceWorkerGlobalScope::trace(Visitor* visitor)
 {
     visitor->trace(m_clients);
-    visitor->trace(m_cacheStorage);
+    visitor->trace(m_fetchStores);
     WorkerGlobalScope::trace(visitor);
 }
 
 void ServiceWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
 {
     WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack);
     addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, callStack, 0);
 }
 
 } // namespace blink