Index: experimental/svg/model/SkSVGValue.h |
diff --git a/experimental/svg/model/SkSVGValue.h b/experimental/svg/model/SkSVGValue.h |
index 3d3cd6efc1d723a5273ab031fe140cb83b965508..94f3b7fc1012a583f66c7f724db36a75244cc946 100644 |
--- a/experimental/svg/model/SkSVGValue.h |
+++ b/experimental/svg/model/SkSVGValue.h |
@@ -11,12 +11,14 @@ |
#include "SkColor.h" |
#include "SkMatrix.h" |
#include "SkPath.h" |
+#include "SkSVGTypes.h" |
#include "SkTypes.h" |
class SkSVGValue : public SkNoncopyable { |
public: |
enum class Type { |
robertphillips
2016/08/02 22:25:56
k prefixes ?
f(malita)
2016/08/03 16:50:52
Done.
|
Color, |
+ Length, |
Path, |
Transform, |
}; |
@@ -33,6 +35,8 @@ protected: |
private: |
Type fType; |
+ |
robertphillips
2016/08/02 22:25:56
typedef ?
f(malita)
2016/08/03 16:50:52
Done.
|
+ using INHERITED = SkNoncopyable; |
}; |
template <typename SkiaType, SkSVGValue::Type ValueType> |
@@ -52,8 +56,9 @@ private: |
using INHERITED = SkSVGValue; |
}; |
-using SkSVGColorValue = SkSVGWrapperValue<SkColor , SkSVGValue::Type::Color >; |
-using SkSVGPathValue = SkSVGWrapperValue<SkPath , SkSVGValue::Type::Path >; |
-using SkSVGTransformValue = SkSVGWrapperValue<SkMatrix, SkSVGValue::Type::Transform>; |
+using SkSVGColorValue = SkSVGWrapperValue<SkSVGColor , SkSVGValue::Type::Color >; |
+using SkSVGLengthValue = SkSVGWrapperValue<SkSVGLength, SkSVGValue::Type::Length >; |
+using SkSVGPathValue = SkSVGWrapperValue<SkPath , SkSVGValue::Type::Path >; |
+using SkSVGTransformValue = SkSVGWrapperValue<SkMatrix , SkSVGValue::Type::Transform>; |
#endif // SkSVGValue_DEFINED |