Introducing the WebServiceWorkerCache.

Source/modules/serviceworkers/Cache.h

 // 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.
 
 #ifndef Cache_h
 #define Cache_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/DOMException.h"
+#include "public/platform/WebServiceWorkerCache.h"
 #include "public/platform/WebServiceWorkerCacheError.h"
 #include "wtf/Forward.h"
 #include "wtf/Noncopyable.h"
+#include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 #include <v8.h>

[dominicc (has gone to gerrit), 2014/09/17 12:53:58]

Why is this include needed?

[gavinp, 2014/09/17 15:41:52]

It's been there from the start; likely for no good reason. Removing it.

 
 namespace blink {
 
 class Dictionary;
 class Response;
 class Request;
 class ScriptState;
 class WebServiceWorkerCache;

[dominicc (has gone to gerrit), 2014/09/17 12:53:58]

This might be redundant with the new include.

[gavinp, 2014/09/17 15:41:53]

Done.

 
-class Cache FINAL : public GarbageCollected<Cache>, public ScriptWrappable {
+class Cache FINAL : public GarbageCollectedFinalized<Cache>, public ScriptWrappable, public WebServiceWorkerCache::ProxyInterface {
     DEFINE_WRAPPERTYPEINFO();
     WTF_MAKE_NONCOPYABLE(Cache);
 public:
     static Cache* fromWebServiceWorkerCache(WebServiceWorkerCache*);
 
     // From Cache.idl:
     ScriptPromise match(ScriptState*, Request*, const Dictionary& queryParams);
     ScriptPromise match(ScriptState*, const String&, const Dictionary& queryParams);
     ScriptPromise matchAll(ScriptState*, Request*, const Dictionary& queryParams);
     ScriptPromise matchAll(ScriptState*, const String&, const Dictionary& queryParams);
     ScriptPromise add(ScriptState*, Request*);
     ScriptPromise add(ScriptState*, const String&);
     ScriptPromise addAll(ScriptState*, const Vector<ScriptValue>&);
     ScriptPromise deleteFunction(ScriptState*, Request*, const Dictionary& queryParams);
     ScriptPromise deleteFunction(ScriptState*, const String&, const Dictionary& queryParams);
-    ScriptPromise put(ScriptState*, Request*, Response*);
-    ScriptPromise put(ScriptState*, const String&, Response*);
+    ScriptPromise put(ScriptState*, Request*, const Response*);
+    ScriptPromise put(ScriptState*, const String&, const Response*);
     ScriptPromise keys(ScriptState*);
     ScriptPromise keys(ScriptState*, Request*, const Dictionary& queryParams);
     ScriptPromise keys(ScriptState*, const String&, const Dictionary& queryParams);
 
     void trace(Visitor*) { }
 
     static PassRefPtrWillBeRawPtr<DOMException> domExceptionForCacheError(WebServiceWorkerCacheError);
 
 private:
-    explicit Cache(WebServiceWorkerCache* webCache);
+    explicit Cache(WebServiceWorkerCache*);
 
-    WebServiceWorkerCache const* ALLOW_UNUSED m_webCache;
+    static Cache* create(WebServiceWorkerCache*);
+
+    ScriptPromise matchImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise matchAllImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise addImpl(ScriptState*, Request*);
+    ScriptPromise addAllImpl(ScriptState*, Vector<Request*>);
+    ScriptPromise deleteImpl(ScriptState*, Request*, const Dictionary& queryParams);
+    ScriptPromise putImpl(ScriptState*, Request*, const Response*);
+    ScriptPromise keysImpl(ScriptState*);
+    ScriptPromise keysImpl(ScriptState*, Request*, const Dictionary& queryParams);
+
+    OwnPtr<WebServiceWorkerCache> m_webCache;
 };
 
 } // namespace blink
 
 #endif // Cache_h