[heap] Make the current GCCallbackFlags are part of {Heap}.

src/heap/heap.h

Index: src/heap/heap.h
diff --git a/src/heap/heap.h b/src/heap/heap.h
index 5c825e77804ad06cd30b1f3ae3ae6b4d562bcd86..7417267ed16f2c11832a60748a7f55e09900ac8a 100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -1362,8 +1362,9 @@ class Heap {
 
   // Starts incremental marking assuming incremental marking is currently
   // stopped.
-  void StartIncrementalMarking(int gc_flags,
-                               const GCCallbackFlags gc_callback_flags,
+  void StartIncrementalMarking(int gc_flags = kNoGCFlags,
+                               const GCCallbackFlags gc_callback_flags =
+                                   GCCallbackFlags::kNoGCCallbackFlags,
                                const char* reason = nullptr);
 
   // Performs incremental marking steps of step_size_in_bytes as long as
@@ -1678,6 +1679,14 @@ class Heap {
            !ShouldAbortIncrementalMarking());
   }
 

[Hannes Payer (out of office), 2015/08/25 09:21:20]

The local variable is just used within heap. The getter/setter are not needed.

[Michael Lippautz, 2015/08/25 10:33:39]

Done.

+  GCCallbackFlags current_gc_callback_flags() {
+    return current_gc_callback_flags_;
+  }
+
+  void set_current_gc_callback_flags(GCCallbackFlags callback_flags) {
+    current_gc_callback_flags_ = callback_flags;
+  }
+
   inline bool ShouldReduceMemory() const {
     return current_gc_flags_ & kReduceMemoryFootprintMask;
   }
@@ -2346,6 +2355,10 @@ class Heap {
   // Currently set GC flags that are respected by all GC components.
   int current_gc_flags_;
 
+  // Currently set GC callback flags that are used to pass information between
+  // the embedder and V8's GC.
+  GCCallbackFlags current_gc_callback_flags_;
+
   ExternalStringTable external_string_table_;
 
   VisitorDispatchTable<ScavengingCallback> scavenging_visitors_table_;