2 files changed, 3 insertions, 3 deletions
diff --git a/include/utils/SkEventTracer.h b/include/utils/SkEventTracer.h
index f0e2a5580c..8d9fd11f64 100644
--- a/include/utils/SkEventTracer.h
+++ b/include/utils/SkEventTracer.h
@@ -25,7 +25,7 @@
 class SK_API SkEventTracer {
 public:
 
-    typedef uint32_t Handle;
+    typedef uint64_t Handle;
 
     static SkEventTracer* GetInstance();
 
@@ -51,7 +51,7 @@ public:
 
     virtual const uint8_t* getCategoryGroupEnabled(const char* name) = 0;
     virtual const char* getCategoryGroupName(
-      const uint8_t* category_group_enabled) = 0;
+      const uint8_t* categoryEnabledFlag) = 0;
 
     virtual SkEventTracer::Handle
         addTraceEvent(char phase,
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp
index 707e94bab9..529fca3519 100644
--- a/src/utils/SkEventTracer.cpp
+++ b/src/utils/SkEventTracer.cpp
@@ -30,7 +30,7 @@ class SkDefaultEventTracer: public SkEventTracer {
         return &no;
     };
     virtual const char* getCategoryGroupName(
-      const uint8_t* category_group_enabled) SK_OVERRIDE {
+      const uint8_t* categoryEnabledFlag) SK_OVERRIDE {
         static const char* dummy = "dummy";
         return dummy;
     };