| Index: src/heap/spaces.cc
|
| diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
|
| index f26859261c7493c49c993e5c73514f790476452a..9710484069a48864f4a2f8c229e94444b5d97859 100644
|
| --- a/src/heap/spaces.cc
|
| +++ b/src/heap/spaces.cc
|
| @@ -2960,15 +2960,13 @@ HeapObject* LargeObjectIterator::Next() {
|
| // -----------------------------------------------------------------------------
|
| // LargeObjectSpace
|
|
|
| -
|
| LargeObjectSpace::LargeObjectSpace(Heap* heap, AllocationSpace id)
|
| : Space(heap, id, NOT_EXECUTABLE), // Managed on a per-allocation basis
|
| first_page_(NULL),
|
| size_(0),
|
| page_count_(0),
|
| objects_size_(0),
|
| - chunk_map_(HashMap::PointersMatch, 1024) {}
|
| -
|
| + chunk_map_(base::HashMap::PointersMatch, 1024) {}
|
|
|
| LargeObjectSpace::~LargeObjectSpace() {}
|
|
|
| @@ -3023,7 +3021,7 @@ AllocationResult LargeObjectSpace::AllocateRaw(int object_size,
|
| uintptr_t base = reinterpret_cast<uintptr_t>(page) / MemoryChunk::kAlignment;
|
| uintptr_t limit = base + (page->size() - 1) / MemoryChunk::kAlignment;
|
| for (uintptr_t key = base; key <= limit; key++) {
|
| - HashMap::Entry* entry = chunk_map_.LookupOrInsert(
|
| + base::HashMap::Entry* entry = chunk_map_.LookupOrInsert(
|
| reinterpret_cast<void*>(key), static_cast<uint32_t>(key));
|
| DCHECK(entry != NULL);
|
| entry->value = page;
|
| @@ -3070,8 +3068,8 @@ Object* LargeObjectSpace::FindObject(Address a) {
|
|
|
| LargePage* LargeObjectSpace::FindPage(Address a) {
|
| uintptr_t key = reinterpret_cast<uintptr_t>(a) / MemoryChunk::kAlignment;
|
| - HashMap::Entry* e = chunk_map_.Lookup(reinterpret_cast<void*>(key),
|
| - static_cast<uint32_t>(key));
|
| + base::HashMap::Entry* e = chunk_map_.Lookup(reinterpret_cast<void*>(key),
|
| + static_cast<uint32_t>(key));
|
| if (e != NULL) {
|
| DCHECK(e->value != NULL);
|
| LargePage* page = reinterpret_cast<LargePage*>(e->value);
|
|
|