Revert of [heap] Invoke incremental marking step before allocation.

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 81 matching lines @@
 
   void Epilogue();
 
   // Performs incremental marking steps until deadline_in_ms is reached. It
   // returns the remaining time that cannot be used for incremental marking
   // anymore because a single step would exceed the deadline.
   double AdvanceIncrementalMarking(double deadline_in_ms,
                                    CompletionAction completion_action,
                                    ForceCompletionAction force_completion,
                                    StepOrigin step_origin);
-  void AdvanceIncrementalMarkingOnAllocation();
 
   // It's hard to know how much work the incremental marker should do to make
   // progress in the face of the mutator creating new work for it.  We start
   // of at a moderate rate of work and gradually increase the speed of the
   // incremental marker until it completes.
   // Do some marking every time this much memory has been allocated or that many
   // heavy (color-checking) write barriers have been invoked.
   static const size_t kAllocatedThreshold = 64 * KB;
 
   static const int kStepSizeInMs = 1;
@@ skipping 99 matching lines @@
     return &incremental_marking_job_;
   }
 
   bool black_allocation() { return black_allocation_; }
 
   void StartBlackAllocationForTesting() { StartBlackAllocation(); }
 
   void AbortBlackAllocation();
 
  private:
+  class Observer : public AllocationObserver {
+   public:
+    Observer(IncrementalMarking& incremental_marking, intptr_t step_size)
+        : AllocationObserver(step_size),
+          incremental_marking_(incremental_marking) {}
+
+    void Step(int bytes_allocated, Address, size_t) override {
+      incremental_marking_.AdvanceIncrementalMarkingOnAllocation();
+    }
+
+   private:
+    IncrementalMarking& incremental_marking_;
+  };
+
   int64_t SpaceLeftInOldSpace();
 
   void StartMarking();
 
   void StartBlackAllocation();
   void FinishBlackAllocation();
 
   void MarkRoots();
   void MarkObjectGroups();
   void ProcessWeakCells();
@@ skipping 17 matching lines @@
   INLINE(void ProcessMarkingDeque());
 
   INLINE(intptr_t ProcessMarkingDeque(
       intptr_t bytes_to_process,
       ForceCompletionAction completion = DO_NOT_FORCE_COMPLETION));
 
   INLINE(void VisitObject(Map* map, HeapObject* obj, int size));
 
   void IncrementIdleMarkingDelayCounter();
 
+  void AdvanceIncrementalMarkingOnAllocation();
+
   size_t StepSizeToKeepUpWithAllocations();
   size_t StepSizeToMakeProgress();
 
   Heap* heap_;
 
   State state_;
 
   double start_time_ms_;
   size_t initial_old_generation_size_;
   size_t old_generation_allocation_counter_;
   size_t bytes_allocated_;
   size_t bytes_marked_ahead_of_schedule_;
   size_t unscanned_bytes_of_large_object_;
 
   int idle_marking_delay_counter_;
   int incremental_marking_finalization_rounds_;
 
   bool is_compacting_;
   bool should_hurry_;
   bool was_activated_;
   bool black_allocation_;
   bool finalize_marking_completed_;
 
   GCRequestType request_type_;
 
   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_