commit 895274391db8df7357334aec260edca2e1735626
author Brian Salomon <bsalomon@google.com> Fri Dec 16 09:52:16 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 16:58:24 2016 +0000
tree 6c447a64c6e376d67503ef18e20cfdb655b6a312
parent 6b316e9e20d67f0f13021ca62f4270105c6151b1

move src/gpu/batches -> src/gpu/ops

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

src/gpu/text/GrAtlasTextBlob.cpp

diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp
index f2f0312..1420ad0 100644
--- a/src/gpu/text/GrAtlasTextBlob.cpp
+++ b/src/gpu/text/GrAtlasTextBlob.cpp
@@ -16,7 +16,7 @@
 #include "SkDrawFilter.h"
 #include "SkGlyphCache.h"
 #include "SkTextBlobRunIterator.h"
-#include "batches/GrAtlasTextOp.h"
+#include "ops/GrAtlasTextOp.h"
 
 GrAtlasTextBlob* GrAtlasTextBlob::Create(GrMemoryPool* pool, int glyphCount, int runCount) {
     // We allocate size for the GrAtlasTextBlob itself, plus size for the vertices array,

src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp

diff --git a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
index d1c4736..88321b9 100644
--- a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
+++ b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
@@ -13,7 +13,7 @@
 #include "SkDistanceFieldGen.h"
 #include "SkGlyphCache.h"
 
-#include "batches/GrAtlasTextOp.h"
+#include "ops/GrAtlasTextOp.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // A large template to handle regenerating the vertices of a textblob with as few branches as

src/gpu/text/GrStencilAndCoverTextContext.cpp

diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp
index 44ab976..ed77e5c 100644
--- a/src/gpu/text/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp
@@ -25,7 +25,7 @@
 #include "SkTextMapStateProc.h"
 #include "SkTextFormatParams.h"
 
-#include "batches/GrDrawPathOp.h"
+#include "ops/GrDrawPathOp.h"
 
 template<typename Key, typename Val> static void delete_hash_map_entry(const Key&, Val* val) {
     SkASSERT(*val);

src/gpu/text/GrStencilAndCoverTextContext.h

diff --git a/src/gpu/text/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
index 0edac25..719d338 100644
--- a/src/gpu/text/GrStencilAndCoverTextContext.h
+++ b/src/gpu/text/GrStencilAndCoverTextContext.h
@@ -16,7 +16,7 @@
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
 #include "SkTextBlob.h"
-#include "batches/GrDrawPathOp.h"
+#include "ops/GrDrawPathOp.h"
 
 class GrAtlasTextContext;
 class GrTextStrike;