Index: src/core/SkValue.h |
diff --git a/src/core/SkValue.h b/src/core/SkValue.h |
index 5a6453f9080d2815fcfd645fe708a30f421dbd7b..2bfbc9cdacdfa2c0844e0e24374ac843bb3d4b1b 100644 |
--- a/src/core/SkValue.h |
+++ b/src/core/SkValue.h |
@@ -25,6 +25,7 @@ public: |
kMaxBuiltin = 0xFF, |
// 256-2147483647 may be used by Skia for public Object types. |
+ Image, |
Matrix, |
ArithmeticXfermode, |
@@ -65,6 +66,12 @@ public: |
static SkValue Object(Type); |
Type type() const { return fType; } |
+ bool isData() const { |
+ return Bytes == fType |
+ || U16s == fType |
+ || U32s == fType |
+ || F32s == fType; |
+ } |
// These remaining methods may assert they're called on a value of the appropriate type. |
@@ -103,12 +110,6 @@ private: |
SkValue(Type); |
bool isObject() const { return fType > kMaxBuiltin; } |
- bool isData() const { |
- return Bytes == fType |
- || U16s == fType |
- || U32s == fType |
- || F32s == fType; |
- } |
template <typename T> static SkValue FromT(SkValue::Type, T SkValue::*, T); |
template <typename T> static SkValue FromTs(SkValue::Type, SkData*); |
template <typename T> const T* asTs(SkValue::Type, int*) const; |