Oilpan: Add ThreadState cleanup callbacks for static thread-specific persistent.

third_party/WebKit/Source/platform/heap/ThreadState.h

 /*
  * Copyright (C) 2013 Google Inc. 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
@@ skipping 21 matching lines @@
 #define ThreadState_h
 
 #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"
 #include "wtf/Allocator.h"
 #include "wtf/Forward.h"
+#include "wtf/Functional.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/ThreadSpecific.h"
 #include "wtf/Threading.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace v8 {
 class Isolate;
 };
 
@@ skipping 446 matching lines @@
     }
     void allocationPointAdjusted(int arenaIndex);
     void promptlyFreed(size_t gcInfoIndex);
 
     void accumulateSweepingTime(double time) { m_accumulatedSweepingTime += time; }
 
 #if OS(WIN) && COMPILER(MSVC)
     size_t threadStackSize();
 #endif
 
+    // Registers a closure that will be called while the thread is shutting down
+    // (i.e. ThreadState::isTerminating will be true), in order to allow for any
+    // persistent handles that should be cleared.
+    void registerCleanupHook(PassOwnPtr<SameThreadClosure>);

[haraken, 2016/04/14 23:46:15]

registerCleanupHook => registerThreadShutdownHooks

+
 #if defined(LEAK_SANITIZER)
     void registerStaticPersistentNode(PersistentNode*);
     void releaseStaticPersistentNodes();
 
     void enterStaticReferenceRegistrationDisabledScope();
     void leaveStaticReferenceRegistrationDisabledScope();
 #endif
 
     void resetHeapCounters();
     void increaseAllocatedObjectSize(size_t);
@@ skipping 133 matching lines @@
     CallbackStack* m_threadLocalWeakCallbackStack;
 
     // Pre-finalizers are called in the reverse order in which they are
     // registered by the constructors (including constructors of Mixin objects)
     // for an object, by processing the m_orderedPreFinalizers back-to-front.
     ListHashSet<PreFinalizer> m_orderedPreFinalizers;
 
     v8::Isolate* m_isolate;
     void (*m_traceDOMWrappers)(v8::Isolate*, Visitor*);
 
+    // Invoked while the thread is terminating. Intended to be used to free
+    // persistent pointers into the thread's heap.
+    Vector<OwnPtr<SameThreadClosure>> m_cleanupHooks;

[haraken, 2016/04/14 23:46:15]

m_cleanupHooks => m_threadShutdownHooks

+
 #if defined(ADDRESS_SANITIZER)
     void* m_asanFakeStack;
 #endif
 
 #if defined(LEAK_SANITIZER)
     // PersistentNodes that are stored in static references;
     // references we have to clear before initiating LSan's leak detection.
     HashSet<PersistentNode*> m_staticPersistents;
 
     // Count that controls scoped disabling of persistent registration.
@@ skipping 29 matching lines @@
 
 template<> class ThreadStateFor<AnyThread> {
     STATIC_ONLY(ThreadStateFor);
 public:
     static ThreadState* state() { return ThreadState::current(); }
 };
 
 } // namespace blink
 
 #endif // ThreadState_h