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

Unified Diff: Source/core/svg/SVGFEImageElement.cpp

Issue 169103002: Drop [LegacyImplementedInBaseClass] from SVGURIReference IDL interface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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: Source/core/svg/SVGFEImageElement.cpp
diff --git a/Source/core/svg/SVGFEImageElement.cpp b/Source/core/svg/SVGFEImageElement.cpp
index 3f2b9a8b2b8529b136bf74f7566f8234bdd1da7a..910af30fe176a5b0e4cefaee30852c43342567b1 100644
--- a/Source/core/svg/SVGFEImageElement.cpp
+++ b/Source/core/svg/SVGFEImageElement.cpp
@@ -42,12 +42,11 @@ END_REGISTER_ANIMATED_PROPERTIES
inline SVGFEImageElement::SVGFEImageElement(Document& document)
: SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document)
+ , SVGURIReference(this)
, m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
- , m_href(SVGAnimatedString::create(this, XLinkNames::hrefAttr, SVGString::create()))
{
ScriptWrappable::init(this);
addToPropertyMap(m_preserveAspectRatio);
- addToPropertyMap(m_href);
registerAnimatedPropertiesForSVGFEImageElement();
}
@@ -81,7 +80,7 @@ void SVGFEImageElement::clearResourceReferences()
void SVGFEImageElement::fetchImageResource()
{
- FetchRequest request(ResourceRequest(ownerDocument()->completeURL(m_href->currentValue()->value())), localName());
+ FetchRequest request(ResourceRequest(ownerDocument()->completeURL(hrefString())), localName());
m_cachedImage = document().fetcher()->fetchImage(request);
if (m_cachedImage)
@@ -95,7 +94,7 @@ void SVGFEImageElement::buildPendingResource()
return;
AtomicString id;
- Element* target = SVGURIReference::targetElementFromIRIString(m_href->currentValue()->value(), document(), &id);
+ Element* target = SVGURIReference::targetElementFromIRIString(hrefString(), document(), &id);
if (!target) {
if (id.isEmpty())
fetchImageResource();
@@ -133,8 +132,7 @@ void SVGFEImageElement::parseAttribute(const QualifiedName& name, const AtomicSt
if (name == SVGNames::preserveAspectRatioAttr) {
m_preserveAspectRatio->setBaseValueAsString(value, parseError);
- } else if (name.matches(XLinkNames::hrefAttr)) {
- m_href->setBaseValueAsString(value, parseError);
+ } else if (SVGURIReference::parseAttribute(name, value, parseError)) {
} else {
ASSERT_NOT_REACHED();
}
@@ -197,7 +195,7 @@ PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil
{
if (m_cachedImage)
return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer(renderer()), m_preserveAspectRatio->currentValue());
- return FEImage::createWithIRIReference(filter, document(), m_href->currentValue()->value(), m_preserveAspectRatio->currentValue());
+ return FEImage::createWithIRIReference(filter, document(), hrefString(), m_preserveAspectRatio->currentValue());
}
}

Powered by Google App Engine
This is Rietveld 408576698