Replace uses of GR_DEBUG by SK_DEBUG.

include/gpu/SkGr.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkGr_DEFINED
 #define SkGr_DEFINED
 
 #include <stddef.h>
 
 // Gr headers
 #include "GrTypes.h"
 #include "GrContext.h"
 #include "GrFontScaler.h"
 
 // skia headers
 #include "SkBitmap.h"
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkRegion.h"
 #include "SkClipStack.h"
 
-#if (GR_DEBUG && defined(SK_RELEASE)) || (GR_RELEASE && defined(SK_DEBUG))
-//    #error "inconsistent GR_DEBUG and SK_DEBUG"
+#if (GR_RELEASE && defined(SK_DEBUG))
+//    #error "inconsistent GR_RELEASE and SK_DEBUG"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Sk to Gr Type conversions
 
 GR_STATIC_ASSERT((int)kZero_GrBlendCoeff == (int)SkXfermode::kZero_Coeff);
 GR_STATIC_ASSERT((int)kOne_GrBlendCoeff  == (int)SkXfermode::kOne_Coeff);
 GR_STATIC_ASSERT((int)kSC_GrBlendCoeff   == (int)SkXfermode::kSC_Coeff);
 GR_STATIC_ASSERT((int)kISC_GrBlendCoeff  == (int)SkXfermode::kISC_Coeff);
 GR_STATIC_ASSERT((int)kDC_GrBlendCoeff   == (int)SkXfermode::kDC_Coeff);
@@ skipping 52 matching lines @@
 
 private:
     SkGlyphCache* fStrike;
     GrKey*  fKey;
 //    DECLARE_INSTANCE_COUNTER(SkGrFontScaler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif