Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(768)

Side by Side Diff: third_party/WebKit/Source/modules/cachestorage/CacheStorage.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CacheStorage_h 5 #ifndef CacheStorage_h
6 #define CacheStorage_h 6 #define CacheStorage_h
7 7
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
10 #include "bindings/core/v8/ScriptWrappable.h" 10 #include "bindings/core/v8/ScriptWrappable.h"
11 #include "modules/cachestorage/Cache.h" 11 #include "modules/cachestorage/Cache.h"
12 #include "modules/cachestorage/CacheQueryOptions.h" 12 #include "modules/cachestorage/CacheQueryOptions.h"
13 #include "modules/fetch/GlobalFetch.h" 13 #include "modules/fetch/GlobalFetch.h"
14 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h" 14 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h"
15 #include "wtf/Forward.h" 15 #include "wtf/Forward.h"
16 #include "wtf/HashMap.h" 16 #include "wtf/HashMap.h"
17 #include "wtf/Noncopyable.h" 17 #include "wtf/Noncopyable.h"
18 #include <memory>
19 18
20 namespace blink { 19 namespace blink {
21 20
22 class Cache; 21 class Cache;
23 class WebServiceWorkerCacheStorage; 22 class WebServiceWorkerCacheStorage;
24 23
25 class CacheStorage final : public GarbageCollectedFinalized<CacheStorage>, publi c ScriptWrappable { 24 class CacheStorage final : public GarbageCollectedFinalized<CacheStorage>, publi c ScriptWrappable {
26 DEFINE_WRAPPERTYPEINFO(); 25 DEFINE_WRAPPERTYPEINFO();
27 WTF_MAKE_NONCOPYABLE(CacheStorage); 26 WTF_MAKE_NONCOPYABLE(CacheStorage);
28 public: 27 public:
(...skipping 12 matching lines...) Expand all
41 private: 40 private:
42 class Callbacks; 41 class Callbacks;
43 class WithCacheCallbacks; 42 class WithCacheCallbacks;
44 class DeleteCallbacks; 43 class DeleteCallbacks;
45 class KeysCallbacks; 44 class KeysCallbacks;
46 class MatchCallbacks; 45 class MatchCallbacks;
47 46
48 friend class WithCacheCallbacks; 47 friend class WithCacheCallbacks;
49 friend class DeleteCallbacks; 48 friend class DeleteCallbacks;
50 49
51 CacheStorage(GlobalFetch::ScopedFetcher*, std::unique_ptr<WebServiceWorkerCa cheStorage>); 50 CacheStorage(GlobalFetch::ScopedFetcher*, PassOwnPtr<WebServiceWorkerCacheSt orage>);
52 ScriptPromise matchImpl(ScriptState*, const Request*, const CacheQueryOption s&); 51 ScriptPromise matchImpl(ScriptState*, const Request*, const CacheQueryOption s&);
53 52
54 Member<GlobalFetch::ScopedFetcher> m_scopedFetcher; 53 Member<GlobalFetch::ScopedFetcher> m_scopedFetcher;
55 std::unique_ptr<WebServiceWorkerCacheStorage> m_webCacheStorage; 54 OwnPtr<WebServiceWorkerCacheStorage> m_webCacheStorage;
56 HeapHashMap<String, Member<Cache>> m_nameToCacheMap; 55 HeapHashMap<String, Member<Cache>> m_nameToCacheMap;
57 }; 56 };
58 57
59 } // namespace blink 58 } // namespace blink
60 59
61 #endif // CacheStorage_h 60 #endif // CacheStorage_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698