cleanup friends in GrGpu

src/gpu/GrInOrderDrawBuffer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrInOrderDrawBuffer.h"
 
 #include "GrBufferAllocPool.h"
@@ skipping 455 matching lines @@
     prevDrawState->unref();
     this->reset();
     ++fDrawID;
 }
 
 void GrInOrderDrawBuffer::Draw::execute(GrGpu* gpu) {
     gpu->setVertexSourceToBuffer(this->vertexBuffer());
     if (fInfo.isIndexed()) {
         gpu->setIndexSourceToBuffer(this->indexBuffer());
     }
-    gpu->onDraw(fInfo, fScissorState);
+    gpu->draw(fInfo, fScissorState);
 }
 
 void GrInOrderDrawBuffer::StencilPath::execute(GrGpu* gpu) {
-    gpu->onStencilPath(this->path(), fScissorState, fStencilSettings);
+    gpu->stencilPath(this->path(), fScissorState, fStencilSettings);
 }
 
 void GrInOrderDrawBuffer::DrawPath::execute(GrGpu* gpu) {
-    gpu->onDrawPath(this->path(), fScissorState, fStencilSettings,
+    gpu->drawPath(this->path(), fScissorState, fStencilSettings,
                          fDstCopy.texture() ? &fDstCopy : NULL);
 }
 
 void GrInOrderDrawBuffer::DrawPaths::execute(GrGpu* gpu) {
-    gpu->onDrawPaths(this->pathRange(), this->indices(), fCount, this->transforms(),
+    gpu->drawPaths(this->pathRange(), this->indices(), fCount, this->transforms(),
                           fTransformsType, fScissorState, fStencilSettings,
                           fDstCopy.texture() ? &fDstCopy : NULL);
 }
 
 void GrInOrderDrawBuffer::SetState::execute(GrGpu* gpu) {
     gpu->setDrawState(&fState);
 }
 
 void GrInOrderDrawBuffer::Clear::execute(GrGpu* gpu) {
     if (GrColor_ILLEGAL == fColor) {
@@ skipping 224 matching lines @@
 
 void GrInOrderDrawBuffer::recordTraceMarkersIfNecessary() {
     SkASSERT(!fCmdBuffer.empty());
     SkASSERT(!cmd_has_trace_marker(fCmdBuffer.back().fType));
     const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers();
     if (activeTraceMarkers.count() > 0) {
         fCmdBuffer.back().fType = add_trace_bit(fCmdBuffer.back().fType);
         fGpuCmdMarkers.push_back(activeTraceMarkers);
     }
 }