| 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 f7091537aa57ef3e1eab05b0c588b3819aa1a74e..95e373a6ad8cf4fe33127f1771e751b11e52b90a 100644
|
| --- a/third_party/WebKit/Source/platform/heap/ThreadState.h
|
| +++ b/third_party/WebKit/Source/platform/heap/ThreadState.h
|
| @@ -33,7 +33,6 @@
|
|
|
| #include "platform/PlatformExport.h"
|
| #include "platform/heap/BlinkGC.h"
|
| -#include "platform/heap/BlinkGCInterruptor.h"
|
| #include "platform/heap/ThreadingTraits.h"
|
| #include "public/platform/WebThread.h"
|
| #include "wtf/AddressSanitizer.h"
|
| @@ -319,11 +318,7 @@ class PLATFORM_EXPORT ThreadState {
|
| // safePoint() method;
|
| // - use SafePointScope around long running loops that have no safePoint()
|
| // invocation inside, such loops must not touch any heap object;
|
| - // - register an BlinkGCInterruptor that can interrupt long running loops
|
| - // that have no calls to safePoint and are not wrapped in a SafePointScope
|
| - // (e.g. BlinkGCInterruptor for JavaScript code)
|
| //
|
| -
|
| // Check if GC is requested by another thread and pause this thread if this is
|
| // the case. Can only be called when current thread is in a consistent state.
|
| void safePoint(BlinkGC::StackState);
|
| @@ -332,8 +327,6 @@ class PLATFORM_EXPORT ThreadState {
|
| void enterSafePoint(BlinkGC::StackState, void*);
|
| void leaveSafePoint();
|
|
|
| - void addInterruptor(std::unique_ptr<BlinkGCInterruptor>);
|
| -
|
| void recordStackEnd(intptr_t* endOfStack) { m_endOfStack = endOfStack; }
|
|
|
| // Get one of the heap structures for this thread.
|
| @@ -608,11 +601,6 @@ class PLATFORM_EXPORT ThreadState {
|
|
|
| void reportMemoryToV8();
|
|
|
| - // Should only be called under protection of threadAttachMutex().
|
| - const Vector<std::unique_ptr<BlinkGCInterruptor>>& interruptors() const {
|
| - return m_interruptors;
|
| - }
|
| -
|
| friend class SafePointBarrier;
|
| friend class SafePointScope;
|
|
|
| @@ -636,7 +624,6 @@ class PLATFORM_EXPORT ThreadState {
|
|
|
| void* m_safePointScopeMarker;
|
| Vector<Address> m_safePointStackCopy;
|
| - Vector<std::unique_ptr<BlinkGCInterruptor>> m_interruptors;
|
| bool m_sweepForbidden;
|
| size_t m_noAllocationCount;
|
| size_t m_gcForbiddenCount;
|
|
|