4 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp
index 1d0a01fc87..93f369109a 100644
--- a/src/gpu/gl/GrGLContext.cpp
+++ b/src/gpu/gl/GrGLContext.cpp
@@ -73,13 +73,13 @@ GrGLContext::GrGLContext(const GrGLContext& ctx) {
 }
 
 GrGLContext& GrGLContext::operator = (const GrGLContext& ctx) {
-    GrSafeAssign(fInterface, ctx.fInterface);
+    SkRefCnt_SafeAssign(fInterface, ctx.fInterface);
     fInfo = ctx.fInfo;
     return *this;
 }
 
 void GrGLContext::reset() {
-    GrSafeSetNull(fInterface);
+    SkSafeSetNull(fInterface);
     fInfo.reset();
 }
 
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
index 34f2190fba..ac9e9ed900 100644
--- a/src/gpu/gl/GrGLContext.h
+++ b/src/gpu/gl/GrGLContext.h
@@ -101,7 +101,7 @@ public:
      */
     GrGLContext(const GrGLContext& ctx);
 
-    ~GrGLContext() { GrSafeUnref(fInterface); }
+    ~GrGLContext() { SkSafeUnref(fInterface); }
 
     /**
      * Copies a GrGLContext
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index bef2ecf544..b18b8ae31d 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -33,7 +33,7 @@ class GrGLShaderBuilder;
  * Uniforms are program-local so we can't rely on fHWState to hold the
  * previous uniform state after a program change.
  */
-class GrGLProgram : public GrRefCnt {
+class GrGLProgram : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrGLProgram)
 
@@ -235,7 +235,7 @@ private:
     GrGLUniformManager          fUniformManager;
     UniformHandles              fUniformHandles;
 
-    typedef GrRefCnt INHERITED;
+    typedef SkRefCnt INHERITED;
 };
 
 #endif
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index e41ebc87ab..62052fd16a 100644
--- a/src/gpu/gl/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -15,7 +15,7 @@
 /**
  * A ref counted tex id that deletes the texture in its destructor.
  */
-class GrGLTexID : public GrRefCnt {
+class GrGLTexID : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrGLTexID)
 
@@ -39,7 +39,7 @@ private:
     GrGLuint             fTexID;
     bool                 fIsWrapped;
 
-    typedef GrRefCnt INHERITED;
+    typedef SkRefCnt INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////