Merge r10380, r10381 from the bleeding_edge to the 3.7 branch.

src/incremental-marking.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 38 matching lines @@
   explicit IncrementalMarking(Heap* heap);
 
   void TearDown();
 
   State state() {
     ASSERT(state_ == STOPPED || FLAG_incremental_marking);
     return state_;
   }
 
   bool should_hurry() { return should_hurry_; }
+  void set_should_hurry(bool val) { should_hurry_ = val; }
 
   inline bool IsStopped() { return state() == STOPPED; }
 
   INLINE(bool IsMarking()) { return state() >= MARKING; }
 
   inline bool IsMarkingIncomplete() { return state() == MARKING; }
 
   bool WorthActivating();
 
   void Start();
@@ skipping 140 matching lines @@
     no_marking_scope_depth_++;
   }
 
   void LeaveNoMarkingScope() {
     no_marking_scope_depth_--;
   }
 
   void UncommitMarkingDeque();
 
  private:
-  void set_should_hurry(bool val) {
-    should_hurry_ = val;
-  }
-
   int64_t SpaceLeftInOldSpace();
 
   void ResetStepCounters();
 
   enum CompactionFlag { ALLOW_COMPACTION, PREVENT_COMPACTION };
 
   void StartMarking(CompactionFlag flag);
 
   void ActivateIncrementalWriteBarrier(PagedSpace* space);
   static void ActivateIncrementalWriteBarrier(NewSpace* space);
@@ skipping 36 matching lines @@
   intptr_t allocated_;
 
   int no_marking_scope_depth_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_INCREMENTAL_MARKING_H_