Changeset 64197 in webkit
- Timestamp:
- Jul 28, 2010 4:09:06 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64196 r64197 1 2010-07-28 Nikolas Zimmermann <nzimmermann@rim.com> 2 3 Reviewed by Dirk Schulze. 4 5 SVGMaskElement/SVGForeignObjectElement should not inherit from SVGURIReference 6 https://bugs.webkit.org/show_bug.cgi?id=43113 7 8 Remove wrong SVGURIReference inheritance for SVGMaskElement/SVGForeignObjectElement. Old copy/paste bug. 9 10 * svg/SVGForeignObjectElement.cpp: 11 (WebCore::SVGForeignObjectElement::synchronizeProperty): 12 * svg/SVGForeignObjectElement.h: 13 * svg/SVGMaskElement.cpp: 14 (WebCore::SVGMaskElement::SVGMaskElement): 15 (WebCore::SVGMaskElement::parseMappedAttribute): 16 (WebCore::SVGMaskElement::svgAttributeChanged): 17 (WebCore::SVGMaskElement::synchronizeProperty): 18 * svg/SVGMaskElement.h: 19 1 20 2010-07-28 Nikolas Zimmermann <nzimmermann@rim.com> 2 21 -
trunk/WebCore/svg/SVGForeignObjectElement.cpp
r63531 r64197 127 127 else if (SVGExternalResourcesRequired::isKnownAttribute(attrName)) 128 128 synchronizeExternalResourcesRequired(); 129 else if (SVGURIReference::isKnownAttribute(attrName))130 synchronizeHref();131 129 } 132 130 -
trunk/WebCore/svg/SVGForeignObjectElement.h
r62488 r64197 34 34 public SVGTests, 35 35 public SVGLangSpace, 36 public SVGExternalResourcesRequired, 37 public SVGURIReference { 36 public SVGExternalResourcesRequired { 38 37 public: 39 38 SVGForeignObjectElement(const QualifiedName&, Document*); -
trunk/WebCore/svg/SVGMaskElement.cpp
r62488 r64197 41 41 SVGMaskElement::SVGMaskElement(const QualifiedName& tagName, Document* doc) 42 42 : SVGStyledLocatableElement(tagName, doc) 43 , SVGURIReference()44 43 , SVGTests() 45 44 , SVGLangSpace() … … 81 80 setHeightBaseValue(SVGLength(LengthModeHeight, attr->value())); 82 81 else { 83 if (SVGURIReference::parseMappedAttribute(attr))84 return;85 82 if (SVGTests::parseMappedAttribute(attr)) 86 83 return; … … 109 106 || attrName == SVGNames::maskUnitsAttr 110 107 || attrName == SVGNames::maskContentUnitsAttr 111 || SVGURIReference::isKnownAttribute(attrName)112 108 || SVGTests::isKnownAttribute(attrName) 113 109 || SVGLangSpace::isKnownAttribute(attrName) … … 127 123 synchronizeY(); 128 124 synchronizeExternalResourcesRequired(); 129 synchronizeHref();130 125 return; 131 126 } … … 141 136 else if (SVGExternalResourcesRequired::isKnownAttribute(attrName)) 142 137 synchronizeExternalResourcesRequired(); 143 else if (SVGURIReference::isKnownAttribute(attrName))144 synchronizeHref();145 138 } 146 139 -
trunk/WebCore/svg/SVGMaskElement.h
r62488 r64197 27 27 #include "SVGStyledLocatableElement.h" 28 28 #include "SVGTests.h" 29 #include "SVGURIReference.h"30 29 31 30 namespace WebCore { … … 34 33 35 34 class SVGMaskElement : public SVGStyledLocatableElement, 36 public SVGURIReference,37 35 public SVGTests, 38 36 public SVGLangSpace, … … 41 39 SVGMaskElement(const QualifiedName&, Document*); 42 40 virtual ~SVGMaskElement(); 41 43 42 virtual bool isValid() const { return SVGTests::isValid(); } 44 43 … … 61 60 DECLARE_ANIMATED_PROPERTY(SVGMaskElement, SVGNames::heightAttr, SVGLength, Height, height) 62 61 63 // SVGURIReference64 DECLARE_ANIMATED_PROPERTY(SVGMaskElement, XLinkNames::hrefAttr, String, Href, href)65 66 62 // SVGExternalResourcesRequired 67 63 DECLARE_ANIMATED_PROPERTY(SVGMaskElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
Note: See TracChangeset
for help on using the changeset viewer.