diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/v8/src/heap/incremental-marking.h | |
parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/v8/src/heap/incremental-marking.h')
-rw-r--r-- | chromium/v8/src/heap/incremental-marking.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/v8/src/heap/incremental-marking.h b/chromium/v8/src/heap/incremental-marking.h index 7ce0ae2379d..5464f129a7e 100644 --- a/chromium/v8/src/heap/incremental-marking.h +++ b/chromium/v8/src/heap/incremental-marking.h @@ -22,7 +22,7 @@ class PagedSpace; enum class StepOrigin { kV8, kTask }; -class IncrementalMarking { +class V8_EXPORT_PRIVATE IncrementalMarking { public: enum State { STOPPED, SWEEPING, MARKING, COMPLETE }; @@ -151,8 +151,7 @@ class IncrementalMarking { INLINE(void RecordWriteOfCodeEntry(JSFunction* host, Object** slot, Code* value)); - V8_EXPORT_PRIVATE void RecordWriteSlow(HeapObject* obj, Object** slot, - Object* value); + void RecordWriteSlow(HeapObject* obj, Object** slot, Object* value); void RecordWriteIntoCodeSlow(Code* host, RelocInfo* rinfo, Object* value); void RecordWriteOfCodeEntrySlow(JSFunction* host, Object** slot, Code* value); void RecordCodeTargetPatch(Code* host, Address pc, HeapObject* value); @@ -184,7 +183,7 @@ class IncrementalMarking { static void MarkBlack(HeapObject* object, int size); - static void TransferMark(Heap* heap, Address old_start, Address new_start); + 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, @@ -298,6 +297,7 @@ class IncrementalMarking { bool was_activated_; bool black_allocation_; bool finalize_marking_completed_; + bool trace_wrappers_toggle_; GCRequestType request_type_; |