SkValue: SkXfermode

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 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,
 
         // 256-2147483647 may be used by Skia for public Object types.
 
+        ArithmeticXfermode = 0x100,
+        LerpXfermode,
+        OverdrawXfermode,
+        PixelXorXfermode,
+        ProcCoeffXfermode,
 
         // 2147483648+ won't be used by Skia.  They're open for client-specific use, testing, etc.
     };
 
-    enum Key : uint32_t {
-        // Each Object type may define its own namespace of Key values,
-        // so there are no pre-defined Keys here.
-        //
-        // This is just a reminder that they must fit in a uint32_t,
-        // and that their namespace is distinct from other uint32_ts (e.g. Type).
-    };
+    // Each Object type may define its own namespace of Key values,
+    // so there are no pre-defined Keys here.
+    //
+    // This is just a reminder that they must fit in a uint32_t,
+    // and that their namespace is distinct from other uint32_ts (e.g. Type).
+    typedef uint32_t Key;
 
     SkValue();
     SkValue(const SkValue&);
     SkValue(SkValue&&);
 
     SkValue& operator=(const SkValue&);
     SkValue& operator=(SkValue&&);
 
     ~SkValue();
 
@@ skipping 13 matching lines @@
 
     const void* bytes() const;
     size_t      count() const;
 
     void set(Key, SkValue);
     const SkValue* get(Key) const;
     void foreach(std::function<void(Key, const SkValue&)>) const;
 
 private:
     class Bytes;
-    class Object;
+    class Obj;

[mtklein, 2016/01/15 00:25:22]

?

[hal.canary, 2016/01/15 13:38:56]

SkValue::Object was an enum value, too.  The compiler borked when I asked for a
`new SkValue::Object`. 

 
     Type fType;
     union {
         int32_t       fS32;
         uint32_t      fU32;
         float         fF32;
         class Bytes*  fBytes;
-        class Object* fObject;
+        class Obj*    fObject;
     };
 };
 
 #endif//SkValue_DEFINED