Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Unified Diff: third_party/WebKit/Source/core/svg/SVGImageElement.h

Issue 2344563002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive
Patch Set: fix Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/svg/SVGImageElement.h
diff --git a/third_party/WebKit/Source/core/svg/SVGImageElement.h b/third_party/WebKit/Source/core/svg/SVGImageElement.h
index 7da4824212e3148a8c16cdf5de5c0a7eefdf059f..744fc6ecadac60fd8f3e94308512490b7550bf4b 100644
--- a/third_party/WebKit/Source/core/svg/SVGImageElement.h
+++ b/third_party/WebKit/Source/core/svg/SVGImageElement.h
@@ -21,6 +21,7 @@
#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"
@@ -32,8 +33,7 @@
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:
@@ -48,6 +48,8 @@ public:
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(); }
« no previous file with comments | « third_party/WebKit/Source/core/loader/ImageLoader.cpp ('k') | third_party/WebKit/Source/core/svg/SVGImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698