commit 742e31de1599f3902810aecdf2e2e3eed3b40a09
author Brian Salomon <bsalomon@google.com> Wed Dec 07 17:06:19 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 07 23:36:31 2016 +0000
tree bbac738ec7cecce88712ad2df993933c8888305e
parent 42521e891081a7a85db4390a457074054649f194

Rename GrBatchFlushState to GrOpFlushState

Change-Id: I1a8052c61d7624929caf45ba44e2a465cd0dc1c2
Reviewed-on: https://skia-review.googlesource.com/5649
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/instanced/InstancedRendering.cpp

diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp
index fb0d53c..135a061 100644
--- a/src/gpu/instanced/InstancedRendering.cpp
+++ b/src/gpu/instanced/InstancedRendering.cpp
@@ -7,8 +7,8 @@
 
 #include "InstancedRendering.h"
 
-#include "GrBatchFlushState.h"
 #include "GrCaps.h"
+#include "GrOpFlushState.h"
 #include "GrPipeline.h"
 #include "GrResourceProvider.h"
 #include "instanced/InstanceProcessor.h"
@@ -462,7 +462,7 @@
     this->onBeginFlush(rp);
 }
 
-void InstancedRendering::Batch::onDraw(GrBatchFlushState* state, const SkRect& bounds) {
+void InstancedRendering::Batch::onDraw(GrOpFlushState* state, const SkRect& bounds) {
     SkASSERT(State::kFlushing == fInstancedRendering->fState);
     SkASSERT(state->gpu() == fInstancedRendering->gpu());