summaryrefslogtreecommitdiff
path: root/libs/hwui/Layer.h
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-08-20 15:14:06 -0700
committer Chris Craik <ccraik@google.com> 2015-08-21 23:05:44 +0000
commitb9ce116dac378b4cf4490f265dcbd5704a1dd43c (patch)
tree359fda22ac4f3c659c1afe2542a8266b9278318b /libs/hwui/Layer.h
parente4a6f925621e9360238869ae28f7df1b4c2d97de (diff)
Switch several enums to enum classes
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
Diffstat (limited to 'libs/hwui/Layer.h')
-rw-r--r--libs/hwui/Layer.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index b670870ca55f..e90f055b667b 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -56,19 +56,19 @@ struct DeferStateStruct;
*/
class Layer : public VirtualLightRefBase {
public:
- enum Type {
- kType_Texture,
- kType_DisplayList,
+ enum class Type {
+ Texture,
+ DisplayList,
};
// layer lifecycle, controlled from outside
- enum State {
- kState_Uncached = 0,
- kState_InCache = 1,
- kState_FailedToCache = 2,
- kState_RemovedFromCache = 3,
- kState_DeletedFromCache = 4,
- kState_InGarbageList = 5,
+ enum class State {
+ Uncached = 0,
+ InCache = 1,
+ FailedToCache = 2,
+ RemovedFromCache = 3,
+ DeletedFromCache = 4,
+ InGarbageList = 5,
};
State state; // public for logging/debugging purposes
@@ -241,7 +241,7 @@ public:
}
inline bool isTextureLayer() const {
- return type == kType_Texture;
+ return type == Type::Texture;
}
inline SkColorFilter* getColorFilter() const {