Chromium Code Reviews| Index: third_party/WebKit/Source/platform/heap/ThreadState.h |
| diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.h b/third_party/WebKit/Source/platform/heap/ThreadState.h |
| index 456d154a3a689c083b227afc911945329f6f0716..a2612d7252af8783a81aaf34159b9a8c9d3810d8 100644 |
| --- a/third_party/WebKit/Source/platform/heap/ThreadState.h |
| +++ b/third_party/WebKit/Source/platform/heap/ThreadState.h |
| @@ -424,6 +424,15 @@ public: |
| m_traceDOMWrappers = traceDOMWrappers; |
| } |
| + void registerTraceWrappersMarkingDequeTracing(v8::Isolate* isolate, |
| + void (*traceWrappersMarkingDequeTracing)(v8::Isolate*, Visitor*)) |
| + { |
| + // Make sure the isolate set by registerTraceDOMWrapers is the same as |
|
haraken
2016/06/08 08:56:08
Or can we merge the two register functions?
|
| + // ours |
| + CHECK(m_isolate == isolate); |
| + m_traceWrappersMarkingDequeTracing = traceWrappersMarkingDequeTracing; |
| + } |
| + |
| // By entering a gc-forbidden scope, conservative GCs will not |
| // be allowed while handling an out-of-line allocation request. |
| // Intended used when constructing subclasses of GC mixins, where |
| @@ -656,6 +665,7 @@ private: |
| v8::Isolate* m_isolate; |
| void (*m_traceDOMWrappers)(v8::Isolate*, Visitor*); |
| + void (*m_traceWrappersMarkingDequeTracing)(v8::Isolate*, Visitor*); |
| #if defined(ADDRESS_SANITIZER) |
| void* m_asanFakeStack; |