From 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 17 Dec 2008 18:05:15 -0800 Subject: Code drop from //branches/cupcake/...@124589 --- WebCore/svg/SVGImageElement.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'WebCore/svg/SVGImageElement.h') diff --git a/WebCore/svg/SVGImageElement.h b/WebCore/svg/SVGImageElement.h index c069f0f..bddfddd 100644 --- a/WebCore/svg/SVGImageElement.h +++ b/WebCore/svg/SVGImageElement.h @@ -30,10 +30,10 @@ #include "SVGStyledTransformableElement.h" #include "SVGTests.h" #include "SVGURIReference.h" +#include "SVGPreserveAspectRatio.h" namespace WebCore { - class SVGPreserveAspectRatio; class SVGLength; class SVGImageElement : public SVGStyledTransformableElement, @@ -51,26 +51,24 @@ namespace WebCore { virtual void svgAttributeChanged(const QualifiedName&); virtual void attach(); + virtual void insertedIntoDocument(); virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); - + + virtual const QualifiedName& imageSourceAttributeName() const; + virtual void getSubresourceAttributeStrings(Vector&) const; + protected: virtual bool haveLoadedRequiredResources(); - virtual bool hasRelativeValues() const; - - protected: virtual const SVGElement* contextElement() const { return this; } private: - ANIMATED_PROPERTY_FORWARD_DECLARATIONS(SVGExternalResourcesRequired, bool, ExternalResourcesRequired, externalResourcesRequired) - ANIMATED_PROPERTY_FORWARD_DECLARATIONS(SVGURIReference, String, Href, href) - - ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGLength, SVGLength, X, x) - ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGLength, SVGLength, Y, y) - ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGLength, SVGLength, Width, width) - ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGLength, SVGLength, Height, height) - ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGPreserveAspectRatio*, RefPtr, PreserveAspectRatio, preserveAspectRatio) + ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGNames::imageTagString, SVGNames::xAttrString, SVGLength, X, x) + ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGNames::imageTagString, SVGNames::yAttrString, SVGLength, Y, y) + ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGNames::imageTagString, SVGNames::widthAttrString, SVGLength, Width, width) + ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGNames::imageTagString, SVGNames::heightAttrString, SVGLength, Height, height) + ANIMATED_PROPERTY_DECLARATIONS(SVGImageElement, SVGNames::imageTagString, SVGNames::preserveAspectRatioAttrString, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio) SVGImageLoader m_imageLoader; }; -- cgit v1.1