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

Unified 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, 12 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/cache_storage/cache_storage_index.cc
diff --git a/content/browser/cache_storage/cache_storage_index.cc b/content/browser/cache_storage/cache_storage_index.cc
index a5ddcb33692b53b986a8859949b64c4e3ce19730..1952e9d3c42a4887fdb0187321dac9e9f30c84f3 100644
--- a/content/browser/cache_storage/cache_storage_index.cc
+++ b/content/browser/cache_storage/cache_storage_index.cc
@@ -9,7 +9,7 @@
namespace content {
CacheStorageIndex::CacheStorageIndex()
- : doomed_cache_metadata_("", CacheStorage::kSizeUnknown) {
+ : doomed_cache_metadata_("", kCacheStorageSizeUnknown) {
ClearDoomedCache();
}
@@ -20,7 +20,7 @@ CacheStorageIndex& CacheStorageIndex::operator=(CacheStorageIndex&& rhs) {
ordered_cache_metadata_ = std::move(rhs.ordered_cache_metadata_);
cache_metadata_map_ = std::move(rhs.cache_metadata_map_);
storage_size_ = rhs.storage_size_;
- rhs.storage_size_ = CacheStorage::kSizeUnknown;
+ rhs.storage_size_ = kCacheStorageSizeUnknown;
return *this;
}
@@ -30,7 +30,7 @@ void CacheStorageIndex::Insert(const CacheMetadata& cache_metadata) {
cache_metadata_map_.end());
ordered_cache_metadata_.push_back(cache_metadata);
cache_metadata_map_[cache_metadata.name] = --ordered_cache_metadata_.end();
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
}
void CacheStorageIndex::Delete(const std::string& cache_name) {
@@ -39,7 +39,7 @@ void CacheStorageIndex::Delete(const std::string& cache_name) {
DCHECK(it != cache_metadata_map_.end());
ordered_cache_metadata_.erase(it->second);
cache_metadata_map_.erase(it);
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
}
bool CacheStorageIndex::SetCacheSize(const std::string& cache_name,
@@ -51,28 +51,28 @@ bool CacheStorageIndex::SetCacheSize(const std::string& cache_name,
if (it->second->size == size)
return false;
it->second->size = size;
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
return true;
}
int64_t CacheStorageIndex::GetCacheSize(const std::string& cache_name) const {
const auto& it = cache_metadata_map_.find(cache_name);
if (it == cache_metadata_map_.end())
- return CacheStorage::kSizeUnknown;
+ return kCacheStorageSizeUnknown;
return it->second->size;
}
int64_t CacheStorageIndex::GetStorageSize() {
- if (storage_size_ == CacheStorage::kSizeUnknown)
+ if (storage_size_ == kCacheStorageSizeUnknown)
UpdateStorageSize();
return storage_size_;
}
void CacheStorageIndex::UpdateStorageSize() {
int64_t storage_size = 0;
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
for (const CacheMetadata& info : ordered_cache_metadata_) {
- if (info.size == CacheStorage::kSizeUnknown)
+ if (info.size == kCacheStorageSizeUnknown)
return;
storage_size += info.size;
}
@@ -86,7 +86,7 @@ void CacheStorageIndex::DoomCache(const std::string& cache_name) {
doomed_cache_metadata_ = std::move(*(map_it->second));
after_doomed_cache_metadata_ = ordered_cache_metadata_.erase(map_it->second);
cache_metadata_map_.erase(map_it);
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
has_doomed_cache_ = true;
}
@@ -101,7 +101,7 @@ void CacheStorageIndex::RestoreDoomedCache() {
cache_metadata_map_[cache_name] = ordered_cache_metadata_.insert(
after_doomed_cache_metadata_, std::move(doomed_cache_metadata_));
after_doomed_cache_metadata_ = ordered_cache_metadata_.end();
- storage_size_ = CacheStorage::kSizeUnknown;
+ storage_size_ = kCacheStorageSizeUnknown;
ClearDoomedCache();
}

Powered by Google App Engine
This is Rietveld 408576698