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

Side by Side Diff: content/browser/cache_storage/cache_storage_index.cc

Issue 2607983002: avoid GCC content::CacheStorage::kSizeUnknown redeclaration error (Closed)
Patch Set: formatting Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_index.h" 5 #include "content/browser/cache_storage/cache_storage_index.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 namespace content { 9 namespace content {
10 10
11 CacheStorageIndex::CacheStorageIndex() 11 CacheStorageIndex::CacheStorageIndex()
12 : doomed_cache_metadata_("", CacheStorage::kSizeUnknown) { 12 : doomed_cache_metadata_("", kCacheStorageSizeUnknown) {
13 ClearDoomedCache(); 13 ClearDoomedCache();
14 } 14 }
15 15
16 CacheStorageIndex::~CacheStorageIndex() = default; 16 CacheStorageIndex::~CacheStorageIndex() = default;
17 17
18 CacheStorageIndex& CacheStorageIndex::operator=(CacheStorageIndex&& rhs) { 18 CacheStorageIndex& CacheStorageIndex::operator=(CacheStorageIndex&& rhs) {
19 DCHECK(!has_doomed_cache_); 19 DCHECK(!has_doomed_cache_);
20 ordered_cache_metadata_ = std::move(rhs.ordered_cache_metadata_); 20 ordered_cache_metadata_ = std::move(rhs.ordered_cache_metadata_);
21 cache_metadata_map_ = std::move(rhs.cache_metadata_map_); 21 cache_metadata_map_ = std::move(rhs.cache_metadata_map_);
22 storage_size_ = rhs.storage_size_; 22 storage_size_ = rhs.storage_size_;
23 rhs.storage_size_ = CacheStorage::kSizeUnknown; 23 rhs.storage_size_ = kCacheStorageSizeUnknown;
24 return *this; 24 return *this;
25 } 25 }
26 26
27 void CacheStorageIndex::Insert(const CacheMetadata& cache_metadata) { 27 void CacheStorageIndex::Insert(const CacheMetadata& cache_metadata) {
28 DCHECK(!has_doomed_cache_); 28 DCHECK(!has_doomed_cache_);
29 DCHECK(cache_metadata_map_.find(cache_metadata.name) == 29 DCHECK(cache_metadata_map_.find(cache_metadata.name) ==
30 cache_metadata_map_.end()); 30 cache_metadata_map_.end());
31 ordered_cache_metadata_.push_back(cache_metadata); 31 ordered_cache_metadata_.push_back(cache_metadata);
32 cache_metadata_map_[cache_metadata.name] = --ordered_cache_metadata_.end(); 32 cache_metadata_map_[cache_metadata.name] = --ordered_cache_metadata_.end();
33 storage_size_ = CacheStorage::kSizeUnknown; 33 storage_size_ = kCacheStorageSizeUnknown;
34 } 34 }
35 35
36 void CacheStorageIndex::Delete(const std::string& cache_name) { 36 void CacheStorageIndex::Delete(const std::string& cache_name) {
37 DCHECK(!has_doomed_cache_); 37 DCHECK(!has_doomed_cache_);
38 auto it = cache_metadata_map_.find(cache_name); 38 auto it = cache_metadata_map_.find(cache_name);
39 DCHECK(it != cache_metadata_map_.end()); 39 DCHECK(it != cache_metadata_map_.end());
40 ordered_cache_metadata_.erase(it->second); 40 ordered_cache_metadata_.erase(it->second);
41 cache_metadata_map_.erase(it); 41 cache_metadata_map_.erase(it);
42 storage_size_ = CacheStorage::kSizeUnknown; 42 storage_size_ = kCacheStorageSizeUnknown;
43 } 43 }
44 44
45 bool CacheStorageIndex::SetCacheSize(const std::string& cache_name, 45 bool CacheStorageIndex::SetCacheSize(const std::string& cache_name,
46 int64_t size) { 46 int64_t size) {
47 if (has_doomed_cache_) 47 if (has_doomed_cache_)
48 DCHECK_NE(cache_name, doomed_cache_metadata_.name); 48 DCHECK_NE(cache_name, doomed_cache_metadata_.name);
49 auto it = cache_metadata_map_.find(cache_name); 49 auto it = cache_metadata_map_.find(cache_name);
50 DCHECK(it != cache_metadata_map_.end()); 50 DCHECK(it != cache_metadata_map_.end());
51 if (it->second->size == size) 51 if (it->second->size == size)
52 return false; 52 return false;
53 it->second->size = size; 53 it->second->size = size;
54 storage_size_ = CacheStorage::kSizeUnknown; 54 storage_size_ = kCacheStorageSizeUnknown;
55 return true; 55 return true;
56 } 56 }
57 57
58 int64_t CacheStorageIndex::GetCacheSize(const std::string& cache_name) const { 58 int64_t CacheStorageIndex::GetCacheSize(const std::string& cache_name) const {
59 const auto& it = cache_metadata_map_.find(cache_name); 59 const auto& it = cache_metadata_map_.find(cache_name);
60 if (it == cache_metadata_map_.end()) 60 if (it == cache_metadata_map_.end())
61 return CacheStorage::kSizeUnknown; 61 return kCacheStorageSizeUnknown;
62 return it->second->size; 62 return it->second->size;
63 } 63 }
64 64
65 int64_t CacheStorageIndex::GetStorageSize() { 65 int64_t CacheStorageIndex::GetStorageSize() {
66 if (storage_size_ == CacheStorage::kSizeUnknown) 66 if (storage_size_ == kCacheStorageSizeUnknown)
67 UpdateStorageSize(); 67 UpdateStorageSize();
68 return storage_size_; 68 return storage_size_;
69 } 69 }
70 70
71 void CacheStorageIndex::UpdateStorageSize() { 71 void CacheStorageIndex::UpdateStorageSize() {
72 int64_t storage_size = 0; 72 int64_t storage_size = 0;
73 storage_size_ = CacheStorage::kSizeUnknown; 73 storage_size_ = kCacheStorageSizeUnknown;
74 for (const CacheMetadata& info : ordered_cache_metadata_) { 74 for (const CacheMetadata& info : ordered_cache_metadata_) {
75 if (info.size == CacheStorage::kSizeUnknown) 75 if (info.size == kCacheStorageSizeUnknown)
76 return; 76 return;
77 storage_size += info.size; 77 storage_size += info.size;
78 } 78 }
79 storage_size_ = storage_size; 79 storage_size_ = storage_size;
80 } 80 }
81 81
82 void CacheStorageIndex::DoomCache(const std::string& cache_name) { 82 void CacheStorageIndex::DoomCache(const std::string& cache_name) {
83 DCHECK(!has_doomed_cache_); 83 DCHECK(!has_doomed_cache_);
84 auto map_it = cache_metadata_map_.find(cache_name); 84 auto map_it = cache_metadata_map_.find(cache_name);
85 DCHECK(map_it != cache_metadata_map_.end()); 85 DCHECK(map_it != cache_metadata_map_.end());
86 doomed_cache_metadata_ = std::move(*(map_it->second)); 86 doomed_cache_metadata_ = std::move(*(map_it->second));
87 after_doomed_cache_metadata_ = ordered_cache_metadata_.erase(map_it->second); 87 after_doomed_cache_metadata_ = ordered_cache_metadata_.erase(map_it->second);
88 cache_metadata_map_.erase(map_it); 88 cache_metadata_map_.erase(map_it);
89 storage_size_ = CacheStorage::kSizeUnknown; 89 storage_size_ = kCacheStorageSizeUnknown;
90 has_doomed_cache_ = true; 90 has_doomed_cache_ = true;
91 } 91 }
92 92
93 void CacheStorageIndex::FinalizeDoomedCache() { 93 void CacheStorageIndex::FinalizeDoomedCache() {
94 DCHECK(has_doomed_cache_); 94 DCHECK(has_doomed_cache_);
95 ClearDoomedCache(); 95 ClearDoomedCache();
96 } 96 }
97 97
98 void CacheStorageIndex::RestoreDoomedCache() { 98 void CacheStorageIndex::RestoreDoomedCache() {
99 DCHECK(has_doomed_cache_); 99 DCHECK(has_doomed_cache_);
100 const auto cache_name = doomed_cache_metadata_.name; 100 const auto cache_name = doomed_cache_metadata_.name;
101 cache_metadata_map_[cache_name] = ordered_cache_metadata_.insert( 101 cache_metadata_map_[cache_name] = ordered_cache_metadata_.insert(
102 after_doomed_cache_metadata_, std::move(doomed_cache_metadata_)); 102 after_doomed_cache_metadata_, std::move(doomed_cache_metadata_));
103 after_doomed_cache_metadata_ = ordered_cache_metadata_.end(); 103 after_doomed_cache_metadata_ = ordered_cache_metadata_.end();
104 storage_size_ = CacheStorage::kSizeUnknown; 104 storage_size_ = kCacheStorageSizeUnknown;
105 ClearDoomedCache(); 105 ClearDoomedCache();
106 } 106 }
107 107
108 void CacheStorageIndex::ClearDoomedCache() { 108 void CacheStorageIndex::ClearDoomedCache() {
109 doomed_cache_metadata_.name.clear(); 109 doomed_cache_metadata_.name.clear();
110 after_doomed_cache_metadata_ = ordered_cache_metadata_.end(); 110 after_doomed_cache_metadata_ = ordered_cache_metadata_.end();
111 has_doomed_cache_ = false; 111 has_doomed_cache_ = false;
112 } 112 }
113 113
114 } // namespace content 114 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698