diff options
author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/svg/SVGImageElement.h | |
parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebCore/svg/SVGImageElement.h')
-rw-r--r-- | WebCore/svg/SVGImageElement.h | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/WebCore/svg/SVGImageElement.h b/WebCore/svg/SVGImageElement.h index af4d84e..b9f3865 100644 --- a/WebCore/svg/SVGImageElement.h +++ b/WebCore/svg/SVGImageElement.h @@ -34,51 +34,52 @@ namespace WebCore { -class SVGImageElement : public SVGStyledTransformableElement, - public SVGTests, - public SVGLangSpace, - public SVGExternalResourcesRequired, - public SVGURIReference { -public: - static PassRefPtr<SVGImageElement> create(const QualifiedName&, Document*); - -private: - SVGImageElement(const QualifiedName&, Document*); - - virtual bool isValid() const { return SVGTests::isValid(); } - - virtual void parseMappedAttribute(Attribute*); - virtual void svgAttributeChanged(const QualifiedName&); - virtual void synchronizeProperty(const QualifiedName&); - - virtual void attach(); - virtual void insertedIntoDocument(); - - virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); + class SVGLength; + + class SVGImageElement : public SVGStyledTransformableElement, + public SVGTests, + public SVGLangSpace, + public SVGExternalResourcesRequired, + public SVGURIReference { + public: + static PassRefPtr<SVGImageElement> create(const QualifiedName&, Document*); + + private: + SVGImageElement(const QualifiedName&, Document*); + + virtual bool isValid() const { return SVGTests::isValid(); } + + virtual void parseMappedAttribute(Attribute*); + virtual void svgAttributeChanged(const QualifiedName&); + virtual void synchronizeProperty(const QualifiedName&); + + virtual void attach(); + virtual void insertedIntoDocument(); + + virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); - virtual const QualifiedName& imageSourceAttributeName() const; - virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const; + virtual const QualifiedName& imageSourceAttributeName() const; + virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const; - virtual bool haveLoadedRequiredResources(); + virtual bool haveLoadedRequiredResources(); - virtual bool selfHasRelativeLengths() const; - virtual void willMoveToNewOwnerDocument(); + virtual bool selfHasRelativeLengths() const; + virtual void willMoveToNewOwnerDocument(); - // Animated property declarations - DECLARE_ANIMATED_LENGTH(X, x) - DECLARE_ANIMATED_LENGTH(Y, y) - DECLARE_ANIMATED_LENGTH(Width, width) - DECLARE_ANIMATED_LENGTH(Height, height) - DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio) + DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::xAttr, SVGLength, X, x) + DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::yAttr, SVGLength, Y, y) + DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::widthAttr, SVGLength, Width, width) + DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::heightAttr, SVGLength, Height, height) + DECLARE_ANIMATED_PROPERTY_NEW(SVGImageElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio) - // SVGURIReference - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGImageElement, XLinkNames::hrefAttr, String, Href, href) + // SVGURIReference + DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGImageElement, XLinkNames::hrefAttr, String, Href, href) - // SVGExternalResourcesRequired - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGImageElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired) + // SVGExternalResourcesRequired + DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGImageElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired) - SVGImageLoader m_imageLoader; -}; + SVGImageLoader m_imageLoader; + }; } // namespace WebCore |