Oilpan: Move the EventListener hierarchy to Oilpan's heap

Source/core/xml/DocumentXSLT.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/xml/DocumentXSLT.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8AbstractEventListener.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/dom/ProcessingInstruction.h"
 #include "core/events/Event.h"
 #include "core/events/EventListener.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/xml/XSLStyleSheet.h"
 #include "core/xml/XSLTProcessor.h"
 
 namespace blink {
 
-class DOMContentLoadedListener final : public ProcessingInstruction::DetachableEventListener, public V8AbstractEventListener {
+class DOMContentLoadedListener final : public V8AbstractEventListener, public ProcessingInstruction::DetachableEventListener {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMContentLoadedListener);
 public:
-    static PassRefPtr<DOMContentLoadedListener> create(ScriptState* scriptState, ProcessingInstruction* pi)
+    static PassRefPtrWillBeRawPtr<DOMContentLoadedListener> create(ScriptState* scriptState, ProcessingInstruction* pi)
     {
-        return adoptRef(new DOMContentLoadedListener(scriptState, pi));
+        return adoptRefWillBeNoop(new DOMContentLoadedListener(scriptState, pi));
     }
 
+#if !ENABLE(OILPAN)
     using V8AbstractEventListener::ref;
     using V8AbstractEventListener::deref;
+#endif
 
     virtual bool operator==(const EventListener&)
     {
         return true;
     }
 
     virtual void handleEvent(ScriptState* scriptState, Event* event)
     {
         ASSERT(RuntimeEnabledFeatures::xsltEnabled());
         ASSERT(event->type() == "DOMContentLoaded");
@@ skipping 18 matching lines @@
     void detach() override
     {
         m_processingInstruction = nullptr;
     }
 
     EventListener* toEventListener() override
     {
         return this;
     }
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_processingInstruction);
+        V8AbstractEventListener::trace(visitor);
+        ProcessingInstruction::DetachableEventListener::trace(visitor);
+    }
+
 private:
     DOMContentLoadedListener(ScriptState* scriptState, ProcessingInstruction* pi)
         : V8AbstractEventListener(false, scriptState->world(), scriptState->isolate())
         , m_processingInstruction(pi)
     {
     }
 
+#if !ENABLE(OILPAN)
     void refDetachableEventListener() override { ref(); }
     void derefDetachableEventListener() override { deref(); }
+#endif
 
     virtual v8::Local<v8::Value> callListenerFunction(ScriptState*, v8::Local<v8::Value>, Event*)
     {
         ASSERT_NOT_REACHED();
         return v8::Local<v8::Value>();
     }
 
     // If this event listener is attached to a ProcessingInstruction, keep a
     // weak reference back to it. That ProcessingInstruction is responsible for
     // detaching itself and clear out the reference.
-    //
-    // FIXME: Oilpan: when EventListener is on the heap, make this a WeakMember<>,
-    // which will remove the need for explicit detachment.
-    ProcessingInstruction* m_processingInstruction;
+    RawPtrWillBeMember<ProcessingInstruction> m_processingInstruction;
 };
 
 DocumentXSLT::DocumentXSLT()
     : m_transformSourceDocument(nullptr)
 {
 }
 
 void DocumentXSLT::applyXSLTransform(Document& document, ProcessingInstruction* pi)
 {
     ASSERT(!pi->isLoading());
@@ skipping 30 matching lines @@
 
 bool DocumentXSLT::processingInstructionInsertedIntoDocument(Document& document, ProcessingInstruction* pi)
 {
     if (!pi->isXSL())
         return false;
 
     if (!RuntimeEnabledFeatures::xsltEnabled() || !document.frame())
         return true;
 
     ScriptState* scriptState = ScriptState::forMainWorld(document.frame());
-    RefPtr<DOMContentLoadedListener> listener = DOMContentLoadedListener::create(scriptState, pi);
+    RefPtrWillBeRawPtr<DOMContentLoadedListener> listener = DOMContentLoadedListener::create(scriptState, pi);
     document.addEventListener(EventTypeNames::DOMContentLoaded, listener, false);
     ASSERT(!pi->eventListenerForXSLT());
     pi->setEventListenerForXSLT(listener.release());
     return true;
 }
 
 bool DocumentXSLT::processingInstructionRemovedFromDocument(Document& document, ProcessingInstruction* pi)
 {
     if (!pi->isXSL())
         return false;
@@ skipping 41 matching lines @@
     return *supplement;
 }
 
 DEFINE_TRACE(DocumentXSLT)
 {
     visitor->trace(m_transformSourceDocument);
     WillBeHeapSupplement<Document>::trace(visitor);
 }
 
 } // namespace blink