Chromium Code Reviews| Index: src/core/SkValue.h |
| diff --git a/src/core/SkValue.h b/src/core/SkValue.h |
| index dd42b3a889042f5843d847225de4c66939975951..ff2763bfc67bdc5b80b28d76c844c40a39651243 100644 |
| --- a/src/core/SkValue.h |
| +++ b/src/core/SkValue.h |
| @@ -22,18 +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 { |
| + typedef uint32_t Key; |
| // Each Object type may define its own namespace of Key values, |
|
mtklein
2016/01/14 22:58:28
Move this left and over the typedef, and update to
hal.canary
2016/01/14 23:43:10
done
|
| // 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). |
| - }; |
| - |
| SkValue(); |
| SkValue(const SkValue&); |
| SkValue(SkValue&&); |