Complete the merge of MappedAttribute and Attribute.
Rubber-stamped by Anders Carlsson.
Files elided for brevity.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@59773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/svg/SVGAElement.cpp b/WebCore/svg/SVGAElement.cpp
index 4a1f18a..da2190b 100644
--- a/WebCore/svg/SVGAElement.cpp
+++ b/WebCore/svg/SVGAElement.cpp
@@ -25,6 +25,7 @@
#include "SVGAElement.h"
#include "Attr.h"
+#include "Attribute.h"
#include "CSSHelper.h"
#include "Document.h"
#include "EventHandler.h"
@@ -33,7 +34,6 @@
#include "FrameLoader.h"
#include "FrameLoaderTypes.h"
#include "KeyboardEvent.h"
-#include "MappedAttribute.h"
#include "MouseEvent.h"
#include "PlatformMouseEvent.h"
#include "RenderSVGInline.h"
@@ -69,7 +69,7 @@
return SVGStyledElement::title();
}
-void SVGAElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGAElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::targetAttr)
setTargetBaseValue(attr->value());
diff --git a/WebCore/svg/SVGAElement.h b/WebCore/svg/SVGAElement.h
index 36046d3..d9d7fa7 100644
--- a/WebCore/svg/SVGAElement.h
+++ b/WebCore/svg/SVGAElement.h
@@ -44,7 +44,7 @@
virtual String title() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGAnimateMotionElement.cpp b/WebCore/svg/SVGAnimateMotionElement.cpp
index 868a48d..9a0da7f 100644
--- a/WebCore/svg/SVGAnimateMotionElement.cpp
+++ b/WebCore/svg/SVGAnimateMotionElement.cpp
@@ -26,7 +26,7 @@
#if ENABLE(SVG) && ENABLE(SVG_ANIMATION)
#include "SVGAnimateMotionElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderObject.h"
#include "SVGElementInstance.h"
#include "SVGMPathElement.h"
@@ -83,7 +83,7 @@
return false;
}
-void SVGAnimateMotionElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGAnimateMotionElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::pathAttr) {
m_path = Path();
diff --git a/WebCore/svg/SVGAnimateMotionElement.h b/WebCore/svg/SVGAnimateMotionElement.h
index f401220..385e3b3 100644
--- a/WebCore/svg/SVGAnimateMotionElement.h
+++ b/WebCore/svg/SVGAnimateMotionElement.h
@@ -36,7 +36,7 @@
virtual bool hasValidTarget() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
private:
virtual void resetToBaseValue(const String&);
diff --git a/WebCore/svg/SVGAnimateTransformElement.cpp b/WebCore/svg/SVGAnimateTransformElement.cpp
index 96485a6..50ddef7 100644
--- a/WebCore/svg/SVGAnimateTransformElement.cpp
+++ b/WebCore/svg/SVGAnimateTransformElement.cpp
@@ -28,7 +28,7 @@
#include "SVGAnimateTransformElement.h"
#include "AffineTransform.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderObject.h"
#include "SVGAngle.h"
#include "SVGElementInstance.h"
@@ -63,7 +63,7 @@
return SVGAnimationElement::hasValidTarget() && (targetElement->isStyledTransformable() || targetElement->hasTagName(SVGNames::textTag));
}
-void SVGAnimateTransformElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGAnimateTransformElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::typeAttr) {
if (attr->value() == "translate")
diff --git a/WebCore/svg/SVGAnimateTransformElement.h b/WebCore/svg/SVGAnimateTransformElement.h
index c93e694..a06953a 100644
--- a/WebCore/svg/SVGAnimateTransformElement.h
+++ b/WebCore/svg/SVGAnimateTransformElement.h
@@ -39,7 +39,7 @@
virtual bool hasValidTarget() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
private:
virtual void resetToBaseValue(const String&);
diff --git a/WebCore/svg/SVGAnimationElement.cpp b/WebCore/svg/SVGAnimationElement.cpp
index 4b4d5bb..880be29 100644
--- a/WebCore/svg/SVGAnimationElement.cpp
+++ b/WebCore/svg/SVGAnimationElement.cpp
@@ -27,16 +27,16 @@
#if ENABLE(SVG_ANIMATION)
#include "SVGAnimationElement.h"
-#include "Color.h"
+#include "Attribute.h"
#include "CSSComputedStyleDeclaration.h"
#include "CSSParser.h"
#include "CSSPropertyNames.h"
+#include "Color.h"
#include "Document.h"
#include "Event.h"
#include "EventListener.h"
#include "FloatConversion.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "PlatformString.h"
#include "RenderObject.h"
#include "SVGElementInstance.h"
@@ -140,7 +140,7 @@
result.clear();
}
-void SVGAnimationElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGAnimationElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::valuesAttr)
attr->value().string().split(';', m_values);
diff --git a/WebCore/svg/SVGAnimationElement.h b/WebCore/svg/SVGAnimationElement.h
index 27cec88..74148c56 100644
--- a/WebCore/svg/SVGAnimationElement.h
+++ b/WebCore/svg/SVGAnimationElement.h
@@ -47,7 +47,7 @@
SVGAnimationElement(const QualifiedName&, Document*);
virtual ~SVGAnimationElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void attributeChanged(Attribute*, bool preserveDecls);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGCircleElement.cpp b/WebCore/svg/SVGCircleElement.cpp
index 12ccf69..135a96f 100644
--- a/WebCore/svg/SVGCircleElement.cpp
+++ b/WebCore/svg/SVGCircleElement.cpp
@@ -23,8 +23,8 @@
#if ENABLE(SVG)
#include "SVGCircleElement.h"
+#include "Attribute.h"
#include "FloatPoint.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -46,7 +46,7 @@
{
}
-void SVGCircleElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGCircleElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::cxAttr)
setCxBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGCircleElement.h b/WebCore/svg/SVGCircleElement.h
index 027918c..eb2714c 100644
--- a/WebCore/svg/SVGCircleElement.h
+++ b/WebCore/svg/SVGCircleElement.h
@@ -39,7 +39,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGClipPathElement.cpp b/WebCore/svg/SVGClipPathElement.cpp
index dd880f5..c3a514e 100644
--- a/WebCore/svg/SVGClipPathElement.cpp
+++ b/WebCore/svg/SVGClipPathElement.cpp
@@ -24,9 +24,9 @@
#if ENABLE(SVG)
#include "SVGClipPathElement.h"
+#include "Attribute.h"
#include "CSSStyleSelector.h"
#include "Document.h"
-#include "MappedAttribute.h"
#include "RenderSVGResourceClipper.h"
#include "SVGNames.h"
#include "SVGTransformList.h"
@@ -47,7 +47,7 @@
{
}
-void SVGClipPathElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGClipPathElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::clipPathUnitsAttr) {
if (attr->value() == "userSpaceOnUse")
diff --git a/WebCore/svg/SVGClipPathElement.h b/WebCore/svg/SVGClipPathElement.h
index 40e34f0..eb74f72 100644
--- a/WebCore/svg/SVGClipPathElement.h
+++ b/WebCore/svg/SVGClipPathElement.h
@@ -40,7 +40,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.cpp b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
index f61b2ea..5169411 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.cpp
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGComponentTransferFunctionElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGFEComponentTransferElement.h"
#include "SVGNames.h"
#include "SVGNumberList.h"
@@ -44,7 +44,7 @@
{
}
-void SVGComponentTransferFunctionElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGComponentTransferFunctionElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::typeAttr) {
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.h b/WebCore/svg/SVGComponentTransferFunctionElement.h
index 9862a99..1c719f9 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.h
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.h
@@ -34,7 +34,7 @@
SVGComponentTransferFunctionElement(const QualifiedName&, Document*);
virtual ~SVGComponentTransferFunctionElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
ComponentTransferFunction transferFunction() const;
diff --git a/WebCore/svg/SVGCursorElement.cpp b/WebCore/svg/SVGCursorElement.cpp
index e904516..2c51925 100644
--- a/WebCore/svg/SVGCursorElement.cpp
+++ b/WebCore/svg/SVGCursorElement.cpp
@@ -25,7 +25,6 @@
#include "Attr.h"
#include "Document.h"
-#include "MappedAttribute.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -48,7 +47,7 @@
(*it)->setCursorElement(0);
}
-void SVGCursorElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGCursorElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::xAttr)
setXBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGCursorElement.h b/WebCore/svg/SVGCursorElement.h
index 0978124..f10f464 100644
--- a/WebCore/svg/SVGCursorElement.h
+++ b/WebCore/svg/SVGCursorElement.h
@@ -43,7 +43,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGElement.cpp b/WebCore/svg/SVGElement.cpp
index ab146bb..a94329e 100644
--- a/WebCore/svg/SVGElement.cpp
+++ b/WebCore/svg/SVGElement.cpp
@@ -26,6 +26,7 @@
#if ENABLE(SVG)
#include "SVGElement.h"
+#include "Attribute.h"
#include "CSSCursorImageValue.h"
#include "DOMImplementation.h"
#include "Document.h"
@@ -34,7 +35,6 @@
#include "EventNames.h"
#include "FrameView.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "RegisteredEventListener.h"
#include "RenderObject.h"
#include "SVGCursorElement.h"
@@ -189,7 +189,7 @@
ensureRareSVGData()->setCursorImageValue(cursorImageValue);
}
-void SVGElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGElement::parseMappedAttribute(Attribute* attr)
{
// standard events
if (attr->name() == onloadAttr)
diff --git a/WebCore/svg/SVGElement.h b/WebCore/svg/SVGElement.h
index 9467250..64afe8e 100644
--- a/WebCore/svg/SVGElement.h
+++ b/WebCore/svg/SVGElement.h
@@ -49,7 +49,7 @@
SVGDocumentExtensions* accessDocumentSVGExtensions() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual bool isStyled() const { return false; }
virtual bool isStyledTransformable() const { return false; }
diff --git a/WebCore/svg/SVGEllipseElement.cpp b/WebCore/svg/SVGEllipseElement.cpp
index 76f374f..d811b56 100644
--- a/WebCore/svg/SVGEllipseElement.cpp
+++ b/WebCore/svg/SVGEllipseElement.cpp
@@ -23,8 +23,8 @@
#if ENABLE(SVG)
#include "SVGEllipseElement.h"
+#include "Attribute.h"
#include "FloatPoint.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -47,7 +47,7 @@
{
}
-void SVGEllipseElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGEllipseElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::cxAttr)
setCxBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGEllipseElement.h b/WebCore/svg/SVGEllipseElement.h
index adaa0d2..4b2c38d 100644
--- a/WebCore/svg/SVGEllipseElement.h
+++ b/WebCore/svg/SVGEllipseElement.h
@@ -39,7 +39,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGExternalResourcesRequired.cpp b/WebCore/svg/SVGExternalResourcesRequired.cpp
index 99bc5eb..b82b113 100644
--- a/WebCore/svg/SVGExternalResourcesRequired.cpp
+++ b/WebCore/svg/SVGExternalResourcesRequired.cpp
@@ -24,7 +24,6 @@
#include "SVGExternalResourcesRequired.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "SVGElement.h"
#include "SVGNames.h"
@@ -38,7 +37,7 @@
{
}
-bool SVGExternalResourcesRequired::parseMappedAttribute(MappedAttribute* attr)
+bool SVGExternalResourcesRequired::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::externalResourcesRequiredAttr) {
setExternalResourcesRequiredBaseValue(attr->value() == "true");
diff --git a/WebCore/svg/SVGExternalResourcesRequired.h b/WebCore/svg/SVGExternalResourcesRequired.h
index b2a741d..971c65c 100644
--- a/WebCore/svg/SVGExternalResourcesRequired.h
+++ b/WebCore/svg/SVGExternalResourcesRequired.h
@@ -27,7 +27,7 @@
namespace WebCore {
- class MappedAttribute;
+ class Attribute;
// Notes on a SVG 1.1 spec discrepancy:
// The SVG DOM defines the attribute externalResourcesRequired as being of type SVGAnimatedBoolean, whereas the
@@ -39,7 +39,7 @@
SVGExternalResourcesRequired();
virtual ~SVGExternalResourcesRequired();
- bool parseMappedAttribute(MappedAttribute*);
+ bool parseMappedAttribute(Attribute*);
bool isKnownAttribute(const QualifiedName&);
protected:
diff --git a/WebCore/svg/SVGFEBlendElement.cpp b/WebCore/svg/SVGFEBlendElement.cpp
index 561eb30..c97feed 100644
--- a/WebCore/svg/SVGFEBlendElement.cpp
+++ b/WebCore/svg/SVGFEBlendElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEBlendElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
namespace WebCore {
@@ -37,7 +37,7 @@
{
}
-void SVGFEBlendElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEBlendElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::modeAttr) {
diff --git a/WebCore/svg/SVGFEBlendElement.h b/WebCore/svg/SVGFEBlendElement.h
index be97755..6a7b52f 100644
--- a/WebCore/svg/SVGFEBlendElement.h
+++ b/WebCore/svg/SVGFEBlendElement.h
@@ -31,7 +31,7 @@
SVGFEBlendElement(const QualifiedName&, Document*);
virtual ~SVGFEBlendElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEColorMatrixElement.cpp b/WebCore/svg/SVGFEColorMatrixElement.cpp
index 4911f4c..c644fd6 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.cpp
+++ b/WebCore/svg/SVGFEColorMatrixElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEColorMatrixElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
#include "SVGNumberList.h"
@@ -40,7 +40,7 @@
{
}
-void SVGFEColorMatrixElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEColorMatrixElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::typeAttr) {
diff --git a/WebCore/svg/SVGFEColorMatrixElement.h b/WebCore/svg/SVGFEColorMatrixElement.h
index 29cd81f..a0b1abb 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.h
+++ b/WebCore/svg/SVGFEColorMatrixElement.h
@@ -33,7 +33,7 @@
SVGFEColorMatrixElement(const QualifiedName&, Document*);
virtual ~SVGFEColorMatrixElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEComponentTransferElement.cpp b/WebCore/svg/SVGFEComponentTransferElement.cpp
index 5076d3c..805431c 100644
--- a/WebCore/svg/SVGFEComponentTransferElement.cpp
+++ b/WebCore/svg/SVGFEComponentTransferElement.cpp
@@ -24,7 +24,6 @@
#include "SVGFEComponentTransferElement.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "SVGFEFuncAElement.h"
#include "SVGFEFuncBElement.h"
#include "SVGFEFuncGElement.h"
@@ -43,7 +42,7 @@
{
}
-void SVGFEComponentTransferElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEComponentTransferElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::inAttr)
diff --git a/WebCore/svg/SVGFEComponentTransferElement.h b/WebCore/svg/SVGFEComponentTransferElement.h
index cab195b..62677e6 100644
--- a/WebCore/svg/SVGFEComponentTransferElement.h
+++ b/WebCore/svg/SVGFEComponentTransferElement.h
@@ -32,7 +32,7 @@
SVGFEComponentTransferElement(const QualifiedName&, Document*);
virtual ~SVGFEComponentTransferElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFECompositeElement.cpp b/WebCore/svg/SVGFECompositeElement.cpp
index d213bd5..1571122 100644
--- a/WebCore/svg/SVGFECompositeElement.cpp
+++ b/WebCore/svg/SVGFECompositeElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFECompositeElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
namespace WebCore {
@@ -38,7 +38,7 @@
{
}
-void SVGFECompositeElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFECompositeElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::operatorAttr) {
diff --git a/WebCore/svg/SVGFECompositeElement.h b/WebCore/svg/SVGFECompositeElement.h
index b275d25..642330f 100644
--- a/WebCore/svg/SVGFECompositeElement.h
+++ b/WebCore/svg/SVGFECompositeElement.h
@@ -32,7 +32,7 @@
SVGFECompositeElement(const QualifiedName&, Document*);
virtual ~SVGFECompositeElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
index 5415bea..efe4d5e 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.cpp
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.cpp
@@ -23,7 +23,6 @@
#include "SVGFEDiffuseLightingElement.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "RenderObject.h"
#include "SVGColor.h"
#include "SVGFEDiffuseLighting.h"
@@ -48,7 +47,7 @@
{
}
-void SVGFEDiffuseLightingElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFEDiffuseLightingElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::inAttr)
diff --git a/WebCore/svg/SVGFEDiffuseLightingElement.h b/WebCore/svg/SVGFEDiffuseLightingElement.h
index f12dfad..5815cfed 100644
--- a/WebCore/svg/SVGFEDiffuseLightingElement.h
+++ b/WebCore/svg/SVGFEDiffuseLightingElement.h
@@ -39,7 +39,7 @@
SVGFEDiffuseLightingElement(const QualifiedName&, Document*);
virtual ~SVGFEDiffuseLightingElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.cpp b/WebCore/svg/SVGFEDisplacementMapElement.cpp
index dfaf2dc..82004dc 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.cpp
+++ b/WebCore/svg/SVGFEDisplacementMapElement.cpp
@@ -22,7 +22,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEDisplacementMapElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
namespace WebCore {
@@ -51,7 +51,7 @@
return CHANNEL_UNKNOWN;
}
-void SVGFEDisplacementMapElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEDisplacementMapElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::xChannelSelectorAttr)
diff --git a/WebCore/svg/SVGFEDisplacementMapElement.h b/WebCore/svg/SVGFEDisplacementMapElement.h
index ae3a525..40457ff 100644
--- a/WebCore/svg/SVGFEDisplacementMapElement.h
+++ b/WebCore/svg/SVGFEDisplacementMapElement.h
@@ -33,7 +33,7 @@
static ChannelSelectorType stringToChannel(const String&);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEFloodElement.cpp b/WebCore/svg/SVGFEFloodElement.cpp
index a443071..13ae32f 100644
--- a/WebCore/svg/SVGFEFloodElement.cpp
+++ b/WebCore/svg/SVGFEFloodElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEFloodElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderStyle.h"
#include "SVGRenderStyle.h"
diff --git a/WebCore/svg/SVGFEGaussianBlurElement.cpp b/WebCore/svg/SVGFEGaussianBlurElement.cpp
index 78fc505..f8dd1a5 100644
--- a/WebCore/svg/SVGFEGaussianBlurElement.cpp
+++ b/WebCore/svg/SVGFEGaussianBlurElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEGaussianBlurElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -46,7 +46,7 @@
// FIXME: Needs an implementation.
}
-void SVGFEGaussianBlurElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEGaussianBlurElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::stdDeviationAttr) {
diff --git a/WebCore/svg/SVGFEGaussianBlurElement.h b/WebCore/svg/SVGFEGaussianBlurElement.h
index ddddb8a..fb196d1 100644
--- a/WebCore/svg/SVGFEGaussianBlurElement.h
+++ b/WebCore/svg/SVGFEGaussianBlurElement.h
@@ -37,7 +37,7 @@
void setStdDeviation(float stdDeviationX, float stdDeviationY);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEImageElement.cpp b/WebCore/svg/SVGFEImageElement.cpp
index bdc1911..7fa4c51 100644
--- a/WebCore/svg/SVGFEImageElement.cpp
+++ b/WebCore/svg/SVGFEImageElement.cpp
@@ -28,7 +28,6 @@
#include "CachedImage.h"
#include "DocLoader.h"
#include "Document.h"
-#include "MappedAttribute.h"
#include "SVGLength.h"
#include "SVGNames.h"
#include "SVGPreserveAspectRatio.h"
@@ -67,7 +66,7 @@
m_cachedImage->addClient(this);
}
-void SVGFEImageElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEImageElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::preserveAspectRatioAttr)
diff --git a/WebCore/svg/SVGFEImageElement.h b/WebCore/svg/SVGFEImageElement.h
index 515dcf5..561044b 100644
--- a/WebCore/svg/SVGFEImageElement.h
+++ b/WebCore/svg/SVGFEImageElement.h
@@ -43,7 +43,7 @@
SVGFEImageElement(const QualifiedName&, Document*);
virtual ~SVGFEImageElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual void notifyFinished(CachedResource*);
diff --git a/WebCore/svg/SVGFELightElement.cpp b/WebCore/svg/SVGFELightElement.cpp
index dc711cf..7534df2 100644
--- a/WebCore/svg/SVGFELightElement.cpp
+++ b/WebCore/svg/SVGFELightElement.cpp
@@ -24,7 +24,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFELightElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
namespace WebCore {
@@ -39,7 +39,7 @@
{
}
-void SVGFELightElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFELightElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::azimuthAttr)
diff --git a/WebCore/svg/SVGFELightElement.h b/WebCore/svg/SVGFELightElement.h
index 4e9c389..9d3a269 100644
--- a/WebCore/svg/SVGFELightElement.h
+++ b/WebCore/svg/SVGFELightElement.h
@@ -35,7 +35,7 @@
virtual ~SVGFELightElement();
virtual PassRefPtr<LightSource> lightSource() const = 0;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
private:
diff --git a/WebCore/svg/SVGFEMergeNodeElement.cpp b/WebCore/svg/SVGFEMergeNodeElement.cpp
index 9551d29..64a1226 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.cpp
+++ b/WebCore/svg/SVGFEMergeNodeElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMergeNodeElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
namespace WebCore {
@@ -36,7 +36,7 @@
{
}
-void SVGFEMergeNodeElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEMergeNodeElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::inAttr)
diff --git a/WebCore/svg/SVGFEMergeNodeElement.h b/WebCore/svg/SVGFEMergeNodeElement.h
index 5ccfe94..3367f79 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.h
+++ b/WebCore/svg/SVGFEMergeNodeElement.h
@@ -32,7 +32,7 @@
SVGFEMergeNodeElement(const QualifiedName&, Document*);
virtual ~SVGFEMergeNodeElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
private:
diff --git a/WebCore/svg/SVGFEMorphologyElement.cpp b/WebCore/svg/SVGFEMorphologyElement.cpp
index 5457b29..6caf7c7 100644
--- a/WebCore/svg/SVGFEMorphologyElement.cpp
+++ b/WebCore/svg/SVGFEMorphologyElement.cpp
@@ -22,7 +22,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEMorphologyElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -46,7 +46,7 @@
// FIXME: Needs an implementation.
}
-void SVGFEMorphologyElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEMorphologyElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::operatorAttr) {
diff --git a/WebCore/svg/SVGFEMorphologyElement.h b/WebCore/svg/SVGFEMorphologyElement.h
index 7013444..4377213 100644
--- a/WebCore/svg/SVGFEMorphologyElement.h
+++ b/WebCore/svg/SVGFEMorphologyElement.h
@@ -36,7 +36,7 @@
void setRadius(float radiusX, float radiusY);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFEOffsetElement.cpp b/WebCore/svg/SVGFEOffsetElement.cpp
index 35025ab..db96fce 100644
--- a/WebCore/svg/SVGFEOffsetElement.cpp
+++ b/WebCore/svg/SVGFEOffsetElement.cpp
@@ -24,7 +24,6 @@
#include "SVGFEOffsetElement.h"
#include "Attr.h"
-#include "MappedAttribute.h"
namespace WebCore {
@@ -37,7 +36,7 @@
{
}
-void SVGFEOffsetElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFEOffsetElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::dxAttr)
diff --git a/WebCore/svg/SVGFEOffsetElement.h b/WebCore/svg/SVGFEOffsetElement.h
index 06b76fa..4fbb698 100644
--- a/WebCore/svg/SVGFEOffsetElement.h
+++ b/WebCore/svg/SVGFEOffsetElement.h
@@ -32,7 +32,7 @@
SVGFEOffsetElement(const QualifiedName&, Document*);
virtual ~SVGFEOffsetElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFESpecularLightingElement.cpp b/WebCore/svg/SVGFESpecularLightingElement.cpp
index 767460e..3a82502 100644
--- a/WebCore/svg/SVGFESpecularLightingElement.cpp
+++ b/WebCore/svg/SVGFESpecularLightingElement.cpp
@@ -24,7 +24,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFESpecularLightingElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderObject.h"
#include "SVGColor.h"
#include "SVGFELightElement.h"
@@ -45,7 +45,7 @@
{
}
-void SVGFESpecularLightingElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFESpecularLightingElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::inAttr)
diff --git a/WebCore/svg/SVGFESpecularLightingElement.h b/WebCore/svg/SVGFESpecularLightingElement.h
index 0b4c8fd..c85ce09 100644
--- a/WebCore/svg/SVGFESpecularLightingElement.h
+++ b/WebCore/svg/SVGFESpecularLightingElement.h
@@ -36,7 +36,7 @@
SVGFESpecularLightingElement(const QualifiedName&, Document*);
virtual ~SVGFESpecularLightingElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFETileElement.cpp b/WebCore/svg/SVGFETileElement.cpp
index 133cddc..2c23061 100644
--- a/WebCore/svg/SVGFETileElement.cpp
+++ b/WebCore/svg/SVGFETileElement.cpp
@@ -24,7 +24,6 @@
#include "SVGFETileElement.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "SVGRenderStyle.h"
namespace WebCore {
@@ -38,7 +37,7 @@
{
}
-void SVGFETileElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFETileElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::inAttr)
diff --git a/WebCore/svg/SVGFETileElement.h b/WebCore/svg/SVGFETileElement.h
index 0568d28..60b4d29 100644
--- a/WebCore/svg/SVGFETileElement.h
+++ b/WebCore/svg/SVGFETileElement.h
@@ -32,7 +32,7 @@
SVGFETileElement(const QualifiedName&, Document*);
virtual ~SVGFETileElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFETurbulenceElement.cpp b/WebCore/svg/SVGFETurbulenceElement.cpp
index f1baeef..e5b5419 100644
--- a/WebCore/svg/SVGFETurbulenceElement.cpp
+++ b/WebCore/svg/SVGFETurbulenceElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFETurbulenceElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGParserUtilities.h"
namespace WebCore {
@@ -43,7 +43,7 @@
{
}
-void SVGFETurbulenceElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFETurbulenceElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::typeAttr) {
diff --git a/WebCore/svg/SVGFETurbulenceElement.h b/WebCore/svg/SVGFETurbulenceElement.h
index 72003a3..d8b5304 100644
--- a/WebCore/svg/SVGFETurbulenceElement.h
+++ b/WebCore/svg/SVGFETurbulenceElement.h
@@ -41,7 +41,7 @@
SVGFETurbulenceElement(const QualifiedName&, Document*);
virtual ~SVGFETurbulenceElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);
diff --git a/WebCore/svg/SVGFilterElement.cpp b/WebCore/svg/SVGFilterElement.cpp
index 7abe756..f3ed90c 100644
--- a/WebCore/svg/SVGFilterElement.cpp
+++ b/WebCore/svg/SVGFilterElement.cpp
@@ -28,7 +28,6 @@
#include "Attr.h"
#include "FloatSize.h"
-#include "MappedAttribute.h"
#include "PlatformString.h"
#include "RenderSVGResourceFilter.h"
#include "SVGFilterBuilder.h"
@@ -67,7 +66,7 @@
{
}
-void SVGFilterElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFilterElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
if (attr->name() == SVGNames::filterUnitsAttr) {
diff --git a/WebCore/svg/SVGFilterElement.h b/WebCore/svg/SVGFilterElement.h
index d8b6653..3dad97f 100644
--- a/WebCore/svg/SVGFilterElement.h
+++ b/WebCore/svg/SVGFilterElement.h
@@ -46,7 +46,7 @@
void setFilterRes(unsigned long filterResX, unsigned long filterResY) const;
FloatRect filterBoundingBox(const FloatRect&) const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
index 4f13e5e..9b6b747 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -24,8 +24,8 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFilterPrimitiveStandardAttributes.h"
+#include "Attribute.h"
#include "FilterEffect.h"
-#include "MappedAttribute.h"
#include "SVGLength.h"
#include "SVGNames.h"
#include "SVGStyledElement.h"
@@ -48,7 +48,7 @@
{
}
-void SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(MappedAttribute* attr)
+void SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(Attribute* attr)
{
const AtomicString& value = attr->value();
if (attr->name() == SVGNames::xAttr)
diff --git a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
index a2e7af6..6d1adad 100644
--- a/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
+++ b/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h
@@ -39,7 +39,7 @@
virtual bool isFilterEffect() const { return true; }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*) = 0;
diff --git a/WebCore/svg/SVGFitToViewBox.cpp b/WebCore/svg/SVGFitToViewBox.cpp
index 64c978f..f4de46b 100644
--- a/WebCore/svg/SVGFitToViewBox.cpp
+++ b/WebCore/svg/SVGFitToViewBox.cpp
@@ -27,7 +27,6 @@
#include "Attr.h"
#include "Document.h"
#include "FloatRect.h"
-#include "MappedAttribute.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGPreserveAspectRatio.h"
@@ -83,7 +82,7 @@
return preserveAspectRatio.getCTM(viewBoxRect.x(), viewBoxRect.y(), viewBoxRect.width(), viewBoxRect.height(), 0, 0, viewWidth, viewHeight);
}
-bool SVGFitToViewBox::parseMappedAttribute(Document* document, MappedAttribute* attr)
+bool SVGFitToViewBox::parseMappedAttribute(Document* document, Attribute* attr)
{
if (attr->name() == SVGNames::viewBoxAttr) {
float x = 0.0f, y = 0.0f, w = 0.0f, h = 0.0f;
diff --git a/WebCore/svg/SVGFitToViewBox.h b/WebCore/svg/SVGFitToViewBox.h
index ef7e54b..c4a0d11 100644
--- a/WebCore/svg/SVGFitToViewBox.h
+++ b/WebCore/svg/SVGFitToViewBox.h
@@ -37,7 +37,7 @@
bool parseViewBox(Document*, const UChar*& start, const UChar* end, float& x, float& y, float& w, float& h, bool validate = true);
static AffineTransform viewBoxToViewTransform(const FloatRect& viewBoxRect, const SVGPreserveAspectRatio&, float viewWidth, float viewHeight);
- bool parseMappedAttribute(Document*, MappedAttribute*);
+ bool parseMappedAttribute(Document*, Attribute*);
bool isKnownAttribute(const QualifiedName&);
virtual void setViewBoxBaseValue(SVGAnimatedPropertyTraits<FloatRect>::PassType) = 0;
diff --git a/WebCore/svg/SVGFontFaceElement.cpp b/WebCore/svg/SVGFontFaceElement.cpp
index d1e1661..94f3bd5 100644
--- a/WebCore/svg/SVGFontFaceElement.cpp
+++ b/WebCore/svg/SVGFontFaceElement.cpp
@@ -24,6 +24,7 @@
#if ENABLE(SVG_FONTS)
#include "SVGFontFaceElement.h"
+#include "Attribute.h"
#include "CSSFontFaceRule.h"
#include "CSSFontFaceSrcValue.h"
#include "CSSParser.h"
@@ -35,7 +36,6 @@
#include "CSSValueList.h"
#include "Document.h"
#include "Font.h"
-#include "MappedAttribute.h"
#include "SVGFontElement.h"
#include "SVGFontFaceSrcElement.h"
#include "SVGGlyphElement.h"
@@ -109,7 +109,7 @@
return propertyNameToIdMap->get(attrName.localName().impl());
}
-void SVGFontFaceElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFontFaceElement::parseMappedAttribute(Attribute* attr)
{
int propId = cssPropertyIdForSVGAttributeName(attr->name());
if (propId > 0) {
diff --git a/WebCore/svg/SVGFontFaceElement.h b/WebCore/svg/SVGFontFaceElement.h
index 3c28a89..035a6ed 100644
--- a/WebCore/svg/SVGFontFaceElement.h
+++ b/WebCore/svg/SVGFontFaceElement.h
@@ -36,7 +36,7 @@
SVGFontFaceElement(const QualifiedName&, Document*);
virtual ~SVGFontFaceElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
virtual void insertedIntoDocument();
diff --git a/WebCore/svg/SVGFontFaceUriElement.cpp b/WebCore/svg/SVGFontFaceUriElement.cpp
index bfcda70..ad70b40 100644
--- a/WebCore/svg/SVGFontFaceUriElement.cpp
+++ b/WebCore/svg/SVGFontFaceUriElement.cpp
@@ -23,11 +23,11 @@
#if ENABLE(SVG_FONTS)
#include "SVGFontFaceUriElement.h"
+#include "Attribute.h"
#include "CSSFontFaceSrcValue.h"
#include "CachedFont.h"
#include "DocLoader.h"
#include "Document.h"
-#include "MappedAttribute.h"
#include "SVGFontFaceElement.h"
#include "SVGNames.h"
#include "XLinkNames.h"
@@ -55,7 +55,7 @@
return src.release();
}
-void SVGFontFaceUriElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGFontFaceUriElement::parseMappedAttribute(Attribute* attr)
{
const QualifiedName& attrName = attr->name();
if (attrName == XLinkNames::hrefAttr)
diff --git a/WebCore/svg/SVGFontFaceUriElement.h b/WebCore/svg/SVGFontFaceUriElement.h
index 1d880e5..d51e9dc 100644
--- a/WebCore/svg/SVGFontFaceUriElement.h
+++ b/WebCore/svg/SVGFontFaceUriElement.h
@@ -37,7 +37,7 @@
PassRefPtr<CSSFontFaceSrcValue> srcValue() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
virtual void insertedIntoDocument();
diff --git a/WebCore/svg/SVGForeignObjectElement.cpp b/WebCore/svg/SVGForeignObjectElement.cpp
index f9ab057..9dc61c9 100644
--- a/WebCore/svg/SVGForeignObjectElement.cpp
+++ b/WebCore/svg/SVGForeignObjectElement.cpp
@@ -25,8 +25,8 @@
#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
#include "SVGForeignObjectElement.h"
+#include "Attribute.h"
#include "CSSPropertyNames.h"
-#include "MappedAttribute.h"
#include "RenderForeignObject.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -50,7 +50,7 @@
{
}
-void SVGForeignObjectElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGForeignObjectElement::parseMappedAttribute(Attribute* attr)
{
const AtomicString& value = attr->value();
if (attr->name() == SVGNames::xAttr)
diff --git a/WebCore/svg/SVGForeignObjectElement.h b/WebCore/svg/SVGForeignObjectElement.h
index fe36a20..2cd60a4 100644
--- a/WebCore/svg/SVGForeignObjectElement.h
+++ b/WebCore/svg/SVGForeignObjectElement.h
@@ -40,7 +40,7 @@
virtual ~SVGForeignObjectElement();
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGGElement.cpp b/WebCore/svg/SVGGElement.cpp
index d429400..eceac41 100644
--- a/WebCore/svg/SVGGElement.cpp
+++ b/WebCore/svg/SVGGElement.cpp
@@ -40,7 +40,7 @@
{
}
-void SVGGElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGGElement::parseMappedAttribute(Attribute* attr)
{
if (SVGTests::parseMappedAttribute(attr))
return;
diff --git a/WebCore/svg/SVGGElement.h b/WebCore/svg/SVGGElement.h
index b90eddb..aaed269 100644
--- a/WebCore/svg/SVGGElement.h
+++ b/WebCore/svg/SVGGElement.h
@@ -40,7 +40,7 @@
virtual bool isShadowTreeContainerElement() const { return false; }
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGGlyphElement.cpp b/WebCore/svg/SVGGlyphElement.cpp
index 2d15569..d5b7531 100644
--- a/WebCore/svg/SVGGlyphElement.cpp
+++ b/WebCore/svg/SVGGlyphElement.cpp
@@ -24,7 +24,7 @@
#if ENABLE(SVG_FONTS)
#include "SVGGlyphElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGFontData.h"
#include "SVGFontElement.h"
#include "SVGFontFaceElement.h"
@@ -55,7 +55,7 @@
}
}
-void SVGGlyphElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGGlyphElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::dAttr)
invalidateGlyphCache();
diff --git a/WebCore/svg/SVGGlyphElement.h b/WebCore/svg/SVGGlyphElement.h
index 0662097..a5edd67 100644
--- a/WebCore/svg/SVGGlyphElement.h
+++ b/WebCore/svg/SVGGlyphElement.h
@@ -106,7 +106,7 @@
SVGGlyphElement(const QualifiedName&, Document*);
virtual ~SVGGlyphElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
diff --git a/WebCore/svg/SVGGradientElement.cpp b/WebCore/svg/SVGGradientElement.cpp
index b4bdb16..b314674 100644
--- a/WebCore/svg/SVGGradientElement.cpp
+++ b/WebCore/svg/SVGGradientElement.cpp
@@ -24,8 +24,8 @@
#if ENABLE(SVG)
#include "SVGGradientElement.h"
+#include "Attribute.h"
#include "CSSStyleSelector.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "RenderSVGHiddenContainer.h"
#include "RenderSVGResourceLinearGradient.h"
@@ -51,7 +51,7 @@
{
}
-void SVGGradientElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGGradientElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::gradientUnitsAttr) {
if (attr->value() == "userSpaceOnUse")
diff --git a/WebCore/svg/SVGGradientElement.h b/WebCore/svg/SVGGradientElement.h
index 4447ec4..2736ab3 100644
--- a/WebCore/svg/SVGGradientElement.h
+++ b/WebCore/svg/SVGGradientElement.h
@@ -37,7 +37,7 @@
SVGGradientElement(const QualifiedName&, Document*);
virtual ~SVGGradientElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGImageElement.cpp b/WebCore/svg/SVGImageElement.cpp
index 82bf3bd..e67c337 100644
--- a/WebCore/svg/SVGImageElement.cpp
+++ b/WebCore/svg/SVGImageElement.cpp
@@ -24,8 +24,8 @@
#if ENABLE(SVG)
#include "SVGImageElement.h"
+#include "Attribute.h"
#include "CSSPropertyNames.h"
-#include "MappedAttribute.h"
#include "RenderSVGImage.h"
#include "SVGDocument.h"
#include "SVGLength.h"
@@ -53,7 +53,7 @@
{
}
-void SVGImageElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGImageElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::xAttr)
setXBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGImageElement.h b/WebCore/svg/SVGImageElement.h
index e5b603c..06e3bdb 100644
--- a/WebCore/svg/SVGImageElement.h
+++ b/WebCore/svg/SVGImageElement.h
@@ -45,7 +45,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGLangSpace.cpp b/WebCore/svg/SVGLangSpace.cpp
index f0d6997..21bb643 100644
--- a/WebCore/svg/SVGLangSpace.cpp
+++ b/WebCore/svg/SVGLangSpace.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGLangSpace.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGElement.h"
#include "XMLNames.h"
#include <wtf/StdLibExtras.h>
@@ -63,7 +63,7 @@
m_space = xmlSpace;
}
-bool SVGLangSpace::parseMappedAttribute(MappedAttribute* attr)
+bool SVGLangSpace::parseMappedAttribute(Attribute* attr)
{
if (attr->name().matches(XMLNames::langAttr)) {
setXmllang(attr->value());
diff --git a/WebCore/svg/SVGLangSpace.h b/WebCore/svg/SVGLangSpace.h
index 1613998..f76b990 100644
--- a/WebCore/svg/SVGLangSpace.h
+++ b/WebCore/svg/SVGLangSpace.h
@@ -26,7 +26,7 @@
namespace WebCore {
- class MappedAttribute;
+ class Attribute;
class QualifiedName;
class SVGLangSpace {
@@ -40,7 +40,7 @@
const AtomicString& xmlspace() const;
void setXmlspace(const AtomicString& xmlSpace);
- bool parseMappedAttribute(MappedAttribute*);
+ bool parseMappedAttribute(Attribute*);
bool isKnownAttribute(const QualifiedName&);
private:
diff --git a/WebCore/svg/SVGLineElement.cpp b/WebCore/svg/SVGLineElement.cpp
index 68b8259..a840858 100644
--- a/WebCore/svg/SVGLineElement.cpp
+++ b/WebCore/svg/SVGLineElement.cpp
@@ -23,8 +23,8 @@
#if ENABLE(SVG)
#include "SVGLineElement.h"
+#include "Attribute.h"
#include "FloatPoint.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -47,7 +47,7 @@
{
}
-void SVGLineElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGLineElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::x1Attr)
setX1BaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGLineElement.h b/WebCore/svg/SVGLineElement.h
index c5ecafa..1fbe421 100644
--- a/WebCore/svg/SVGLineElement.h
+++ b/WebCore/svg/SVGLineElement.h
@@ -41,7 +41,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGLinearGradientElement.cpp b/WebCore/svg/SVGLinearGradientElement.cpp
index 87021b1..29ee85e 100644
--- a/WebCore/svg/SVGLinearGradientElement.cpp
+++ b/WebCore/svg/SVGLinearGradientElement.cpp
@@ -26,10 +26,10 @@
#if ENABLE(SVG)
#include "SVGLinearGradientElement.h"
+#include "Attribute.h"
#include "Document.h"
#include "FloatPoint.h"
#include "LinearGradientAttributes.h"
-#include "MappedAttribute.h"
#include "RenderSVGResourceLinearGradient.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -53,7 +53,7 @@
{
}
-void SVGLinearGradientElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGLinearGradientElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::x1Attr)
setX1BaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGLinearGradientElement.h b/WebCore/svg/SVGLinearGradientElement.h
index f92fe80..b248c48 100644
--- a/WebCore/svg/SVGLinearGradientElement.h
+++ b/WebCore/svg/SVGLinearGradientElement.h
@@ -34,7 +34,7 @@
SVGLinearGradientElement(const QualifiedName&, Document*);
virtual ~SVGLinearGradientElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGMPathElement.cpp b/WebCore/svg/SVGMPathElement.cpp
index dfe7e99..65b2cc2 100644
--- a/WebCore/svg/SVGMPathElement.cpp
+++ b/WebCore/svg/SVGMPathElement.cpp
@@ -38,7 +38,7 @@
{
}
-void SVGMPathElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGMPathElement::parseMappedAttribute(Attribute* attr)
{
if (SVGURIReference::parseMappedAttribute(attr))
return;
diff --git a/WebCore/svg/SVGMPathElement.h b/WebCore/svg/SVGMPathElement.h
index 50a7dd1..b25fc19 100644
--- a/WebCore/svg/SVGMPathElement.h
+++ b/WebCore/svg/SVGMPathElement.h
@@ -35,7 +35,7 @@
SVGMPathElement(const QualifiedName&, Document*);
virtual ~SVGMPathElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
SVGPathElement* pathElement();
diff --git a/WebCore/svg/SVGMarkerElement.cpp b/WebCore/svg/SVGMarkerElement.cpp
index 79a445c..9ffbd8d 100644
--- a/WebCore/svg/SVGMarkerElement.cpp
+++ b/WebCore/svg/SVGMarkerElement.cpp
@@ -24,7 +24,7 @@
#if ENABLE(SVG)
#include "SVGMarkerElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "PlatformString.h"
#include "RenderSVGResourceMarker.h"
#include "SVGFitToViewBox.h"
@@ -62,7 +62,7 @@
return SVGFitToViewBox::viewBoxToViewTransform(viewBox(), preserveAspectRatio(), viewWidth, viewHeight);
}
-void SVGMarkerElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGMarkerElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::markerUnitsAttr) {
if (attr->value() == "userSpaceOnUse")
diff --git a/WebCore/svg/SVGMarkerElement.h b/WebCore/svg/SVGMarkerElement.h
index 491cac5..bd397b5 100644
--- a/WebCore/svg/SVGMarkerElement.h
+++ b/WebCore/svg/SVGMarkerElement.h
@@ -61,7 +61,7 @@
void setOrientToAuto();
void setOrientToAngle(const SVGAngle&);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGMaskElement.cpp b/WebCore/svg/SVGMaskElement.cpp
index 6eb19fc..07afe08 100644
--- a/WebCore/svg/SVGMaskElement.cpp
+++ b/WebCore/svg/SVGMaskElement.cpp
@@ -26,8 +26,8 @@
#if ENABLE(SVG)
#include "SVGMaskElement.h"
+#include "Attribute.h"
#include "CSSStyleSelector.h"
-#include "MappedAttribute.h"
#include "RenderSVGResourceMasker.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -59,7 +59,7 @@
{
}
-void SVGMaskElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGMaskElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::maskUnitsAttr) {
if (attr->value() == "userSpaceOnUse")
diff --git a/WebCore/svg/SVGMaskElement.h b/WebCore/svg/SVGMaskElement.h
index 7730e37..79e0bf0 100644
--- a/WebCore/svg/SVGMaskElement.h
+++ b/WebCore/svg/SVGMaskElement.h
@@ -43,7 +43,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
FloatRect maskBoundingBox(const FloatRect&) const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGPathElement.cpp b/WebCore/svg/SVGPathElement.cpp
index d28f2e5..40996d1 100644
--- a/WebCore/svg/SVGPathElement.cpp
+++ b/WebCore/svg/SVGPathElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGPathElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderPath.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -167,7 +167,7 @@
return SVGPathSegCurvetoQuadraticSmoothRel::create(x, y);
}
-void SVGPathElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGPathElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::dAttr) {
ExceptionCode ec;
diff --git a/WebCore/svg/SVGPathElement.h b/WebCore/svg/SVGPathElement.h
index e46ed92..a8523ce 100644
--- a/WebCore/svg/SVGPathElement.h
+++ b/WebCore/svg/SVGPathElement.h
@@ -90,7 +90,7 @@
virtual SVGPathSegList* animatedPathSegList() const;
virtual SVGPathSegList* animatedNormalizedPathSegList() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGPatternElement.cpp b/WebCore/svg/SVGPatternElement.cpp
index 3df6198..fe889e3 100644
--- a/WebCore/svg/SVGPatternElement.cpp
+++ b/WebCore/svg/SVGPatternElement.cpp
@@ -25,11 +25,11 @@
#include "SVGPatternElement.h"
#include "AffineTransform.h"
+#include "Attribute.h"
#include "Document.h"
#include "FloatConversion.h"
#include "GraphicsContext.h"
#include "ImageBuffer.h"
-#include "MappedAttribute.h"
#include "PatternAttributes.h"
#include "RenderSVGContainer.h"
#include "RenderSVGResourcePattern.h"
@@ -70,7 +70,7 @@
{
}
-void SVGPatternElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGPatternElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::patternUnitsAttr) {
if (attr->value() == "userSpaceOnUse")
diff --git a/WebCore/svg/SVGPatternElement.h b/WebCore/svg/SVGPatternElement.h
index 014d2b4..56f7238 100644
--- a/WebCore/svg/SVGPatternElement.h
+++ b/WebCore/svg/SVGPatternElement.h
@@ -48,7 +48,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGPolyElement.cpp b/WebCore/svg/SVGPolyElement.cpp
index 73940dc..053b700 100644
--- a/WebCore/svg/SVGPolyElement.cpp
+++ b/WebCore/svg/SVGPolyElement.cpp
@@ -23,9 +23,9 @@
#if ENABLE(SVG)
#include "SVGPolyElement.h"
+#include "Attribute.h"
#include "Document.h"
#include "FloatPoint.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -60,7 +60,7 @@
return 0;
}
-void SVGPolyElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGPolyElement::parseMappedAttribute(Attribute* attr)
{
const AtomicString& value = attr->value();
if (attr->name() == SVGNames::pointsAttr) {
diff --git a/WebCore/svg/SVGPolyElement.h b/WebCore/svg/SVGPolyElement.h
index 88947de..b2f9a3e 100644
--- a/WebCore/svg/SVGPolyElement.h
+++ b/WebCore/svg/SVGPolyElement.h
@@ -44,7 +44,7 @@
virtual SVGPointList* points() const;
virtual SVGPointList* animatedPoints() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGRadialGradientElement.cpp b/WebCore/svg/SVGRadialGradientElement.cpp
index 29cc1cc..14e0163 100644
--- a/WebCore/svg/SVGRadialGradientElement.cpp
+++ b/WebCore/svg/SVGRadialGradientElement.cpp
@@ -26,9 +26,9 @@
#if ENABLE(SVG)
#include "SVGRadialGradientElement.h"
+#include "Attribute.h"
#include "FloatConversion.h"
#include "FloatPoint.h"
-#include "MappedAttribute.h"
#include "RadialGradientAttributes.h"
#include "RenderSVGResourceRadialGradient.h"
#include "SVGLength.h"
@@ -55,7 +55,7 @@
{
}
-void SVGRadialGradientElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGRadialGradientElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::cxAttr)
setCxBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGRadialGradientElement.h b/WebCore/svg/SVGRadialGradientElement.h
index 25219db..0db08a3 100644
--- a/WebCore/svg/SVGRadialGradientElement.h
+++ b/WebCore/svg/SVGRadialGradientElement.h
@@ -34,7 +34,7 @@
SVGRadialGradientElement(const QualifiedName&, Document*);
virtual ~SVGRadialGradientElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGRectElement.cpp b/WebCore/svg/SVGRectElement.cpp
index 30d278a..b4dc624 100644
--- a/WebCore/svg/SVGRectElement.cpp
+++ b/WebCore/svg/SVGRectElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGRectElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderPath.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -48,7 +48,7 @@
{
}
-void SVGRectElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGRectElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::xAttr)
setXBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGRectElement.h b/WebCore/svg/SVGRectElement.h
index df382f9..16f8408 100644
--- a/WebCore/svg/SVGRectElement.h
+++ b/WebCore/svg/SVGRectElement.h
@@ -39,7 +39,7 @@
virtual bool isValid() const { return SVGTests::isValid(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGSVGElement.cpp b/WebCore/svg/SVGSVGElement.cpp
index 7a30449..af3e5b6 100644
--- a/WebCore/svg/SVGSVGElement.cpp
+++ b/WebCore/svg/SVGSVGElement.cpp
@@ -25,6 +25,7 @@
#include "SVGSVGElement.h"
#include "AffineTransform.h"
+#include "Attribute.h"
#include "CSSHelper.h"
#include "CSSPropertyNames.h"
#include "Document.h"
@@ -34,7 +35,6 @@
#include "FloatRect.h"
#include "Frame.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "RenderSVGRoot.h"
#include "RenderSVGViewportContainer.h"
#include "SMILTimeContainer.h"
@@ -220,7 +220,7 @@
document()->renderer()->repaint();
}
-void SVGSVGElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGSVGElement::parseMappedAttribute(Attribute* attr)
{
if (!nearestViewportElement()) {
bool setListener = true;
@@ -282,7 +282,7 @@
Attribute* attribute = element->attributes(false)->getAttributeItem(attrName);
if (!attribute || !attribute->isMappedAttribute())
return;
- element->addCSSProperty(toMappedAttribute(attribute), property, value.valueAsString());
+ element->addCSSProperty(attribute, property, value.valueAsString());
}
void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName)
diff --git a/WebCore/svg/SVGSVGElement.h b/WebCore/svg/SVGSVGElement.h
index 94300bc..e941034 100644
--- a/WebCore/svg/SVGSVGElement.h
+++ b/WebCore/svg/SVGSVGElement.h
@@ -112,7 +112,7 @@
static SVGTransform createSVGTransform();
static SVGTransform createSVGTransformFromMatrix(const AffineTransform&);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
diff --git a/WebCore/svg/SVGScriptElement.cpp b/WebCore/svg/SVGScriptElement.cpp
index a6d0f47..61c68b6 100644
--- a/WebCore/svg/SVGScriptElement.cpp
+++ b/WebCore/svg/SVGScriptElement.cpp
@@ -23,10 +23,10 @@
#if ENABLE(SVG)
#include "SVGScriptElement.h"
+#include "Attribute.h"
#include "Document.h"
#include "Event.h"
#include "EventNames.h"
-#include "MappedAttribute.h"
#include "SVGNames.h"
namespace WebCore {
@@ -49,7 +49,7 @@
return m_data.scriptContent();
}
-void SVGScriptElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGScriptElement::parseMappedAttribute(Attribute* attr)
{
const QualifiedName& attrName = attr->name();
diff --git a/WebCore/svg/SVGScriptElement.h b/WebCore/svg/SVGScriptElement.h
index 623228c..b864ad5 100644
--- a/WebCore/svg/SVGScriptElement.h
+++ b/WebCore/svg/SVGScriptElement.h
@@ -39,7 +39,7 @@
virtual String scriptContent() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGStopElement.cpp b/WebCore/svg/SVGStopElement.cpp
index 3ac2d5b..672b082 100644
--- a/WebCore/svg/SVGStopElement.cpp
+++ b/WebCore/svg/SVGStopElement.cpp
@@ -23,8 +23,8 @@
#if ENABLE(SVG)
#include "SVGStopElement.h"
+#include "Attribute.h"
#include "Document.h"
-#include "MappedAttribute.h"
#include "RenderSVGGradientStop.h"
#include "SVGGradientElement.h"
#include "SVGNames.h"
@@ -41,7 +41,7 @@
{
}
-void SVGStopElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGStopElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::offsetAttr) {
const String& value = attr->value();
diff --git a/WebCore/svg/SVGStopElement.h b/WebCore/svg/SVGStopElement.h
index 222dd4d..db5eff0 100644
--- a/WebCore/svg/SVGStopElement.h
+++ b/WebCore/svg/SVGStopElement.h
@@ -32,7 +32,7 @@
SVGStopElement(const QualifiedName&, Document*);
virtual ~SVGStopElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
Color stopColorIncludingOpacity() const;
diff --git a/WebCore/svg/SVGStyleElement.cpp b/WebCore/svg/SVGStyleElement.cpp
index 2a21670..d997074 100644
--- a/WebCore/svg/SVGStyleElement.cpp
+++ b/WebCore/svg/SVGStyleElement.cpp
@@ -25,10 +25,10 @@
#if ENABLE(SVG)
#include "SVGStyleElement.h"
+#include "Attribute.h"
#include "CSSStyleSheet.h"
#include "Document.h"
#include "ExceptionCode.h"
-#include "MappedAttribute.h"
#include "SVGNames.h"
#include <wtf/StdLibExtras.h>
@@ -77,7 +77,7 @@
setAttribute(SVGNames::titleAttr, title, ec);
}
-void SVGStyleElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGStyleElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::titleAttr && m_sheet)
m_sheet->setTitle(attr->value());
diff --git a/WebCore/svg/SVGStyleElement.h b/WebCore/svg/SVGStyleElement.h
index de37f5d..ae7ed57 100644
--- a/WebCore/svg/SVGStyleElement.h
+++ b/WebCore/svg/SVGStyleElement.h
@@ -35,7 +35,7 @@
SVGStyleElement(const QualifiedName&, Document*, bool createdByParser);
// Derived from: 'Element'
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
diff --git a/WebCore/svg/SVGStyledElement.cpp b/WebCore/svg/SVGStyledElement.cpp
index 8ce76a9..94ddf0b 100644
--- a/WebCore/svg/SVGStyledElement.cpp
+++ b/WebCore/svg/SVGStyledElement.cpp
@@ -28,7 +28,6 @@
#include "CSSStyleSelector.h"
#include "Document.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "PlatformString.h"
#include "RenderObject.h"
#include "RenderSVGResource.h"
@@ -203,7 +202,7 @@
return SVGElement::mapToEntry(attrName, result);
}
-void SVGStyledElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGStyledElement::parseMappedAttribute(Attribute* attr)
{
const QualifiedName& attrName = attr->name();
// NOTE: Any subclass which overrides parseMappedAttribute for a property handled by
@@ -326,7 +325,7 @@
if (!attr || !attr->isMappedAttribute() || !attr->style())
return 0;
- MappedAttribute* cssSVGAttr = toMappedAttribute(attr);
+ Attribute* cssSVGAttr = attr;
// This function returns a pointer to a CSSValue which can be mutated from JavaScript.
// If the associated MappedAttribute uses the same CSSMappedAttributeDeclaration
// as StyledElement's mappedAttributeDecls cache, create a new CSSMappedAttributeDeclaration
diff --git a/WebCore/svg/SVGStyledElement.h b/WebCore/svg/SVGStyledElement.h
index 69d7e96..cf78050 100644
--- a/WebCore/svg/SVGStyledElement.h
+++ b/WebCore/svg/SVGStyledElement.h
@@ -51,7 +51,7 @@
virtual bool rendererIsNeeded(RenderStyle*);
virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGStyledTransformableElement.cpp b/WebCore/svg/SVGStyledTransformableElement.cpp
index cc92cc4..2dca164 100644
--- a/WebCore/svg/SVGStyledTransformableElement.cpp
+++ b/WebCore/svg/SVGStyledTransformableElement.cpp
@@ -25,7 +25,6 @@
#include "AffineTransform.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "RenderPath.h"
#include "SVGDocument.h"
#include "SVGStyledElement.h"
@@ -66,7 +65,7 @@
return m_supplementalTransform.get();
}
-void SVGStyledTransformableElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGStyledTransformableElement::parseMappedAttribute(Attribute* attr)
{
if (SVGTransformable::isKnownAttribute(attr->name())) {
SVGTransformList* localTransforms = transformBaseValue();
diff --git a/WebCore/svg/SVGStyledTransformableElement.h b/WebCore/svg/SVGStyledTransformableElement.h
index d83c0c5..d16995c 100644
--- a/WebCore/svg/SVGStyledTransformableElement.h
+++ b/WebCore/svg/SVGStyledTransformableElement.h
@@ -49,7 +49,7 @@
virtual FloatRect getBBox() const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
bool isKnownAttribute(const QualifiedName&);
diff --git a/WebCore/svg/SVGSymbolElement.cpp b/WebCore/svg/SVGSymbolElement.cpp
index c7edae1..40dab91 100644
--- a/WebCore/svg/SVGSymbolElement.cpp
+++ b/WebCore/svg/SVGSymbolElement.cpp
@@ -39,7 +39,7 @@
{
}
-void SVGSymbolElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGSymbolElement::parseMappedAttribute(Attribute* attr)
{
if (SVGLangSpace::parseMappedAttribute(attr))
return;
diff --git a/WebCore/svg/SVGSymbolElement.h b/WebCore/svg/SVGSymbolElement.h
index 907bf0f..9db81c4 100644
--- a/WebCore/svg/SVGSymbolElement.h
+++ b/WebCore/svg/SVGSymbolElement.h
@@ -37,7 +37,7 @@
SVGSymbolElement(const QualifiedName&, Document*);
virtual ~SVGSymbolElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual bool rendererIsNeeded(RenderStyle*) { return false; }
diff --git a/WebCore/svg/SVGTRefElement.cpp b/WebCore/svg/SVGTRefElement.cpp
index 06ae896..4faa633 100644
--- a/WebCore/svg/SVGTRefElement.cpp
+++ b/WebCore/svg/SVGTRefElement.cpp
@@ -51,7 +51,7 @@
setTextContent(textContent, ignore);
}
-void SVGTRefElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGTRefElement::parseMappedAttribute(Attribute* attr)
{
if (SVGURIReference::parseMappedAttribute(attr)) {
updateReferencedText();
diff --git a/WebCore/svg/SVGTRefElement.h b/WebCore/svg/SVGTRefElement.h
index ff6eac0..261e2ce 100644
--- a/WebCore/svg/SVGTRefElement.h
+++ b/WebCore/svg/SVGTRefElement.h
@@ -33,7 +33,7 @@
SVGTRefElement(const QualifiedName&, Document*);
virtual ~SVGTRefElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGTests.cpp b/WebCore/svg/SVGTests.cpp
index 258c12c..5f32403 100644
--- a/WebCore/svg/SVGTests.cpp
+++ b/WebCore/svg/SVGTests.cpp
@@ -23,9 +23,9 @@
#if ENABLE(SVG)
#include "SVGTests.h"
+#include "Attribute.h"
#include "DOMImplementation.h"
#include "Language.h"
-#include "MappedAttribute.h"
#include "SVGElement.h"
#include "SVGNames.h"
#include "SVGStringList.h"
@@ -93,7 +93,7 @@
return true;
}
-bool SVGTests::parseMappedAttribute(MappedAttribute* attr)
+bool SVGTests::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::requiredFeaturesAttr) {
requiredFeatures()->reset(attr->value());
diff --git a/WebCore/svg/SVGTests.h b/WebCore/svg/SVGTests.h
index a2abddf..503f6c7 100644
--- a/WebCore/svg/SVGTests.h
+++ b/WebCore/svg/SVGTests.h
@@ -26,10 +26,10 @@
namespace WebCore {
- class MappedAttribute;
- class String;
- class SVGStringList;
+ class Attribute;
class QualifiedName;
+ class SVGStringList;
+ class String;
class SVGTests {
public:
@@ -44,7 +44,7 @@
bool isValid() const;
- bool parseMappedAttribute(MappedAttribute*);
+ bool parseMappedAttribute(Attribute*);
bool isKnownAttribute(const QualifiedName&);
private:
diff --git a/WebCore/svg/SVGTextContentElement.cpp b/WebCore/svg/SVGTextContentElement.cpp
index 3f1ec49..4fef0ee 100644
--- a/WebCore/svg/SVGTextContentElement.cpp
+++ b/WebCore/svg/SVGTextContentElement.cpp
@@ -23,13 +23,13 @@
#if ENABLE(SVG)
#include "SVGTextContentElement.h"
+#include "Attribute.h"
#include "CSSPropertyNames.h"
#include "CSSValueKeywords.h"
#include "ExceptionCode.h"
#include "FloatPoint.h"
#include "FloatRect.h"
#include "Frame.h"
-#include "MappedAttribute.h"
#include "Position.h"
#include "RenderSVGText.h"
#include "SVGCharacterData.h"
@@ -482,7 +482,7 @@
controller->setSelection(VisibleSelection(start, end));
}
-void SVGTextContentElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGTextContentElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::lengthAdjustAttr) {
if (attr->value() == "spacing")
diff --git a/WebCore/svg/SVGTextContentElement.h b/WebCore/svg/SVGTextContentElement.h
index 7dff3d5..f73d5e4 100644
--- a/WebCore/svg/SVGTextContentElement.h
+++ b/WebCore/svg/SVGTextContentElement.h
@@ -58,7 +58,7 @@
int getCharNumAtPosition(const FloatPoint&) const;
void selectSubString(unsigned charnum, unsigned nchars, ExceptionCode&) const;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
bool isKnownAttribute(const QualifiedName&);
diff --git a/WebCore/svg/SVGTextElement.cpp b/WebCore/svg/SVGTextElement.cpp
index 25729cf..f62dc68 100644
--- a/WebCore/svg/SVGTextElement.cpp
+++ b/WebCore/svg/SVGTextElement.cpp
@@ -24,8 +24,8 @@
#include "SVGTextElement.h"
#include "AffineTransform.h"
+#include "Attribute.h"
#include "FloatRect.h"
-#include "MappedAttribute.h"
#include "RenderSVGText.h"
#include "SVGLengthList.h"
#include "SVGRenderStyle.h"
@@ -45,7 +45,7 @@
{
}
-void SVGTextElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGTextElement::parseMappedAttribute(Attribute* attr)
{
if (SVGTransformable::isKnownAttribute(attr->name())) {
SVGTransformList* localTransforms = transformBaseValue();
diff --git a/WebCore/svg/SVGTextElement.h b/WebCore/svg/SVGTextElement.h
index 5e3f5d9..4c7db90 100644
--- a/WebCore/svg/SVGTextElement.h
+++ b/WebCore/svg/SVGTextElement.h
@@ -33,7 +33,7 @@
SVGTextElement(const QualifiedName&, Document*);
virtual ~SVGTextElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual SVGElement* nearestViewportElement() const;
virtual SVGElement* farthestViewportElement() const;
diff --git a/WebCore/svg/SVGTextPathElement.cpp b/WebCore/svg/SVGTextPathElement.cpp
index a428a44..4a2cea5 100644
--- a/WebCore/svg/SVGTextPathElement.cpp
+++ b/WebCore/svg/SVGTextPathElement.cpp
@@ -23,8 +23,8 @@
#include "SVGTextPathElement.h"
#include "AffineTransform.h"
+#include "Attribute.h"
#include "FloatRect.h"
-#include "MappedAttribute.h"
#include "RenderSVGTextPath.h"
#include "SVGLengthList.h"
#include "SVGPathElement.h"
@@ -46,7 +46,7 @@
{
}
-void SVGTextPathElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGTextPathElement::parseMappedAttribute(Attribute* attr)
{
const String& value = attr->value();
diff --git a/WebCore/svg/SVGTextPathElement.h b/WebCore/svg/SVGTextPathElement.h
index 0862335..943d795 100644
--- a/WebCore/svg/SVGTextPathElement.h
+++ b/WebCore/svg/SVGTextPathElement.h
@@ -56,7 +56,7 @@
virtual void insertedIntoDocument();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
diff --git a/WebCore/svg/SVGTextPositioningElement.cpp b/WebCore/svg/SVGTextPositioningElement.cpp
index dd99b49..12b1975 100644
--- a/WebCore/svg/SVGTextPositioningElement.cpp
+++ b/WebCore/svg/SVGTextPositioningElement.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGTextPositioningElement.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "RenderObject.h"
#include "SVGLengthList.h"
#include "SVGNames.h"
@@ -45,7 +45,7 @@
{
}
-void SVGTextPositioningElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGTextPositioningElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::xAttr)
xBaseValue()->parse(attr->value(), LengthModeWidth);
diff --git a/WebCore/svg/SVGTextPositioningElement.h b/WebCore/svg/SVGTextPositioningElement.h
index 71e8900..f3e11bc 100644
--- a/WebCore/svg/SVGTextPositioningElement.h
+++ b/WebCore/svg/SVGTextPositioningElement.h
@@ -33,7 +33,7 @@
SVGTextPositioningElement(const QualifiedName&, Document*);
virtual ~SVGTextPositioningElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGURIReference.cpp b/WebCore/svg/SVGURIReference.cpp
index 5dbdfb8..8ceba80 100644
--- a/WebCore/svg/SVGURIReference.cpp
+++ b/WebCore/svg/SVGURIReference.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGURIReference.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
namespace WebCore {
@@ -35,7 +35,7 @@
{
}
-bool SVGURIReference::parseMappedAttribute(MappedAttribute* attr)
+bool SVGURIReference::parseMappedAttribute(Attribute* attr)
{
if (attr->name().matches(XLinkNames::hrefAttr)) {
setHrefBaseValue(attr->value());
diff --git a/WebCore/svg/SVGURIReference.h b/WebCore/svg/SVGURIReference.h
index ea09f2e..e8f317d 100644
--- a/WebCore/svg/SVGURIReference.h
+++ b/WebCore/svg/SVGURIReference.h
@@ -27,14 +27,14 @@
namespace WebCore {
- class MappedAttribute;
+ class Attribute;
class SVGURIReference {
public:
SVGURIReference();
virtual ~SVGURIReference();
- bool parseMappedAttribute(MappedAttribute*);
+ bool parseMappedAttribute(Attribute*);
bool isKnownAttribute(const QualifiedName&);
static String getTarget(const String& url);
diff --git a/WebCore/svg/SVGUseElement.cpp b/WebCore/svg/SVGUseElement.cpp
index 324d849..a33a56e7 100644
--- a/WebCore/svg/SVGUseElement.cpp
+++ b/WebCore/svg/SVGUseElement.cpp
@@ -24,12 +24,12 @@
#if ENABLE(SVG)
#include "SVGUseElement.h"
+#include "Attribute.h"
#include "CSSStyleSelector.h"
#include "Document.h"
#include "Event.h"
#include "EventListener.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "NodeRenderStyle.h"
#include "RegisteredEventListener.h"
#include "RenderSVGShadowTreeRootContainer.h"
@@ -38,9 +38,9 @@
#include "SVGGElement.h"
#include "SVGLength.h"
#include "SVGPreserveAspectRatio.h"
-#include "SVGShadowTreeElements.h"
#include "SVGSMILElement.h"
#include "SVGSVGElement.h"
+#include "SVGShadowTreeElements.h"
#include "SVGSymbolElement.h"
#include "XLinkNames.h"
#include "XMLSerializer.h"
@@ -90,7 +90,7 @@
return 0;
}
-void SVGUseElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGUseElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::xAttr)
setXBaseValue(SVGLength(LengthModeWidth, attr->value()));
diff --git a/WebCore/svg/SVGUseElement.h b/WebCore/svg/SVGUseElement.h
index 5519274..01a193b 100644
--- a/WebCore/svg/SVGUseElement.h
+++ b/WebCore/svg/SVGUseElement.h
@@ -52,7 +52,7 @@
virtual void removedFromDocument();
virtual void buildPendingResource();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void svgAttributeChanged(const QualifiedName&);
virtual void synchronizeProperty(const QualifiedName&);
diff --git a/WebCore/svg/SVGViewElement.cpp b/WebCore/svg/SVGViewElement.cpp
index aba7283..c19c7cf 100644
--- a/WebCore/svg/SVGViewElement.cpp
+++ b/WebCore/svg/SVGViewElement.cpp
@@ -24,7 +24,6 @@
#include "SVGViewElement.h"
#include "Attr.h"
-#include "MappedAttribute.h"
#include "PlatformString.h"
#include "SVGFitToViewBox.h"
#include "SVGNames.h"
@@ -53,7 +52,7 @@
return m_viewTarget.get();
}
-void SVGViewElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGViewElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::viewTargetAttr)
viewTarget()->reset(attr->value());
diff --git a/WebCore/svg/SVGViewElement.h b/WebCore/svg/SVGViewElement.h
index f913fcd..b834cee 100644
--- a/WebCore/svg/SVGViewElement.h
+++ b/WebCore/svg/SVGViewElement.h
@@ -38,7 +38,7 @@
SVGViewElement(const QualifiedName&, Document*);
virtual ~SVGViewElement();
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void synchronizeProperty(const QualifiedName&);
SVGStringList* viewTarget() const;
diff --git a/WebCore/svg/SVGZoomAndPan.cpp b/WebCore/svg/SVGZoomAndPan.cpp
index b1ea995..782da0b 100644
--- a/WebCore/svg/SVGZoomAndPan.cpp
+++ b/WebCore/svg/SVGZoomAndPan.cpp
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGZoomAndPan.h"
-#include "MappedAttribute.h"
+#include "Attribute.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -48,7 +48,7 @@
m_zoomAndPan = zoomAndPan;
}
-bool SVGZoomAndPan::parseMappedAttribute(MappedAttribute* attr)
+bool SVGZoomAndPan::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::zoomAndPanAttr) {
const UChar* start = attr->value().characters();
diff --git a/WebCore/svg/SVGZoomAndPan.h b/WebCore/svg/SVGZoomAndPan.h
index c11f8e2..95c0772 100644
--- a/WebCore/svg/SVGZoomAndPan.h
+++ b/WebCore/svg/SVGZoomAndPan.h
@@ -26,7 +26,7 @@
namespace WebCore {
- class MappedAttribute;
+ class Attribute;
class QualifiedName;
class SVGZoomAndPan {
@@ -43,7 +43,7 @@
unsigned short zoomAndPan() const;
virtual void setZoomAndPan(unsigned short zoomAndPan);
- bool parseMappedAttribute(MappedAttribute*);
+ bool parseMappedAttribute(Attribute*);
bool isKnownAttribute(const QualifiedName&);
bool parseZoomAndPan(const UChar*& start, const UChar* end);
diff --git a/WebCore/svg/animation/SVGSMILElement.cpp b/WebCore/svg/animation/SVGSMILElement.cpp
index 2bd33dd..e51fb58 100644
--- a/WebCore/svg/animation/SVGSMILElement.cpp
+++ b/WebCore/svg/animation/SVGSMILElement.cpp
@@ -28,6 +28,7 @@
#if ENABLE(SVG_ANIMATION)
#include "SVGSMILElement.h"
+#include "Attribute.h"
#include "CSSPropertyNames.h"
#include "Document.h"
#include "Event.h"
@@ -35,7 +36,6 @@
#include "FloatConversion.h"
#include "FrameView.h"
#include "HTMLNames.h"
-#include "MappedAttribute.h"
#include "SMILTimeContainer.h"
#include "SVGNames.h"
#include "SVGParserUtilities.h"
@@ -342,7 +342,7 @@
sortTimeList(timeList);
}
-void SVGSMILElement::parseMappedAttribute(MappedAttribute* attr)
+void SVGSMILElement::parseMappedAttribute(Attribute* attr)
{
if (attr->name() == SVGNames::beginAttr) {
if (!m_conditions.isEmpty()) {
diff --git a/WebCore/svg/animation/SVGSMILElement.h b/WebCore/svg/animation/SVGSMILElement.h
index 8fcc2fcb..c2e6125 100644
--- a/WebCore/svg/animation/SVGSMILElement.h
+++ b/WebCore/svg/animation/SVGSMILElement.h
@@ -45,7 +45,7 @@
static bool isSMILElement(Node* node);
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void attributeChanged(Attribute*, bool preserveDecls);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
