Index: Source/core/svg/SVGImageElement.cpp |
diff --git a/Source/core/svg/SVGImageElement.cpp b/Source/core/svg/SVGImageElement.cpp |
index 9533db10fa795540c4b14b5dd432ec0bf1c549b4..5b2c96e98d1f3c7187afaaa248620c5d909d2631 100644 |
--- a/Source/core/svg/SVGImageElement.cpp |
+++ b/Source/core/svg/SVGImageElement.cpp |
@@ -40,7 +40,6 @@ DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::widthAttr, Width, width) |
DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::heightAttr, Height, height) |
DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGImageElement, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio) |
DEFINE_ANIMATED_STRING(SVGImageElement, XLinkNames::hrefAttr, Href, href) |
-DEFINE_ANIMATED_BOOLEAN(SVGImageElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired) |
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGImageElement) |
REGISTER_LOCAL_ANIMATED_PROPERTY(x) |
@@ -49,7 +48,6 @@ BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGImageElement) |
REGISTER_LOCAL_ANIMATED_PROPERTY(height) |
REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio) |
REGISTER_LOCAL_ANIMATED_PROPERTY(href) |
- REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired) |
REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement) |
END_REGISTER_ANIMATED_PROPERTIES |
@@ -88,7 +86,6 @@ bool SVGImageElement::isSupportedAttribute(const QualifiedName& attrName) |
DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ()); |
if (supportedAttributes.isEmpty()) { |
SVGLangSpace::addSupportedAttributes(supportedAttributes); |
- SVGExternalResourcesRequired::addSupportedAttributes(supportedAttributes); |
SVGURIReference::addSupportedAttributes(supportedAttributes); |
supportedAttributes.add(SVGNames::xAttr); |
supportedAttributes.add(SVGNames::yAttr); |
@@ -135,7 +132,6 @@ void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomicStri |
else if (name == SVGNames::heightAttr) |
setHeightBaseValue(SVGLength::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths)); |
else if (SVGLangSpace::parseAttribute(name, value) |
- || SVGExternalResourcesRequired::parseAttribute(name, value) |
|| SVGURIReference::parseAttribute(name, value)) { |
} else |
ASSERT_NOT_REACHED(); |
@@ -176,8 +172,7 @@ void SVGImageElement::svgAttributeChanged(const QualifiedName& attrName) |
} |
if (attrName == SVGNames::preserveAspectRatioAttr |
- || SVGLangSpace::isKnownAttribute(attrName) |
- || SVGExternalResourcesRequired::isKnownAttribute(attrName)) { |
+ || SVGLangSpace::isKnownAttribute(attrName)) { |
RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); |
return; |
} |
@@ -200,7 +195,7 @@ RenderObject* SVGImageElement::createRenderer(RenderStyle*) |
bool SVGImageElement::haveLoadedRequiredResources() |
Stephen Chennney
2013/11/06 16:45:43
Does this method even need to exist any longer? It
Erik Dahlström (inactive)
2013/11/07 09:38:04
This method gets called from SVGElement::sendSVGLo
|
{ |
- return !externalResourcesRequiredBaseValue() || !m_imageLoader.hasPendingActivity(); |
+ return true; |
} |
void SVGImageElement::attach(const AttachContext& context) |