Remove GrIsPow2 in favor of SkIsPow2.

include/gpu/GrTexture.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTexture_DEFINED
 #define GrTexture_DEFINED
@@ skipping 29 matching lines @@
     virtual GrTexture* asTexture() SK_OVERRIDE { return this; }
     virtual const GrTexture* asTexture() const SK_OVERRIDE { return this; }
     virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return fRenderTarget.get(); }
     virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return fRenderTarget.get(); }
 
     /**
      * Convert from texels to normalized texture coords for POT textures only. Please don't add
      * new callsites for these functions. They are slated for removal.
      */
     SkFixed normalizeFixedX(SkFixed x) const {
-        SkASSERT(GrIsPow2(fDesc.fWidth));
+        SkASSERT(SkIsPow2(fDesc.fWidth));
         return x >> fShiftFixedX;
     }
     SkFixed normalizeFixedY(SkFixed y) const {
-        SkASSERT(GrIsPow2(fDesc.fHeight));
+        SkASSERT(SkIsPow2(fDesc.fHeight));
         return y >> fShiftFixedY;
     }
 
     /**
      *  Return the native ID or handle to the texture, depending on the
      *  platform. e.g. on OpenGL, return the texture ID.
      */
     virtual GrBackendObject getTextureHandle() const = 0;
 
     /**
@@ skipping 147 matching lines @@
         fTexture.reset(SkSafeRef(texture));
         return texture;
     }
 
 private:
     SkAutoTUnref<GrTexture> fTexture;
     SkIPoint                fOffset;
 };
 
 #endif