Trace ScriptWrappableVisitor.m_markingDeque by oilpan gc

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 400 matching lines @@
         ASSERT(checkThread());
         // Ignore pre-finalizers called during pre-finalizers or destructors.
         if (sweepForbidden())
             return;
         ASSERT(m_orderedPreFinalizers.contains(PreFinalizer(self, T::invokePreFinalizer)));
         m_orderedPreFinalizers.remove(PreFinalizer(self, &T::invokePreFinalizer));
     }
 
     void shouldFlushHeapDoesNotContainCache() { m_shouldFlushHeapDoesNotContainCache = true; }
 
-    void registerTraceDOMWrappers(v8::Isolate* isolate, void (*traceDOMWrappers)(v8::Isolate*, Visitor*))
+    void registerTraceDOMWrappers(v8::Isolate* isolate,
+        void (*traceDOMWrappers)(v8::Isolate*, Visitor*),
+        void (*cleanTraceWrappersMarkingDeque)(v8::Isolate*))
     {
         m_isolate = isolate;
         m_traceDOMWrappers = traceDOMWrappers;
+        m_cleanTraceWrappersMarkingDeque = cleanTraceWrappersMarkingDeque;
     }
 
     // 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
     // the object being constructed cannot be safely traced & marked
     // fully should a GC be allowed while its subclasses are being
     // constructed.
     void enterGCForbiddenScopeIfNeeded(GarbageCollectedMixinConstructorMarker* gcMixinMarker)
     {
@@ skipping 82 matching lines @@
 
     void resetHeapCounters();
     void increaseAllocatedObjectSize(size_t);
     void decreaseAllocatedObjectSize(size_t);
     void increaseMarkedObjectSize(size_t);
 
     void callThreadShutdownHooks();
 
     v8::Isolate* isolate() const { return m_isolate; }
 
+    void cleanTraceWrappersMarkingDeque()
+    {
+        if (m_cleanTraceWrappersMarkingDeque) {
+            m_cleanTraceWrappersMarkingDeque(m_isolate);
+        }
+    }
+
 private:
     enum SnapshotType {
         HeapSnapshot,
         FreelistSnapshot
     };
 
     ThreadState(bool perThreadHeapEnabled);
     ~ThreadState();
 
     NO_SANITIZE_ADDRESS void copyStackUntilSafePointScope();
@@ skipping 112 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*);
+    void (*m_cleanTraceWrappersMarkingDeque)(v8::Isolate*);
 
 #if defined(ADDRESS_SANITIZER)
     void* m_asanFakeStack;
 #endif
 
     // PersistentNodes that are stored in static references;
     // references that either have to be cleared upon the thread
     // detaching from Oilpan and shutting down or references we
     // have to clear before initiating LSan's leak detection.
     HashMap<PersistentNode*, PersistentClearCallback> m_staticPersistents;
@@ skipping 32 matching lines @@
 
 template<> class ThreadStateFor<AnyThread> {
     STATIC_ONLY(ThreadStateFor);
 public:
     static ThreadState* state() { return ThreadState::current(); }
 };
 
 } // namespace blink
 
 #endif // ThreadState_h