Oilpan: Prepare to move ImageLoader and its subclasses to Oilpan heap.

Source/core/svg/SVGImageElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 21 matching lines @@
 namespace WebCore {
 
 SVGImageElement::SVGImageElement(Document& document)
     : SVGGraphicsElement(SVGNames::imageTag, document)
     , SVGURIReference(this)
     , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(LengthModeWidth), AllowNegativeLengths))
     , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(LengthModeHeight), AllowNegativeLengths))
     , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(LengthModeWidth), ForbidNegativeLengths))
     , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(LengthModeHeight), ForbidNegativeLengths))
     , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
-    , m_imageLoader(this)
+    , m_imageLoader(SVGImageLoader::create(this))
     , m_needsLoaderURIUpdate(true)
 {
     ScriptWrappable::init(this);
 
     addToPropertyMap(m_x);
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
     addToPropertyMap(m_preserveAspectRatio);
 }
 
+void SVGImageElement::trace(Visitor* visitor)
+{
+    visitor->trace(m_imageLoader);
+    SVGGraphicsElement::trace(visitor);
+}
+
 bool SVGImageElement::currentFrameHasSingleSecurityOrigin() const
 {
     if (RenderSVGImage* renderSVGImage = toRenderSVGImage(renderer())) {
         if (renderSVGImage->imageResource()->hasImage()) {
             if (Image* image = renderSVGImage->imageResource()->cachedImage()->image())
                 return image->currentFrameHasSingleSecurityOrigin();
         }
     }
 
     return true;
@@ skipping 66 matching lines @@
     bool isLengthAttribute = attrName == SVGNames::xAttr
                           || attrName == SVGNames::yAttr
                           || attrName == SVGNames::widthAttr
                           || attrName == SVGNames::heightAttr;
 
     if (isLengthAttribute)
         updateRelativeLengthsInformation();
 
     if (SVGURIReference::isKnownAttribute(attrName)) {
         if (inDocument())
-            m_imageLoader.updateFromElementIgnoringPreviousError();
+            imageLoader().updateFromElementIgnoringPreviousError();
         else
             m_needsLoaderURIUpdate = true;
         return;
     }
 
     RenderObject* renderer = this->renderer();
     if (!renderer)
         return;
 
     if (isLengthAttribute) {
@@ skipping 18 matching lines @@
         || m_height->currentValue()->isRelative();
 }
 
 RenderObject* SVGImageElement::createRenderer(RenderStyle*)
 {
     return new RenderSVGImage(this);
 }
 
 bool SVGImageElement::haveLoadedRequiredResources()
 {
-    return !m_needsLoaderURIUpdate && !m_imageLoader.hasPendingActivity();
+    return !m_needsLoaderURIUpdate && !imageLoader().hasPendingActivity();
 }
 
 void SVGImageElement::attach(const AttachContext& context)
 {
     SVGGraphicsElement::attach(context);
 
     if (RenderSVGImage* imageObj = toRenderSVGImage(renderer())) {
         if (imageObj->imageResource()->hasImage())
             return;
 
-        imageObj->imageResource()->setImageResource(m_imageLoader.image());
+        imageObj->imageResource()->setImageResource(imageLoader().image());
     }
 }
 
 Node::InsertionNotificationRequest SVGImageElement::insertedInto(ContainerNode* rootParent)
 {
     SVGGraphicsElement::insertedInto(rootParent);
     if (!rootParent->inDocument())
         return InsertionDone;
 
     // We can only resolve base URIs properly after tree insertion - hence, URI mutations while
     // detached are deferred until this point.
     if (m_needsLoaderURIUpdate) {
-        m_imageLoader.updateFromElementIgnoringPreviousError();
+        imageLoader().updateFromElementIgnoringPreviousError();
         m_needsLoaderURIUpdate = false;
     } else {
         // A previous loader update may have failed to actually fetch the image if the document
         // was inactive. In that case, force a re-update (but don't clear previous errors).
-        if (!m_imageLoader.image())
-            m_imageLoader.updateFromElement();
+        if (!imageLoader().image())
+            imageLoader().updateFromElement();
     }
 
     return InsertionDone;
 }
 
 const AtomicString SVGImageElement::imageSourceURL() const
 {
     return AtomicString(hrefString());
 }
 
 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
 {
-    m_imageLoader.elementDidMoveToNewDocument();
+    imageLoader().elementDidMoveToNewDocument();
     SVGGraphicsElement::didMoveToNewDocument(oldDocument);
 }
 
 }