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

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

Issue 2905233002: Remove the lifetime hack in ImageLoader where it keeps its assoc element alive (Closed)
Patch Set: Rebase Created 3 years, 7 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 50af0dbf38af6ecbcc1368e90d686f228c67d271..18a375cca9363ea6545daea4060f1894a528b3bd 100644
--- a/third_party/WebKit/Source/core/svg/SVGImageElement.h
+++ b/third_party/WebKit/Source/core/svg/SVGImageElement.h
@@ -27,13 +27,16 @@
#include "core/svg/SVGGraphicsElement.h"
#include "core/svg/SVGImageLoader.h"
#include "core/svg/SVGURIReference.h"
+#include "platform/bindings/ActiveScriptWrappable.h"
#include "platform/heap/Handle.h"
namespace blink {
-class CORE_EXPORT SVGImageElement final : public SVGGraphicsElement,
- public ImageElementBase,
- public SVGURIReference {
+class CORE_EXPORT SVGImageElement final
+ : public SVGGraphicsElement,
+ public ImageElementBase,
+ public SVGURIReference,
+ public ActiveScriptWrappable<SVGImageElement> {
DEFINE_WRAPPERTYPEINFO();
USING_GARBAGE_COLLECTED_MIXIN(SVGImageElement);
@@ -51,6 +54,10 @@ class CORE_EXPORT SVGImageElement final : public SVGGraphicsElement,
return preserve_aspect_ratio_.Get();
}
+ bool HasPendingActivity() const final {
+ return GetImageLoader().HasPendingActivity();
+ }
+
// Exposed for testing.
ImageResourceContent* CachedImage() const {
return GetImageLoader().GetImage();
« no previous file with comments | « third_party/WebKit/Source/core/loader/ImageLoader.cpp ('k') | third_party/WebKit/Source/core/svg/SVGImageElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698