SkValue: to/from SkImage

src/core/SkValue.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkValue_DEFINED
 #define SkValue_DEFINED
 
 #include "SkTypes.h"
 #include <functional>
 
 class SkData;
 
 class SkValue {
 public:
     enum Type : uint32_t {
         // 0-255 are reserved for built-in SkValue types.
         Null,
         Byte , S16 , U16 , S32 , U32 , S64 , U64 , F32 , F64 ,
         Bytes, S16s, U16s, S32s, U32s, S64s, U64s, F32s, F64s,
         Array,
 
         kMaxBuiltin = 0xFF,
         // 256-2147483647 may be used by Skia for public Object types.
 
+        Image,
         Matrix,
 
         ArithmeticXfermode,
         DefaultXfermode,
         LerpXfermode,
         PixelXorXfermode,
         ProcCoeffXfermode,
 
         kMaxPublicObject = 0x7FFFFFFF,
         // 2147483648+ won't be used by Skia.  They're open for
@@ skipping 20 matching lines @@
     static SkValue FromU32(uint32_t);
     static SkValue FromF32(float);
     static SkValue FromBytes(SkData*);
     static SkValue FromU16s(SkData*);
     static SkValue FromU32s(SkData*);
     static SkValue FromF32s(SkData*);
     static SkValue ValueArray();
     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.
 
     int32_t  s32() const;
     uint32_t u32() const;
     float    f32() const;
     SkData* bytes() const;
 
     const uint16_t* u16s(int* count) const;
     const uint32_t* u32s(int* count) const;
@@ skipping 18 matching lines @@
         int32_t  fS32;
         uint32_t fU32;
         float    fF32;
         SkData*  fBytes;
         Obj*     fObject;
         Arr*     fArray;
     };
 
     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;
 };
 
 #endif  // SkValue_DEFINED