Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: Source/core/svg/SVGLength.cpp

Issue 966923003: Make SVGLengthMode an enum class (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/svg/SVGLength.h ('k') | Source/core/svg/SVGLengthContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGLength.cpp
diff --git a/Source/core/svg/SVGLength.cpp b/Source/core/svg/SVGLength.cpp
index 97d0f53c15f6f2aac800a94d18b8e81e8f86fec0..92ca2346bb1b8c0805e1390c820fe1581dc7f206 100644
--- a/Source/core/svg/SVGLength.cpp
+++ b/Source/core/svg/SVGLength.cpp
@@ -117,9 +117,10 @@ SVGLengthType stringToLengthType(const CharType*& ptr, const CharType* end)
SVGLength::SVGLength(SVGLengthMode mode)
: SVGPropertyBase(classType())
, m_valueInSpecifiedUnits(0)
- , m_unitMode(mode)
+ , m_unitMode(static_cast<unsigned>(mode))
, m_unitType(LengthTypeNumber)
{
+ ASSERT(unitMode() == mode);
}
SVGLength::SVGLength(const SVGLength& o)
@@ -359,35 +360,35 @@ SVGLengthMode SVGLength::lengthModeForAnimatedLengthAttribute(const QualifiedNam
DEFINE_STATIC_LOCAL(LengthModeForLengthAttributeMap, s_lengthModeMap, ());
if (s_lengthModeMap.isEmpty()) {
- s_lengthModeMap.set(SVGNames::xAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::yAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::cxAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::cyAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::dxAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::dyAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::fxAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::fyAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::rAttr, LengthModeOther);
- s_lengthModeMap.set(SVGNames::rxAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::ryAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::widthAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::heightAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::x1Attr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::x2Attr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::y1Attr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::y2Attr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::refXAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::refYAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::markerWidthAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::markerHeightAttr, LengthModeHeight);
- s_lengthModeMap.set(SVGNames::textLengthAttr, LengthModeWidth);
- s_lengthModeMap.set(SVGNames::startOffsetAttr, LengthModeWidth);
+ s_lengthModeMap.set(SVGNames::xAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::yAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::cxAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::cyAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::dxAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::dyAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::fxAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::fyAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::rAttr, SVGLengthMode::Other);
+ s_lengthModeMap.set(SVGNames::rxAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::ryAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::widthAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::heightAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::x1Attr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::x2Attr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::y1Attr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::y2Attr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::refXAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::refYAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::markerWidthAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::markerHeightAttr, SVGLengthMode::Height);
+ s_lengthModeMap.set(SVGNames::textLengthAttr, SVGLengthMode::Width);
+ s_lengthModeMap.set(SVGNames::startOffsetAttr, SVGLengthMode::Width);
}
if (s_lengthModeMap.contains(attrName))
return s_lengthModeMap.get(attrName);
- return LengthModeOther;
+ return SVGLengthMode::Other;
}
PassRefPtrWillBeRawPtr<SVGLength> SVGLength::blend(PassRefPtrWillBeRawPtr<SVGLength> passFrom, float progress) const
« no previous file with comments | « Source/core/svg/SVGLength.h ('k') | Source/core/svg/SVGLengthContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698