Expose Cache Storage API in the global scope in stable

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 26 matching lines @@
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/EventTargetModules.h"
 #include "modules/fetch/GlobalFetch.h"
-#include "modules/serviceworkers/CacheStorage.h"
 #include "modules/serviceworkers/InspectorServiceWorkerCacheAgent.h"
 #include "modules/serviceworkers/ServiceWorkerClients.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "modules/serviceworkers/ServiceWorkerScriptCachedMetadataHandler.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/DatabaseIdentifier.h"
 #include "platform/weborigin/KURL.h"
@@ skipping 52 matching lines @@
 {
     if (Platform* platform = Platform::current()) {
         platform->histogramCustomCounts("ServiceWorker.ScriptCount", m_scriptCount, 1, 1000, 50);
         platform->histogramCustomCounts("ServiceWorker.ScriptTotalSize", m_scriptTotalSize, 1000, 5000000, 50);
         if (m_scriptCachedMetadataTotalSize)
             platform->histogramCustomCounts("ServiceWorker.ScriptCachedMetadataTotalSize", m_scriptCachedMetadataTotalSize, 1000, 50000000, 50);
     }
     m_didEvaluateScript = true;
 }
 
-CacheStorage* ServiceWorkerGlobalScope::caches(ExecutionContext* context)
-{
-    if (!m_caches) {
-        String identifier = createDatabaseIdentifierFromSecurityOrigin(context->securityOrigin());
-        ASSERT(!identifier.isEmpty());
-        m_caches = CacheStorage::create(Platform::current()->cacheStorage(identifier));
-    }
-    return m_caches;
-}
-
 ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, const RequestInfo& input, const Dictionary& init, ExceptionState& exceptionState)
 {
     return GlobalFetch::fetch(scriptState, *this, input, init, exceptionState);
 }
 
 ServiceWorkerClients* ServiceWorkerGlobalScope::clients()
 {
     if (!m_clients)
         m_clients = ServiceWorkerClients::create();
     return m_clients;
@@ skipping 70 matching lines @@
     dispatchEvent(event);
     if (thread()->terminated())
         m_hadErrorInTopLevelEventHandler = true;
     observer->didDispatchEvent(m_hadErrorInTopLevelEventHandler);
 }
 
 DEFINE_TRACE(ServiceWorkerGlobalScope)
 {
     visitor->trace(m_clients);
     visitor->trace(m_registration);
-    visitor->trace(m_caches);
     WorkerGlobalScope::trace(visitor);
 }
 
 void ServiceWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState& exceptionState)
 {
     // Bust the MemoryCache to ensure script requests reach the browser-side
     // and get added to and retrieved from the ServiceWorker's script cache.
     // FIXME: Revisit in light of the solution to crbug/388375.
     for (Vector<String>::const_iterator it = urls.begin(); it != urls.end(); ++it)
         executionContext()->removeURLFromMemoryCache(completeURL(*it));
@@ skipping 15 matching lines @@
 }
 
 void ServiceWorkerGlobalScope::scriptLoaded(size_t scriptSize, size_t cachedMetadataSize)
 {
     ++m_scriptCount;
     m_scriptTotalSize += scriptSize;
     m_scriptCachedMetadataTotalSize += cachedMetadataSize;
 }
 
 } // namespace blink