Revert of small cleanup of GrAtlas

src/gpu/GrInOrderDrawBuffer.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 GrInOrderDrawBuffer_DEFINED
 #define GrInOrderDrawBuffer_DEFINED
 
@@ skipping 16 matching lines @@
 
     /**
      * Creates a GrInOrderDrawBuffer
      *
      * @param context    the context object that owns this draw buffer.
      */
     GrInOrderDrawBuffer(GrContext* context);
 
     ~GrInOrderDrawBuffer() override;
 
+    // tracking for draws
+    DrawToken getCurrentDrawToken() override { return DrawToken(this, fDrawID); }
+
     void clearStencilClip(const SkIRect& rect,
                           bool insideClip,
                           GrRenderTarget* renderTarget) override;
 
     void discard(GrRenderTarget*) override;
 
 protected:
     void appendIndicesAndTransforms(const void* indexValues, PathIndexType indexType, 
                                     const float* transformValues, PathTransformType transformType,
                                     int count, char** indicesLocation, float** xformsLocation) {
@@ skipping 93 matching lines @@
     SkChunkAlloc                        fPathIndexBuffer;
     SkChunkAlloc                        fPathTransformBuffer;
     SkChunkAlloc                        fPipelineBuffer;
     uint32_t                            fDrawID;
     SkAutoTUnref<State>                 fPrevState;
 
     typedef GrClipTarget INHERITED;
 };
 
 #endif