Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/svg/SVGUseElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 University of Szeged
  * Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 48 matching lines @@
     , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(SVGLengthMode::Height)))
     , m_haveFiredLoadEvent(false)
     , m_needsShadowTreeRecreation(false)
 {
     ASSERT(hasCustomStyleCallbacks());
 
     addToPropertyMap(m_x);
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
+
+#if ENABLE(OILPAN)
+    ThreadState::current()->registerPreFinalizer(this);
+#endif
 }
 
 PassRefPtrWillBeRawPtr<SVGUseElement> SVGUseElement::create(Document& document)
 {
     // Always build a user agent #shadow-root for SVGUseElement.
     RefPtrWillBeRawPtr<SVGUseElement> use = adoptRefWillBeNoop(new SVGUseElement(document));
     use->ensureUserAgentShadowRoot();
     return use.release();
 }
 
 SVGUseElement::~SVGUseElement()
 {
-    setDocumentResource(0);
 #if !ENABLE(OILPAN)
     clearShadowTree();
     cancelShadowTreeRecreation();
     svgUseLoadEventSender().cancelEvent(this);
+    dispose();
 #endif
 }
 
+void SVGUseElement::dispose()
+{
+    setDocumentResource(nullptr);
+}
+
 DEFINE_TRACE(SVGUseElement)
 {
     visitor->trace(m_x);
     visitor->trace(m_y);
     visitor->trace(m_width);
     visitor->trace(m_height);
     visitor->trace(m_targetElementInstance);
+    visitor->trace(m_resource);
     SVGGraphicsElement::trace(visitor);
     SVGURIReference::trace(visitor);
 }
 
 #if ENABLE(ASSERT)
 static inline bool isWellFormedDocument(Document* document)
 {
     if (document->isXMLDocument())
         return static_cast<XMLDocumentParser*>(document->parser())->wellFormed();
     return true;
@@ skipping 119 matching lines @@
 
     if (SVGURIReference::isKnownAttribute(attrName)) {
         SVGElement::InvalidationGuard invalidationGuard(this);
         if (isStructurallyExternal()) {
             KURL url = document().completeURL(hrefString());
             if (url.hasFragmentIdentifier()) {
                 FetchRequest request(ResourceRequest(url), localName());
                 setDocumentResource(DocumentResource::fetchSVGDocument(request, document().fetcher()));
             }
         } else {
-            setDocumentResource(0);
+            setDocumentResource(nullptr);
         }
 
         invalidateShadowTree();
 
         return;
     }
 
     SVGGraphicsElement::svgAttributeChanged(attrName);
 }
 
@@ skipping 555 matching lines @@
 
 bool SVGUseElement::instanceTreeIsLoading(const SVGElement* targetInstance)
 {
     for (const SVGElement* element = targetInstance; element; element = Traversal<SVGElement>::next(*element, targetInstance)) {
         if (isSVGUseElement(*element) && toSVGUseElement(*element).resourceIsStillLoading())
             return true;
     }
     return false;
 }
 
-void SVGUseElement::setDocumentResource(ResourcePtr<DocumentResource> resource)
+void SVGUseElement::setDocumentResource(PassRefPtrWillBeRawPtr<DocumentResource> resource)
 {
     if (m_resource == resource)
         return;
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 } // namespace blink