summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/svg/SVGLength.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/svg/SVGLength.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/svg/SVGLength.h151
1 files changed, 50 insertions, 101 deletions
diff --git a/chromium/third_party/WebKit/Source/core/svg/SVGLength.h b/chromium/third_party/WebKit/Source/core/svg/SVGLength.h
index 31310509b1b..742dbe1f5d7 100644
--- a/chromium/third_party/WebKit/Source/core/svg/SVGLength.h
+++ b/chromium/third_party/WebKit/Source/core/svg/SVGLength.h
@@ -21,11 +21,11 @@
#ifndef SVGLength_h
#define SVGLength_h
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/v8/ExceptionMessages.h"
+#include "bindings/v8/ExceptionStatePlaceholder.h"
#include "core/svg/SVGLengthContext.h"
-#include "core/svg/SVGParsingError.h"
-#include "core/svg/properties/SVGPropertyTraits.h"
-#include "platform/animation/AnimationUtilities.h"
+#include "core/svg/properties/SVGProperty.h"
+#include "platform/heap/Handle.h"
namespace WebCore {
@@ -38,58 +38,51 @@ enum SVGLengthNegativeValuesMode {
ForbidNegativeLengths
};
-class SVGLength {
- WTF_MAKE_FAST_ALLOCATED;
+class SVGLengthTearOff;
+
+class SVGLength FINAL : public SVGPropertyBase {
public:
- // Forward declare these enums in the w3c naming scheme, for IDL generation
- enum {
- SVG_LENGTHTYPE_UNKNOWN = LengthTypeUnknown,
- SVG_LENGTHTYPE_NUMBER = LengthTypeNumber,
- SVG_LENGTHTYPE_PERCENTAGE = LengthTypePercentage,
- SVG_LENGTHTYPE_EMS = LengthTypeEMS,
- SVG_LENGTHTYPE_EXS = LengthTypeEXS,
- SVG_LENGTHTYPE_PX = LengthTypePX,
- SVG_LENGTHTYPE_CM = LengthTypeCM,
- SVG_LENGTHTYPE_MM = LengthTypeMM,
- SVG_LENGTHTYPE_IN = LengthTypeIN,
- SVG_LENGTHTYPE_PT = LengthTypePT,
- SVG_LENGTHTYPE_PC = LengthTypePC
- };
-
- SVGLength(SVGLengthMode = LengthModeOther, const String& valueAsString = String());
- SVGLength(const SVGLengthContext&, float, SVGLengthMode = LengthModeOther, SVGLengthType = LengthTypeNumber);
- SVGLength(const SVGLength&);
+ typedef SVGLengthTearOff TearOffType;
- SVGLengthType unitType() const;
- SVGLengthMode unitMode() const;
+ static PassRefPtr<SVGLength> create(SVGLengthMode mode = LengthModeOther)
+ {
+ return adoptRef(new SVGLength(mode));
+ }
- bool operator==(const SVGLength&) const;
- bool operator!=(const SVGLength&) const;
+ PassRefPtr<SVGLength> clone() const;
+ virtual PassRefPtr<SVGPropertyBase> cloneForAnimation(const String&) const OVERRIDE;
- static SVGLength construct(SVGLengthMode, const String&, SVGParsingError&, SVGLengthNegativeValuesMode = AllowNegativeLengths);
+ SVGLengthType unitType() const { return static_cast<SVGLengthType>(m_unitType); }
+ void setUnitType(SVGLengthType);
+ SVGLengthMode unitMode() const { return static_cast<SVGLengthMode>(m_unitMode); }
- float value(const SVGLengthContext&) const;
+ bool operator==(const SVGLength&) const;
+ bool operator!=(const SVGLength& other) const { return !operator==(other); }
+
+ float value(const SVGLengthContext& context) const
+ {
+ return value(context, IGNORE_EXCEPTION);
+ }
float value(const SVGLengthContext&, ExceptionState&) const;
void setValue(float, const SVGLengthContext&, ExceptionState&);
- void setValue(const SVGLengthContext&, float, SVGLengthMode, SVGLengthType, ExceptionState&);
float valueInSpecifiedUnits() const { return m_valueInSpecifiedUnits; }
void setValueInSpecifiedUnits(float value) { m_valueInSpecifiedUnits = value; }
float valueAsPercentage() const;
- String valueAsString() const;
+ virtual String valueAsString() const OVERRIDE;
void setValueAsString(const String&, ExceptionState&);
- void setValueAsString(const String&, SVGLengthMode, ExceptionState&);
- void newValueSpecifiedUnits(unsigned short, float valueInSpecifiedUnits, ExceptionState&);
- void convertToSpecifiedUnits(unsigned short, const SVGLengthContext&, ExceptionState&);
+ void newValueSpecifiedUnits(SVGLengthType, float valueInSpecifiedUnits);
+ void convertToSpecifiedUnits(SVGLengthType, const SVGLengthContext&, ExceptionState&);
// Helper functions
inline bool isRelative() const
{
- SVGLengthType type = unitType();
- return type == LengthTypePercentage || type == LengthTypeEMS || type == LengthTypeEXS;
+ return m_unitType == LengthTypePercentage
+ || m_unitType == LengthTypeEMS
+ || m_unitType == LengthTypeEXS;
}
bool isZero() const
@@ -97,77 +90,33 @@ public:
return !m_valueInSpecifiedUnits;
}
- static SVGLength fromCSSPrimitiveValue(CSSPrimitiveValue*);
- static PassRefPtr<CSSPrimitiveValue> toCSSPrimitiveValue(const SVGLength&);
+ static PassRefPtr<SVGLength> fromCSSPrimitiveValue(CSSPrimitiveValue*);
+ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toCSSPrimitiveValue(PassRefPtr<SVGLength>);
static SVGLengthMode lengthModeForAnimatedLengthAttribute(const QualifiedName&);
- SVGLength blend(const SVGLength& from, float progress) const
- {
- SVGLengthType toType = unitType();
- SVGLengthType fromType = from.unitType();
- if ((from.isZero() && isZero())
- || fromType == LengthTypeUnknown
- || toType == LengthTypeUnknown
- || (!from.isZero() && fromType != LengthTypePercentage && toType == LengthTypePercentage)
- || (!isZero() && fromType == LengthTypePercentage && toType != LengthTypePercentage)
- || (!from.isZero() && !isZero() && (fromType == LengthTypeEMS || fromType == LengthTypeEXS) && fromType != toType))
- return *this;
-
- SVGLength length;
- TrackExceptionState exceptionState;
-
- if (fromType == LengthTypePercentage || toType == LengthTypePercentage) {
- float fromPercent = from.valueAsPercentage() * 100;
- float toPercent = valueAsPercentage() * 100;
- length.newValueSpecifiedUnits(LengthTypePercentage, WebCore::blend(fromPercent, toPercent, progress), exceptionState);
- if (exceptionState.hadException())
- return SVGLength();
- return length;
- }
-
- if (fromType == toType || from.isZero() || isZero() || fromType == LengthTypeEMS || fromType == LengthTypeEXS) {
- float fromValue = from.valueInSpecifiedUnits();
- float toValue = valueInSpecifiedUnits();
- if (isZero())
- length.newValueSpecifiedUnits(fromType, WebCore::blend(fromValue, toValue, progress), exceptionState);
- else
- length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), exceptionState);
- if (exceptionState.hadException())
- return SVGLength();
- return length;
- }
-
- ASSERT(!isRelative());
- ASSERT(!from.isRelative());
-
- SVGLengthContext nonRelativeLengthContext(0);
- float fromValueInUserUnits = nonRelativeLengthContext.convertValueToUserUnits(from.valueInSpecifiedUnits(), from.unitMode(), fromType, exceptionState);
- if (exceptionState.hadException())
- return SVGLength();
-
- float fromValue = nonRelativeLengthContext.convertValueFromUserUnits(fromValueInUserUnits, unitMode(), toType, exceptionState);
- if (exceptionState.hadException())
- return SVGLength();
-
- float toValue = valueInSpecifiedUnits();
- length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), exceptionState);
-
- if (exceptionState.hadException())
- return SVGLength();
- return length;
- }
+ PassRefPtr<SVGLength> blend(PassRefPtr<SVGLength> from, float progress) const;
+
+ virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) OVERRIDE;
+ virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBase> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) OVERRIDE;
+ virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) OVERRIDE;
+
+ static AnimatedPropertyType classType() { return AnimatedLength; }
private:
- float m_valueInSpecifiedUnits;
- unsigned int m_unit;
-};
+ SVGLength(SVGLengthMode);
+ SVGLength(const SVGLength&);
-template<>
-struct SVGPropertyTraits<SVGLength> {
- static SVGLength initialValue() { return SVGLength(); }
- static String toString(const SVGLength& type) { return type.valueAsString(); }
+ float m_valueInSpecifiedUnits;
+ unsigned m_unitMode : 2;
+ unsigned m_unitType : 4;
};
+inline PassRefPtr<SVGLength> toSVGLength(PassRefPtr<SVGPropertyBase> passBase)
+{
+ RefPtr<SVGPropertyBase> base = passBase;
+ ASSERT(base->type() == SVGLength::classType());
+ return static_pointer_cast<SVGLength>(base.release());
+}
} // namespace WebCore