Revert r11556 and r11558 to allow roll.

src/incremental-marking.h

-// Copyright 2012 the V8 project authors. All rights reserved.
+// 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
 //       with the distribution.
@@ skipping 135 matching lines @@
   void RecordWriteOfCodeEntrySlow(JSFunction* host, Object** slot, Code* value);
   void RecordCodeTargetPatch(Code* host, Address pc, HeapObject* value);
   void RecordCodeTargetPatch(Address pc, HeapObject* value);
 
   inline void RecordWrites(HeapObject* obj);
 
   inline void BlackToGreyAndUnshift(HeapObject* obj, MarkBit mark_bit);
 
   inline void WhiteToGreyAndPush(HeapObject* obj, MarkBit mark_bit);
 
+  inline void WhiteToGrey(HeapObject* obj, MarkBit mark_bit);
+
   // Does white->black or keeps gray or black color. Returns true if converting
   // white to black.
   inline bool MarkBlackOrKeepGrey(MarkBit mark_bit) {
     ASSERT(!Marking::IsImpossible(mark_bit));
     if (mark_bit.Get()) {
       // Grey or black: Keep the color.
       return false;
     }
     mark_bit.Set();
     ASSERT(Marking::IsBlack(mark_bit));
     return true;
   }
 
-  // Marks the object grey and pushes it on the marking stack.
-  // Returns true if object needed marking and false otherwise.
-  // This is for incremental marking only.
-  INLINE(bool MarkObjectAndPush(HeapObject* obj));
-
-  // Marks the object black without pushing it on the marking stack.
-  // Returns true if object needed marking and false otherwise.
-  // This is for incremental marking only.
-  INLINE(bool MarkObjectWithoutPush(HeapObject* obj));
-
   inline int steps_count() {
     return steps_count_;
   }
 
   inline double steps_took() {
     return steps_took_;
   }
 
   inline double longest_step() {
     return longest_step_;
@@ skipping 71 matching lines @@
   void VisitGlobalContext(Context* ctx, ObjectVisitor* v);
 
   Heap* heap_;
 
   State state_;
   bool is_compacting_;
 
   VirtualMemory* marking_deque_memory_;
   bool marking_deque_memory_committed_;
   MarkingDeque marking_deque_;
-  Marker<IncrementalMarking> marker_;
 
   int steps_count_;
   double steps_took_;
   double longest_step_;
   int64_t old_generation_space_available_at_start_of_incremental_;
   int64_t old_generation_space_used_at_start_of_incremental_;
   int steps_count_since_last_gc_;
   double steps_took_since_last_gc_;
   int64_t bytes_rescanned_;
   bool should_hurry_;
   int allocation_marking_factor_;
   intptr_t bytes_scanned_;
   intptr_t allocated_;
 
   int no_marking_scope_depth_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_INCREMENTAL_MARKING_H_