[heap] Use ObjectMarking in TransferMark.

src/heap/incremental-marking.h

 // Copyright 2012 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.
 
 #ifndef V8_HEAP_INCREMENTAL_MARKING_H_
 #define V8_HEAP_INCREMENTAL_MARKING_H_
 
 #include "src/cancelable-task.h"
 #include "src/execution.h"
 #include "src/heap/heap.h"
@@ skipping 167 matching lines @@
   void ClearIdleMarkingDelayCounter();
 
   bool IsIdleMarkingDelayCounterLimitReached();
 
   static void MarkGrey(Heap* heap, HeapObject* object);
 
   static void MarkBlack(HeapObject* object, int size);
 
   static void TransferMark(Heap* heap, HeapObject* from, HeapObject* to);
 
-  // Returns true if the color transfer requires live bytes updating.
-  INLINE(static bool TransferColor(HeapObject* from, HeapObject* to,
+  INLINE(static void TransferColor(HeapObject* from, HeapObject* to,
                                    int size)) {
-    MarkBit from_mark_bit = ObjectMarking::MarkBitFrom(from);
-    MarkBit to_mark_bit = ObjectMarking::MarkBitFrom(to);
-
-    if (Marking::IsBlack(to_mark_bit)) {
+    if (ObjectMarking::IsBlack(to)) {
       DCHECK(to->GetHeap()->incremental_marking()->black_allocation());
-      return false;
+      return;
     }
 
-    DCHECK(Marking::IsWhite(to_mark_bit));
-    if (from_mark_bit.Get()) {
-      to_mark_bit.Set();
-      if (from_mark_bit.Next().Get()) {
-        to_mark_bit.Next().Set();
-        return true;
-      }
+    DCHECK(ObjectMarking::IsWhite(to));
+    if (ObjectMarking::IsGrey(from)) {
+      ObjectMarking::WhiteToGrey(to);
+    } else if (ObjectMarking::IsBlack(from)) {
+      ObjectMarking::WhiteToBlack(to);
     }
-    return false;
   }
 
   void IterateBlackObject(HeapObject* object);
 
   Heap* heap() const { return heap_; }
 
   IncrementalMarkingJob* incremental_marking_job() {
     return &incremental_marking_job_;
   }
 
@@ skipping 86 matching lines @@
   IncrementalMarkingJob incremental_marking_job_;
   Observer new_generation_observer_;
   Observer old_generation_observer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_INCREMENTAL_MARKING_H_