SkValue: SkXfermode

src/core/SkValue.h

Index: src/core/SkValue.h
diff --git a/src/core/SkValue.h b/src/core/SkValue.h
index dd42b3a889042f5843d847225de4c66939975951..6507a7244a7a54d8e1d8454dadf584672e5ed76d 100644
--- a/src/core/SkValue.h
+++ b/src/core/SkValue.h
@@ -22,17 +22,21 @@ public:
 
         // 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&);
@@ -66,7 +70,7 @@ public:
 
 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 {
@@ -74,7 +78,7 @@ private:
         uint32_t      fU32;
         float         fF32;
         class Bytes*  fBytes;
-        class Object* fObject;
+        class Obj*    fObject;
     };
 };