diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-15 10:20:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-15 16:28:59 +0000 |
| commit | 09e019eafdc01d7d33e2b9d469a3f5afe2808e38 (patch) | |
| tree | 504540c6e454296f4edb3a11a87d528b04a81fbe | |
| parent | 1fba70289b7c39b496aa55d9a86b16d3d09e90f9 (diff) | |
Rename GrAtlasTextBatch files to GrAtlasTextOp
Change-Id: I3ce7321577c236a95811d7a2da798d4eb2e0cbd3
Reviewed-on: https://skia-review.googlesource.com/6116
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | gn/gpu.gni | 4 | ||||
| -rw-r--r-- | src/gpu/batches/GrAtlasTextOp.cpp (renamed from src/gpu/batches/GrAtlasTextBatch.cpp) | 2 | ||||
| -rw-r--r-- | src/gpu/batches/GrAtlasTextOp.h (renamed from src/gpu/batches/GrAtlasTextBatch.h) | 0 | ||||
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 805a062c4c..23ee07eac6 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -241,8 +241,8 @@ skia_gpu_sources = [ "$_src/gpu/batches/GrAAStrokeRectOp.h", "$_src/gpu/batches/GrAnalyticRectOp.cpp", "$_src/gpu/batches/GrAnalyticRectOp.h", - "$_src/gpu/batches/GrAtlasTextBatch.cpp", - "$_src/gpu/batches/GrAtlasTextBatch.h", + "$_src/gpu/batches/GrAtlasTextOp.cpp", + "$_src/gpu/batches/GrAtlasTextOp.h", "$_src/gpu/batches/GrClearOp.h", "$_src/gpu/batches/GrClearStencilClipOp.h", "$_src/gpu/batches/GrCopySurfaceOp.cpp", diff --git a/src/gpu/batches/GrAtlasTextBatch.cpp b/src/gpu/batches/GrAtlasTextOp.cpp index 1b450956af..0b692d15b3 100644 --- a/src/gpu/batches/GrAtlasTextBatch.cpp +++ b/src/gpu/batches/GrAtlasTextOp.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "GrAtlasTextBatch.h" +#include "GrAtlasTextOp.h" #include "GrOpFlushState.h" #include "GrResourceProvider.h" diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextOp.h index 313a78e940..313a78e940 100644 --- a/src/gpu/batches/GrAtlasTextBatch.h +++ b/src/gpu/batches/GrAtlasTextOp.h diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index c5fa86f6e8..e3c23d69ed 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/GrAtlasTextBatch.h" +#include "batches/GrAtlasTextOp.h" GrAtlasTextBlob* GrAtlasTextBlob::Create(GrMemoryPool* pool, int glyphCount, int runCount) { // We allocate size for the GrAtlasTextBlob itself, plus size for the vertices array, diff --git a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp index 68f00fc5be..1b541464f0 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/GrAtlasTextBatch.h" +#include "batches/GrAtlasTextOp.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // A large template to handle regenerating the vertices of a textblob with as few branches as |