Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 21 matching lines @@
 namespace blink {
 
 using SVGUseEventSender = EventSender<SVGUseElement>;
 
 class SVGUseElement final : public SVGGraphicsElement,
     public SVGURIReference,
     public DocumentResourceClient {
 
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SVGUseElement);
+    WILL_BE_USING_PRE_FINALIZER(SVGUseElement, dispose);
 public:
     static PassRefPtrWillBeRawPtr<SVGUseElement> create(Document&);
     ~SVGUseElement() override;
 
     void invalidateShadowTree();
 
     // Return the element that should be used for clipping,
     // or null if a valid clip element is not directly referenced.
     SVGGraphicsElement* targetGraphicsElementForClipping() const;
 
     SVGAnimatedLength* x() const { return m_x.get(); }
     SVGAnimatedLength* y() const { return m_y.get(); }
     SVGAnimatedLength* width() const { return m_width.get(); }
     SVGAnimatedLength* height() const { return m_height.get(); }
 
     void buildPendingResource() override;
 
     void dispatchPendingEvent(SVGUseEventSender*);
     void toClipPath(Path&) const;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit SVGUseElement(Document&);
 
+    void dispose();
+
     FloatRect getBBox() override;
 
     bool isPresentationAttribute(const QualifiedName&) const override;
     void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) override;
     bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const override;
 
     bool isStructurallyExternal() const override { return !hrefString().isNull() && isExternalURIReference(hrefString(), document()); }
 
     InsertionNotificationRequest insertedInto(ContainerNode*) override;
     void removedFrom(ContainerNode*) override;
@@ skipping 20 matching lines @@
     void transferUseAttributesToReplacedElement(SVGElement* from, SVGElement* to) const;
 
     void invalidateDependentShadowTrees();
 
     bool resourceIsStillLoading() const;
     Document* externalDocument() const;
     bool instanceTreeIsLoading(const SVGElement*);
     void notifyFinished(Resource*) override;
     String debugName() const override { return "SVGUseElement"; }
     TreeScope* referencedScope() const;
-    void setDocumentResource(ResourcePtr<DocumentResource>);
+    void setDocumentResource(PassRefPtrWillBeRawPtr<DocumentResource>);
 
     RefPtrWillBeMember<SVGAnimatedLength> m_x;
     RefPtrWillBeMember<SVGAnimatedLength> m_y;
     RefPtrWillBeMember<SVGAnimatedLength> m_width;
     RefPtrWillBeMember<SVGAnimatedLength> m_height;
 
     bool m_haveFiredLoadEvent;
     bool m_needsShadowTreeRecreation;
     RefPtrWillBeMember<SVGElement> m_targetElementInstance;
-    ResourcePtr<DocumentResource> m_resource;
+    RefPtrWillBeMember<DocumentResource> m_resource;
 };
 
 } // namespace blink
 
 #endif // SVGUseElement_h