| Index: src/gpu/GrInOrderDrawBuffer.cpp
 | 
| diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
 | 
| index 0b7a4880a6188d4671c8c9cbdce38e87fd76bf71..d04538dc23e74b6f10592352b683ab2736ee960b 100644
 | 
| --- a/src/gpu/GrInOrderDrawBuffer.cpp
 | 
| +++ b/src/gpu/GrInOrderDrawBuffer.cpp
 | 
| @@ -39,7 +39,7 @@ GrInOrderDrawBuffer::GrInOrderDrawBuffer(GrGpu* gpu,
 | 
|      GeometryPoolState& poolState = fGeoPoolStateStack.push_back();
 | 
|      poolState.fUsedPoolVertexBytes = 0;
 | 
|      poolState.fUsedPoolIndexBytes = 0;
 | 
| -#if GR_DEBUG
 | 
| +#ifdef SK_DEBUG
 | 
|      poolState.fPoolVertexBuffer = (GrVertexBuffer*)~0;
 | 
|      poolState.fPoolStartVertex = ~0;
 | 
|      poolState.fPoolIndexBuffer = (GrIndexBuffer*)~0;
 | 
| @@ -704,7 +704,7 @@ void GrInOrderDrawBuffer::onSetVertexSourceToArray(const void* vertexArray,
 | 
|  
 | 
|      GeometryPoolState& poolState = fGeoPoolStateStack.back();
 | 
|      SkASSERT(0 == poolState.fUsedPoolVertexBytes);
 | 
| -#if GR_DEBUG
 | 
| +#ifdef SK_DEBUG
 | 
|      bool success =
 | 
|  #endif
 | 
|      fVertexPool.appendVertices(this->getVertexSize(),
 | 
| @@ -719,7 +719,7 @@ void GrInOrderDrawBuffer::onSetIndexSourceToArray(const void* indexArray,
 | 
|                                                    int indexCount) {
 | 
|      GeometryPoolState& poolState = fGeoPoolStateStack.back();
 | 
|      SkASSERT(0 == poolState.fUsedPoolIndexBytes);
 | 
| -#if GR_DEBUG
 | 
| +#ifdef SK_DEBUG
 | 
|      bool success =
 | 
|  #endif
 | 
|      fIndexPool.appendIndices(indexCount,
 | 
| @@ -745,7 +745,7 @@ void GrInOrderDrawBuffer::geometrySourceWillPush() {
 | 
|      GeometryPoolState& poolState = fGeoPoolStateStack.push_back();
 | 
|      poolState.fUsedPoolVertexBytes = 0;
 | 
|      poolState.fUsedPoolIndexBytes = 0;
 | 
| -#if GR_DEBUG
 | 
| +#ifdef SK_DEBUG
 | 
|      poolState.fPoolVertexBuffer = (GrVertexBuffer*)~0;
 | 
|      poolState.fPoolStartVertex = ~0;
 | 
|      poolState.fPoolIndexBuffer = (GrIndexBuffer*)~0;
 | 
| 
 |