Remove the lifetime hack in ImageLoader where it keeps its assoc element alive

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGImageElement_h
 #define SVGImageElement_h
 
+#include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "core/SVGNames.h"
 #include "core/svg/SVGAnimatedBoolean.h"
 #include "core/svg/SVGAnimatedLength.h"
 #include "core/svg/SVGAnimatedPreserveAspectRatio.h"
 #include "core/svg/SVGGraphicsElement.h"
 #include "core/svg/SVGImageLoader.h"
 #include "core/svg/SVGURIReference.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
-class SVGImageElement final : public SVGGraphicsElement,
-                              public SVGURIReference {
+class SVGImageElement final : public SVGGraphicsElement, public SVGURIReference, public ActiveScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(SVGImageElement);
 public:
     DECLARE_NODE_FACTORY(SVGImageElement);
     DECLARE_VIRTUAL_TRACE();
 
     bool currentFrameHasSingleSecurityOrigin() 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(); }
     SVGAnimatedPreserveAspectRatio* preserveAspectRatio() { return m_preserveAspectRatio.get(); }
 
+    bool hasPendingActivity() const final { return imageLoader().hasPendingActivity(); }
+
     // Exposed for testing.
     ImageResource* cachedImage() const { return imageLoader().image(); }
 
 private:
     explicit SVGImageElement(Document&);
 
     bool isStructurallyExternal() const override { return !hrefString().isNull(); }
 
     bool isPresentationAttribute(const QualifiedName&) const override;
     bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const override;
@@ skipping 20 matching lines @@
     Member<SVGAnimatedLength> m_height;
     Member<SVGAnimatedPreserveAspectRatio> m_preserveAspectRatio;
 
     Member<SVGImageLoader> m_imageLoader;
     bool m_needsLoaderURIUpdate : 1;
 };
 
 } // namespace blink
 
 #endif // SVGImageElement_h