Oilpan: Move the EventListener hierarchy to Oilpan's heap

Source/core/html/ImageDocument.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 38 matching lines @@
 #include <limits>
 
 using namespace std;
 
 namespace blink {
 
 using namespace HTMLNames;
 
 class ImageEventListener : public EventListener {
 public:
-    static PassRefPtr<ImageEventListener> create(ImageDocument* document) { return adoptRef(new ImageEventListener(document)); }
+    static PassRefPtrWillBeRawPtr<ImageEventListener> create(ImageDocument* document)
+    {
+        return adoptRefWillBeNoop(new ImageEventListener(document));
+    }
     static const ImageEventListener* cast(const EventListener* listener)
     {
         return listener->type() == ImageEventListenerType
             ? static_cast<const ImageEventListener*>(listener)
             : 0;
     }
 
     virtual bool operator==(const EventListener& other);
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_doc);
+        EventListener::trace(visitor);
+    }
+
 private:
     ImageEventListener(ImageDocument* document)
         : EventListener(ImageEventListenerType)
         , m_doc(document)
     {
     }
 
     virtual void handleEvent(ExecutionContext*, Event*);
 
-    ImageDocument* m_doc;
+    RawPtrWillBeMember<ImageDocument> m_doc;
 };
 
 class ImageDocumentParser : public RawDataDocumentParser {
 public:
     static PassRefPtrWillBeRawPtr<ImageDocumentParser> create(ImageDocument* document)
     {
         return adoptRefWillBeNoop(new ImageDocumentParser(document));
     }
 
     ImageDocument* document() const
@@ skipping 131 matching lines @@
     m_imageElement->setAttribute(styleAttr, "-webkit-user-select: none");
     // If the image is multipart, we neglect to mention to the HTMLImageElement that it's in an
     // ImageDocument, so that it requests the image normally.
     if (!loadingMultipartContent)
         m_imageElement->setLoadingImageDocument();
     m_imageElement->setSrc(url().string());
     body->appendChild(m_imageElement.get());
 
     if (shouldShrinkToFit()) {
         // Add event listeners
-        RefPtr<EventListener> listener = ImageEventListener::create(this);
+        RefPtrWillBeRawPtr<EventListener> listener = ImageEventListener::create(this);
         if (LocalDOMWindow* domWindow = this->domWindow())
             domWindow->addEventListener("resize", listener, false);
         if (m_shrinkToFitMode == Desktop)
             m_imageElement->addEventListener("click", listener.release(), false);
     }
 
     rootElement->appendChild(head);
     rootElement->appendChild(body);
     if (loadingMultipartContent)
         finishedParsing();
@@ skipping 202 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener)
 {
     if (const ImageEventListener* imageEventListener = ImageEventListener::cast(&listener))
         return m_doc == imageEventListener->m_doc;
     return false;
 }
 
 }