commit 1acc3d7cc28c5631b5300578ab13439bdefd4e33
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 23:13:05 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 06 23:13:05 2013 +0000
tree e9809f7e8b889b84c6e0e2e221fccaf7436b65cb
parent b57a30d8f5459b30d8d671c62fb8022050d862e1

Replace uses of GR_DEBUGCODE by SkDEBUGCODE.

BUG=None
TEST=none, no functional changes.
R=bsalomon@google.com, robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23703010

git-svn-id: http://skia.googlecode.com/svn/trunk@11142 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 25c8cb1..ef6cc46 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -30,12 +30,12 @@
     SK_DECLARE_INST_COUNT(GrDrawState)
 
     GrDrawState() {
-        GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
+        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
         this->reset();
     }
 
     GrDrawState(const SkMatrix& initialViewMatrix) {
-        GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
+        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
         this->reset(initialViewMatrix);
     }
 
@@ -43,7 +43,7 @@
      * Copies another draw state.
      **/
     GrDrawState(const GrDrawState& state) : INHERITED() {
-        GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
+        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
         *this = state;
     }
 
@@ -51,7 +51,7 @@
      * Copies another draw state with a preconcat to the view matrix.
      **/
     GrDrawState(const GrDrawState& state, const SkMatrix& preConcatMatrix) {
-        GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
+        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
         *this = state;
         if (!preConcatMatrix.isIdentity()) {
             for (int i = 0; i < fColorStages.count(); ++i) {
@@ -419,13 +419,13 @@
                 n = fDrawState->fCoverageStages.count() - fCoverageEffectCnt;
                 SkASSERT(n >= 0);
                 fDrawState->fCoverageStages.pop_back_n(n);
-                GR_DEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;)
+                SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;)
             }
             fDrawState = ds;
             if (NULL != ds) {
                 fColorEffectCnt = ds->fColorStages.count();
                 fCoverageEffectCnt = ds->fCoverageStages.count();
-                GR_DEBUGCODE(++ds->fBlockEffectRemovalCnt;)
+                SkDEBUGCODE(++ds->fBlockEffectRemovalCnt;)
             }
         }
 
@@ -981,7 +981,7 @@
     class DeferredState {
     public:
         DeferredState() : fRenderTarget(NULL) {
-            GR_DEBUGCODE(fInitialized = false;)
+            SkDEBUGCODE(fInitialized = false;)
         }
         // TODO: Remove this when DeferredState no longer holds a ref to the RT
         ~DeferredState() { SkSafeUnref(fRenderTarget); }
@@ -1002,7 +1002,7 @@
             for (int i = 0; i < drawState.fCoverageStages.count(); ++i) {
                 fStages[i + fColorStageCnt].saveFrom(drawState.fCoverageStages[i]);
             }
-            GR_DEBUGCODE(fInitialized = true;)
+            SkDEBUGCODE(fInitialized = true;)
         }
 
         void restoreTo(GrDrawState* drawState) {
@@ -1053,7 +1053,7 @@
         int                                   fColorStageCnt;
         DeferredStageArray                    fStages;
 
-        GR_DEBUGCODE(bool fInitialized;)
+        SkDEBUGCODE(bool fInitialized;)
     };
 
 private:
@@ -1067,7 +1067,7 @@
 
     // Some of the auto restore objects assume that no effects are removed during their lifetime.
     // This is used to assert that this condition holds.
-    GR_DEBUGCODE(int fBlockEffectRemovalCnt;)
+    SkDEBUGCODE(int fBlockEffectRemovalCnt;)
 
     /**
      *  Sets vertex attributes for next draw.