OLD | NEW |
---|---|
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 "content/browser/cache_storage/cache_storage_cache.h" | 5 #include "content/browser/cache_storage/cache_storage_cache.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/guid.h" | 10 #include "base/guid.h" |
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1084 | 1084 |
1085 void CacheStorageCache::KeysDidReadMetadata( | 1085 void CacheStorageCache::KeysDidReadMetadata( |
1086 scoped_ptr<KeysContext> keys_context, | 1086 scoped_ptr<KeysContext> keys_context, |
1087 const Entries::iterator& iter, | 1087 const Entries::iterator& iter, |
1088 scoped_ptr<CacheMetadata> metadata) { | 1088 scoped_ptr<CacheMetadata> metadata) { |
1089 disk_cache::Entry* entry = *iter; | 1089 disk_cache::Entry* entry = *iter; |
1090 | 1090 |
1091 if (metadata) { | 1091 if (metadata) { |
1092 keys_context->out_keys->push_back(ServiceWorkerFetchRequest( | 1092 keys_context->out_keys->push_back(ServiceWorkerFetchRequest( |
1093 GURL(entry->GetKey()), metadata->request().method(), | 1093 GURL(entry->GetKey()), metadata->request().method(), |
1094 ServiceWorkerHeaderMap(), Referrer(), false)); | 1094 ServiceWorkerHeaderMap(), Referrer(), false, |
Paritosh Kumar
2015/05/06 11:53:44
Here, I'm initializing ServiceWorkerFetchRequest w
jsbell
2015/05/06 16:53:43
This seems ok to me.
| |
1095 ServiceWorkerClientInfo())); | |
1095 | 1096 |
1096 ServiceWorkerHeaderMap& req_headers = | 1097 ServiceWorkerHeaderMap& req_headers = |
1097 keys_context->out_keys->back().headers; | 1098 keys_context->out_keys->back().headers; |
1098 | 1099 |
1099 for (int i = 0; i < metadata->request().headers_size(); ++i) { | 1100 for (int i = 0; i < metadata->request().headers_size(); ++i) { |
1100 const CacheHeaderMap header = metadata->request().headers(i); | 1101 const CacheHeaderMap header = metadata->request().headers(i); |
1101 DCHECK(header.name().find('\0') == std::string::npos); | 1102 DCHECK(header.name().find('\0') == std::string::npos); |
1102 DCHECK(header.value().find('\0') == std::string::npos); | 1103 DCHECK(header.value().find('\0') == std::string::npos); |
1103 req_headers.insert(std::make_pair(header.name(), header.value())); | 1104 req_headers.insert(std::make_pair(header.name(), header.value())); |
1104 } | 1105 } |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1219 ErrorType error, | 1220 ErrorType error, |
1220 scoped_ptr<Requests> requests) { | 1221 scoped_ptr<Requests> requests) { |
1221 base::WeakPtr<CacheStorageCache> cache = weak_ptr_factory_.GetWeakPtr(); | 1222 base::WeakPtr<CacheStorageCache> cache = weak_ptr_factory_.GetWeakPtr(); |
1222 | 1223 |
1223 callback.Run(error, requests.Pass()); | 1224 callback.Run(error, requests.Pass()); |
1224 if (cache) | 1225 if (cache) |
1225 scheduler_->CompleteOperationAndRunNext(); | 1226 scheduler_->CompleteOperationAndRunNext(); |
1226 } | 1227 } |
1227 | 1228 |
1228 } // namespace content | 1229 } // namespace content |
OLD | NEW |