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

Side by Side Diff: Source/modules/cachestorage/Cache.cpp

Issue 1227783004: Fix virtual/override/final usage in Source/modules/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/cachestorage/CacheStorage.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "config.h" 5 #include "config.h"
6 #include "modules/cachestorage/Cache.h" 6 #include "modules/cachestorage/Cache.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ExceptionState.h" 9 #include "bindings/core/v8/ExceptionState.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 15 matching lines...) Expand all
26 26
27 namespace { 27 namespace {
28 28
29 // FIXME: Consider using CallbackPromiseAdapter. 29 // FIXME: Consider using CallbackPromiseAdapter.
30 class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks { 30 class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks {
31 WTF_MAKE_NONCOPYABLE(CacheMatchCallbacks); 31 WTF_MAKE_NONCOPYABLE(CacheMatchCallbacks);
32 public: 32 public:
33 CacheMatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) 33 CacheMatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
34 : m_resolver(resolver) { } 34 : m_resolver(resolver) { }
35 35
36 virtual void onSuccess(WebServiceWorkerResponse* webResponse) override 36 void onSuccess(WebServiceWorkerResponse* webResponse) override
37 { 37 {
38 m_resolver->resolve(Response::create(m_resolver->scriptState()->executio nContext(), *webResponse)); 38 m_resolver->resolve(Response::create(m_resolver->scriptState()->executio nContext(), *webResponse));
39 m_resolver.clear(); 39 m_resolver.clear();
40 } 40 }
41 41
42 // Ownership of |rawReason| must be passed. 42 // Ownership of |rawReason| must be passed.
43 virtual void onError(WebServiceWorkerCacheError* rawReason) override 43 void onError(WebServiceWorkerCacheError* rawReason) override
44 { 44 {
45 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); 45 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
46 if (*reason == WebServiceWorkerCacheErrorNotFound) 46 if (*reason == WebServiceWorkerCacheErrorNotFound)
47 m_resolver->resolve(); 47 m_resolver->resolve();
48 else 48 else
49 m_resolver->reject(CacheStorageError::createException(*reason)); 49 m_resolver->reject(CacheStorageError::createException(*reason));
50 m_resolver.clear(); 50 m_resolver.clear();
51 } 51 }
52 52
53 private: 53 private:
54 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; 54 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
55 }; 55 };
56 56
57 // FIXME: Consider using CallbackPromiseAdapter. 57 // FIXME: Consider using CallbackPromiseAdapter.
58 class CacheWithResponsesCallbacks : public WebServiceWorkerCache::CacheWithRespo nsesCallbacks { 58 class CacheWithResponsesCallbacks : public WebServiceWorkerCache::CacheWithRespo nsesCallbacks {
59 WTF_MAKE_NONCOPYABLE(CacheWithResponsesCallbacks); 59 WTF_MAKE_NONCOPYABLE(CacheWithResponsesCallbacks);
60 public: 60 public:
61 CacheWithResponsesCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> re solver) 61 CacheWithResponsesCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> re solver)
62 : m_resolver(resolver) { } 62 : m_resolver(resolver) { }
63 63
64 virtual void onSuccess(WebVector<WebServiceWorkerResponse>* webResponses) ov erride 64 void onSuccess(WebVector<WebServiceWorkerResponse>* webResponses) override
65 { 65 {
66 HeapVector<Member<Response>> responses; 66 HeapVector<Member<Response>> responses;
67 for (size_t i = 0; i < webResponses->size(); ++i) 67 for (size_t i = 0; i < webResponses->size(); ++i)
68 responses.append(Response::create(m_resolver->scriptState()->executi onContext(), (*webResponses)[i])); 68 responses.append(Response::create(m_resolver->scriptState()->executi onContext(), (*webResponses)[i]));
69 m_resolver->resolve(responses); 69 m_resolver->resolve(responses);
70 m_resolver.clear(); 70 m_resolver.clear();
71 } 71 }
72 72
73 // Ownership of |rawReason| must be passed. 73 // Ownership of |rawReason| must be passed.
74 virtual void onError(WebServiceWorkerCacheError* rawReason) override 74 void onError(WebServiceWorkerCacheError* rawReason) override
75 { 75 {
76 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); 76 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
77 m_resolver->reject(CacheStorageError::createException(*reason)); 77 m_resolver->reject(CacheStorageError::createException(*reason));
78 m_resolver.clear(); 78 m_resolver.clear();
79 } 79 }
80 80
81 protected: 81 protected:
82 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; 82 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
83 }; 83 };
84 84
85 // FIXME: Consider using CallbackPromiseAdapter. 85 // FIXME: Consider using CallbackPromiseAdapter.
86 class CacheDeleteCallback : public WebServiceWorkerCache::CacheBatchCallbacks { 86 class CacheDeleteCallback : public WebServiceWorkerCache::CacheBatchCallbacks {
87 WTF_MAKE_NONCOPYABLE(CacheDeleteCallback); 87 WTF_MAKE_NONCOPYABLE(CacheDeleteCallback);
88 public: 88 public:
89 CacheDeleteCallback(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) 89 CacheDeleteCallback(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
90 : m_resolver(resolver) { } 90 : m_resolver(resolver) { }
91 91
92 void onSuccess() override 92 void onSuccess() override
93 { 93 {
94 m_resolver->resolve(true); 94 m_resolver->resolve(true);
95 m_resolver.clear(); 95 m_resolver.clear();
96 } 96 }
97 97
98 // Ownership of |rawReason| must be passed. 98 // Ownership of |rawReason| must be passed.
99 virtual void onError(WebServiceWorkerCacheError* rawReason) override 99 void onError(WebServiceWorkerCacheError* rawReason) override
100 { 100 {
101 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); 101 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
102 if (*reason == WebServiceWorkerCacheErrorNotFound) 102 if (*reason == WebServiceWorkerCacheErrorNotFound)
103 m_resolver->resolve(false); 103 m_resolver->resolve(false);
104 else 104 else
105 m_resolver->reject(CacheStorageError::createException(*reason)); 105 m_resolver->reject(CacheStorageError::createException(*reason));
106 m_resolver.clear(); 106 m_resolver.clear();
107 } 107 }
108 108
109 private: 109 private:
110 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; 110 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
111 }; 111 };
112 112
113 // FIXME: Consider using CallbackPromiseAdapter. 113 // FIXME: Consider using CallbackPromiseAdapter.
114 class CacheWithRequestsCallbacks : public WebServiceWorkerCache::CacheWithReques tsCallbacks { 114 class CacheWithRequestsCallbacks : public WebServiceWorkerCache::CacheWithReques tsCallbacks {
115 WTF_MAKE_NONCOPYABLE(CacheWithRequestsCallbacks); 115 WTF_MAKE_NONCOPYABLE(CacheWithRequestsCallbacks);
116 public: 116 public:
117 CacheWithRequestsCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> res olver) 117 CacheWithRequestsCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> res olver)
118 : m_resolver(resolver) { } 118 : m_resolver(resolver) { }
119 119
120 virtual void onSuccess(WebVector<WebServiceWorkerRequest>* webRequests) over ride 120 void onSuccess(WebVector<WebServiceWorkerRequest>* webRequests) override
121 { 121 {
122 HeapVector<Member<Request>> requests; 122 HeapVector<Member<Request>> requests;
123 for (size_t i = 0; i < webRequests->size(); ++i) 123 for (size_t i = 0; i < webRequests->size(); ++i)
124 requests.append(Request::create(m_resolver->scriptState()->execution Context(), (*webRequests)[i])); 124 requests.append(Request::create(m_resolver->scriptState()->execution Context(), (*webRequests)[i]));
125 m_resolver->resolve(requests); 125 m_resolver->resolve(requests);
126 m_resolver.clear(); 126 m_resolver.clear();
127 } 127 }
128 128
129 // Ownership of |rawReason| must be passed. 129 // Ownership of |rawReason| must be passed.
130 virtual void onError(WebServiceWorkerCacheError* rawReason) override 130 void onError(WebServiceWorkerCacheError* rawReason) override
131 { 131 {
132 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason); 132 OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
133 m_resolver->reject(CacheStorageError::createException(*reason)); 133 m_resolver->reject(CacheStorageError::createException(*reason));
134 m_resolver.clear(); 134 m_resolver.clear();
135 } 135 }
136 136
137 private: 137 private:
138 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; 138 RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
139 }; 139 };
140 140
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ ueryParams(options)); 594 m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQ ueryParams(options));
595 return promise; 595 return promise;
596 } 596 }
597 597
598 WebServiceWorkerCache* Cache::webCache() const 598 WebServiceWorkerCache* Cache::webCache() const
599 { 599 {
600 return m_webCache.get(); 600 return m_webCache.get();
601 } 601 }
602 602
603 } // namespace blink 603 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/cachestorage/CacheStorage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698