[heap] Untangle Marking and friends from heap dependencies.

src/heap/remembered-set.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/remembered-set.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
 #include "src/heap/mark-compact.h"
 #include "src/heap/slot-set.h"
 #include "src/heap/spaces.h"
@@ skipping 13 matching lines @@
         Object** slot = reinterpret_cast<Object**>(addr);
         return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
       });
     }
   }
   for (MemoryChunk* chunk : *heap->code_space()) {
     TypedSlotSet* slots = GetTypedSlotSet(chunk);
     if (slots != nullptr) {
       slots->Iterate(
           [heap, chunk](SlotType type, Address host_addr, Address addr) {
-            if (Marking::IsBlack(Marking::MarkBitFrom(host_addr))) {
+            if (Marking::IsBlack(ObjectMarking::MarkBitFrom(host_addr))) {
               return KEEP_SLOT;
             } else {
               return REMOVE_SLOT;
             }
           });
     }
   }
   if (Heap::ShouldZapGarbage()) {
     // Need to filter invalid slots as we overwrite them with zap values in
     // during sweeping which runs concurrently with pointer updating.
@@ skipping 36 matching lines @@
 bool RememberedSet<direction>::IsValidSlot(Heap* heap, MemoryChunk* chunk,
                                            Object** slot) {
   STATIC_ASSERT(direction == OLD_TO_NEW);
   Object* object = *slot;
   if (!heap->InNewSpace(object)) {
     return false;
   }
   HeapObject* heap_object = HeapObject::cast(object);
   // If the target object is not black, the source slot must be part
   // of a non-black (dead) object.
-  return Marking::IsBlack(Marking::MarkBitFrom(heap_object)) &&
+  return Marking::IsBlack(ObjectMarking::MarkBitFrom(heap_object)) &&
          heap->mark_compact_collector()->IsSlotInBlackObject(
              chunk, reinterpret_cast<Address>(slot));
 }
 
 template void RememberedSet<OLD_TO_NEW>::ClearInvalidSlots(Heap* heap);
 template void RememberedSet<OLD_TO_NEW>::VerifyValidSlots(Heap* heap);
 template void RememberedSet<OLD_TO_OLD>::VerifyValidSlots(Heap* heap);
 
 }  // namespace internal
 }  // namespace v8