Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043
diff --git a/Source/core/svg/SVGUnitTypes.h b/Source/core/svg/SVGUnitTypes.h
index 3920519..c87ad03 100644
--- a/Source/core/svg/SVGUnitTypes.h
+++ b/Source/core/svg/SVGUnitTypes.h
@@ -20,7 +20,7 @@
#ifndef SVGUnitTypes_h
#define SVGUnitTypes_h
-#include "core/svg/properties/SVGPropertyTraits.h"
+#include "core/svg/SVGEnumeration.h"
#include "wtf/RefCounted.h"
namespace WebCore {
@@ -36,35 +36,7 @@
private:
SVGUnitTypes() { }
};
-
-template<>
-struct SVGPropertyTraits<SVGUnitTypes::SVGUnitType> {
- static unsigned highestEnumValue() { return SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX; }
-
- static String toString(SVGUnitTypes::SVGUnitType type)
- {
- switch (type) {
- case SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN:
- return emptyString();
- case SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE:
- return "userSpaceOnUse";
- case SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX:
- return "objectBoundingBox";
- }
-
- ASSERT_NOT_REACHED();
- return emptyString();
- }
-
- static SVGUnitTypes::SVGUnitType fromString(const String& value)
- {
- if (value == "userSpaceOnUse")
- return SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE;
- if (value == "objectBoundingBox")
- return SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
- return SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN;
- }
-};
+template<> const SVGEnumerationStringEntries& getStaticStringEntries<SVGUnitTypes::SVGUnitType>();
}