Perform TODO(gc) cleanup for TODO-lockdown.

src/spaces-inl.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 198 matching lines @@
       if (chunk->Contains(addr)) {
         return chunk;
       }
     }
   }
   UNREACHABLE();
   return NULL;
 }
 
 
-// TODO(gc) ISOLATESMERGE HEAP
-PointerChunkIterator::PointerChunkIterator()
+PointerChunkIterator::PointerChunkIterator(Heap* heap)
     : state_(kOldPointerState),
-      old_pointer_iterator_(HEAP->old_pointer_space()),
-      map_iterator_(HEAP->map_space()),
-      lo_iterator_(HEAP->lo_space()) { }
+      old_pointer_iterator_(heap->old_pointer_space()),
+      map_iterator_(heap->map_space()),
+      lo_iterator_(heap->lo_space()) { }
 
 
 Page* Page::next_page() {
   ASSERT(next_chunk()->owner() == owner());
   return static_cast<Page*>(next_chunk());
 }
 
 
 Page* Page::prev_page() {
   ASSERT(prev_chunk()->owner() == owner());
@@ skipping 112 matching lines @@
       string->address() + StringType::SizeFor(length);
   string->set_length(length);
   if (Marking::IsBlack(Marking::MarkBitFrom(string))) {
     int delta = static_cast<int>(old_top - allocation_info_.top);
     MemoryChunk::IncrementLiveBytes(string->address(), -delta);
   }
 }
 
 
 bool FreeListNode::IsFreeListNode(HeapObject* object) {
-  // TODO(gc) ISOLATES MERGE
-  return object->map() == HEAP->raw_unchecked_free_space_map()
-      || object->map() == HEAP->raw_unchecked_one_pointer_filler_map()
-      || object->map() == HEAP->raw_unchecked_two_pointer_filler_map();
+  Map* map = object->map();
+  Heap* heap = object->GetHeap();
+  return map == heap->raw_unchecked_free_space_map()
+      || map == heap->raw_unchecked_one_pointer_filler_map()
+      || map == heap->raw_unchecked_two_pointer_filler_map();
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPACES_INL_H_