Index: Source/core/svg/graphics/filters/SVGFEImage.cpp |
diff --git a/Source/core/svg/graphics/filters/SVGFEImage.cpp b/Source/core/svg/graphics/filters/SVGFEImage.cpp |
index 1e5733aa76f8410e7d143cdec0aeb31259a967ef..3fe636604c8fd357b423fd481f87ac36097185aa 100644 |
--- a/Source/core/svg/graphics/filters/SVGFEImage.cpp |
+++ b/Source/core/svg/graphics/filters/SVGFEImage.cpp |
@@ -40,7 +40,7 @@ |
namespace blink { |
-FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
+FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, PassRefPtrWillBeRawPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
: FilterEffect(filter) |
, m_image(image) |
, m_treeScope(0) |
@@ -48,7 +48,7 @@ FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, PassRefPtr<SVGPreserve |
{ |
} |
-FEImage::FEImage(Filter* filter, TreeScope& treeScope, const String& href, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
+FEImage::FEImage(Filter* filter, TreeScope& treeScope, const String& href, PassRefPtrWillBeRawPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
: FilterEffect(filter) |
, m_treeScope(&treeScope) |
, m_href(href) |
@@ -56,14 +56,20 @@ FEImage::FEImage(Filter* filter, TreeScope& treeScope, const String& href, PassR |
{ |
} |
-PassRefPtr<FEImage> FEImage::createWithImage(Filter* filter, PassRefPtr<Image> image, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
+void FEImage::trace(Visitor* visitor) |
{ |
- return adoptRef(new FEImage(filter, image, preserveAspectRatio)); |
+ visitor->trace(m_preserveAspectRatio); |
+ FilterEffect::trace(visitor); |
} |
-PassRefPtr<FEImage> FEImage::createWithIRIReference(Filter* filter, TreeScope& treeScope, const String& href, PassRefPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
+PassRefPtrWillBeRawPtr<FEImage> FEImage::createWithImage(Filter* filter, PassRefPtr<Image> image, PassRefPtrWillBeRawPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
{ |
- return adoptRef(new FEImage(filter, treeScope, href, preserveAspectRatio)); |
+ return adoptRefWillBeNoop(new FEImage(filter, image, preserveAspectRatio)); |
+} |
+ |
+PassRefPtrWillBeRawPtr<FEImage> FEImage::createWithIRIReference(Filter* filter, TreeScope& treeScope, const String& href, PassRefPtrWillBeRawPtr<SVGPreserveAspectRatio> preserveAspectRatio) |
+{ |
+ return adoptRefWillBeNoop(new FEImage(filter, treeScope, href, preserveAspectRatio)); |
} |
static FloatRect getRendererRepaintRect(RenderObject* renderer) |