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

Unified Diff: base/memory/discardable_memory_allocator.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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
« no previous file with comments | « base/BUILD.gn ('k') | base/task_scheduler/post_task.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/discardable_memory_allocator.cc
diff --git a/base/memory/discardable_memory_allocator.cc b/base/memory/discardable_memory_allocator.cc
index ee288ff4b20c7706598bc2004202e952f50add10..273854a2fbc295ed48b166a177ffd109f9511375 100644
--- a/base/memory/discardable_memory_allocator.cc
+++ b/base/memory/discardable_memory_allocator.cc
@@ -9,21 +9,21 @@
namespace base {
namespace {
-DiscardableMemoryAllocator* g_allocator = nullptr;
+DiscardableMemoryAllocator* g_discardable_memory_allocator = nullptr;
} // namespace
// static
void DiscardableMemoryAllocator::SetInstance(
DiscardableMemoryAllocator* allocator) {
- DCHECK(!allocator || !g_allocator);
- g_allocator = allocator;
+ DCHECK(!allocator || !g_discardable_memory_allocator);
+ g_discardable_memory_allocator = allocator;
}
// static
DiscardableMemoryAllocator* DiscardableMemoryAllocator::GetInstance() {
- DCHECK(g_allocator);
- return g_allocator;
+ DCHECK(g_discardable_memory_allocator);
+ return g_discardable_memory_allocator;
}
} // namespace base
« no previous file with comments | « base/BUILD.gn ('k') | base/task_scheduler/post_task.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698