Move all text stuff to its own folder

BUG=skia:

Review URL: https://codereview.chromium.org/1521453002

25 files changed, 13 insertions, 12 deletions

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a4887e3350..1c30d5427e 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -15,12 +15,12 @@
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
 #include "GrSurfacePriv.h"
-#include "GrTextBlobCache.h"
 
 #include "SkConfig8888.h"
 #include "SkGrPriv.h"
 
 #include "effects/GrConfigConversionEffect.h"
+#include "text/GrTextBlobCache.h"
 
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
 #define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; }
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
index 8978c6b542..492d425dad 100644
--- a/src/gpu/GrDrawContext.cpp
+++ b/src/gpu/GrDrawContext.cpp
@@ -6,7 +6,6 @@
  * found in the LICENSE file.
  */
 
-#include "GrAtlasTextContext.h"
 #include "GrBatchTest.h"
 #include "GrColor.h"
 #include "GrDrawContext.h"
@@ -16,7 +15,6 @@
 #include "GrRenderTarget.h"
 #include "GrRenderTargetPriv.h"
 #include "GrResourceProvider.h"
-#include "GrStencilAndCoverTextContext.h"
 #include "SkSurfacePriv.h"
 
 #include "batches/GrBatch.h"
@@ -25,6 +23,9 @@
 #include "batches/GrRectBatchFactory.h"
 #include "batches/GrNinePatch.h" // TODO Factory
 
+#include "text/GrAtlasTextContext.h"
+#include "text/GrStencilAndCoverTextContext.h"
+
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingManager->getContext())
 #define RETURN_IF_ABANDONED        if (fDrawingManager->abandoned()) { return; }
 #define RETURN_FALSE_IF_ABANDONED  if (fDrawingManager->abandoned()) { return false; }
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 13167d4642..6e84f22e2c 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "GrAtlasTextContext.h"
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrDrawTarget.h"
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
-#include "GrStencilAndCoverTextContext.h"
 #include "SkTTopoSort.h"
 
+#include "text/GrAtlasTextContext.h"
+#include "text/GrStencilAndCoverTextContext.h"
 
 void GrDrawingManager::cleanup() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp
index 755fabc215..98ebe0621e 100644
--- a/src/gpu/GrTest.cpp
+++ b/src/gpu/GrTest.cpp
@@ -9,18 +9,19 @@
 #include "GrTest.h"
 
 #include "GrBatchAtlas.h"
-#include "GrBatchFontCache.h"
 #include "GrContextOptions.h"
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrGpuResourceCacheAccess.h"
 #include "GrResourceCache.h"
-#include "GrTextBlobCache.h"
 
 #include "SkGpuDevice.h"
 #include "SkGrPriv.h"
 #include "SkString.h"
 
+#include "text/GrBatchFontCache.h"
+#include "text/GrTextBlobCache.h"
+
 namespace GrTest {
 void SetupAlwaysEvictAtlas(GrContext* context) {
     // These sizes were selected because they allow each atlas to hold a single plot and will thus
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index fcfe292566..d543f14914 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -11,14 +11,12 @@
 #include "GrContext.h"
 #include "SkDraw.h"
 #include "GrDrawContext.h"
-#include "GrFontScaler.h"
 #include "GrGpu.h"
 #include "GrGpuResourcePriv.h"
 #include "GrImageIDTextureAdjuster.h"
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
 #include "GrStrokeInfo.h"
-#include "GrTextContext.h"
 #include "GrTracing.h"
 #include "SkCanvasPriv.h"
 #include "SkErrorInternals.h"
@@ -49,6 +47,7 @@
 #include "effects/GrDashingEffect.h"
 #include "effects/GrSimpleTextureEffect.h"
 #include "effects/GrTextureDomain.h"
+#include "text/GrTextContext.h"
 
 #if SK_SUPPORT_GPU
 
diff --git a/src/gpu/batches/GrAtlasTextBatch.cpp b/src/gpu/batches/GrAtlasTextBatch.cpp
index efb53a353d..11b35c196b 100644
--- a/src/gpu/batches/GrAtlasTextBatch.cpp
+++ b/src/gpu/batches/GrAtlasTextBatch.cpp
@@ -7,7 +7,6 @@
 
 #include "GrAtlasTextBatch.h"
 
-#include "GrBatchFontCache.h"
 #include "GrBatchFlushState.h"
 #include "GrBatchTest.h"
 #include "GrResourceProvider.h"
@@ -17,6 +16,7 @@
 
 #include "effects/GrBitmapTextGeoProc.h"
 #include "effects/GrDistanceFieldGeoProc.h"
+#include "text/GrBatchFontCache.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // A large template to handle regenerating the vertices of a textblob with as few branches as
diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextBatch.h
index edbe3d7813..8f20313378 100644
--- a/src/gpu/batches/GrAtlasTextBatch.h
+++ b/src/gpu/batches/GrAtlasTextBatch.h
@@ -10,8 +10,8 @@
 
 #include "batches/GrVertexBatch.h"
 
-#include "GrAtlasTextContext.h"
-#include "GrDistanceFieldAdjustTable.h"
+#include "text/GrAtlasTextContext.h"
+#include "text/GrDistanceFieldAdjustTable.h"
 
 class GrAtlasTextBatch : public GrVertexBatch {
 public:
diff --git a/src/gpu/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp
index dee6d133e3..dee6d133e3 100644
--- a/src/gpu/GrAtlasTextBlob.cpp
+++ b/src/gpu/text/GrAtlasTextBlob.cpp
diff --git a/src/gpu/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h
index d99ae707e0..d99ae707e0 100644
--- a/src/gpu/GrAtlasTextBlob.h
+++ b/src/gpu/text/GrAtlasTextBlob.h
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp
index aca839cf2c..aca839cf2c 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/text/GrAtlasTextContext.cpp
diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h
index 47f05404de..47f05404de 100644
--- a/src/gpu/GrAtlasTextContext.h
+++ b/src/gpu/text/GrAtlasTextContext.h
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/text/GrBatchFontCache.cpp
index ad76e4d71f..ad76e4d71f 100644
--- a/src/gpu/GrBatchFontCache.cpp
+++ b/src/gpu/text/GrBatchFontCache.cpp
diff --git a/src/gpu/GrBatchFontCache.h b/src/gpu/text/GrBatchFontCache.h
index 46ab1c8274..46ab1c8274 100644
--- a/src/gpu/GrBatchFontCache.h
+++ b/src/gpu/text/GrBatchFontCache.h
diff --git a/src/gpu/GrDistanceFieldAdjustTable.cpp b/src/gpu/text/GrDistanceFieldAdjustTable.cpp
index 1c5aeceb80..1c5aeceb80 100644
--- a/src/gpu/GrDistanceFieldAdjustTable.cpp
+++ b/src/gpu/text/GrDistanceFieldAdjustTable.cpp
diff --git a/src/gpu/GrDistanceFieldAdjustTable.h b/src/gpu/text/GrDistanceFieldAdjustTable.h
index f7d8bee089..f7d8bee089 100644
--- a/src/gpu/GrDistanceFieldAdjustTable.h
+++ b/src/gpu/text/GrDistanceFieldAdjustTable.h
diff --git a/src/gpu/GrFontScaler.cpp b/src/gpu/text/GrFontScaler.cpp
index c8412027c0..c8412027c0 100644
--- a/src/gpu/GrFontScaler.cpp
+++ b/src/gpu/text/GrFontScaler.cpp
diff --git a/src/gpu/GrFontScaler.h b/src/gpu/text/GrFontScaler.h
index e42c7a1da0..e42c7a1da0 100644
--- a/src/gpu/GrFontScaler.h
+++ b/src/gpu/text/GrFontScaler.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp
index d28f1a803a..d28f1a803a 100644
--- a/src/gpu/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
index dab71e0578..dab71e0578 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/text/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrTextBlobCache.cpp b/src/gpu/text/GrTextBlobCache.cpp
index f11b7c60cb..f11b7c60cb 100644
--- a/src/gpu/GrTextBlobCache.cpp
+++ b/src/gpu/text/GrTextBlobCache.cpp
diff --git a/src/gpu/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h
index 8eee9d13db..8eee9d13db 100644
--- a/src/gpu/GrTextBlobCache.h
+++ b/src/gpu/text/GrTextBlobCache.h
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 8ff2523a73..8ff2523a73 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
diff --git a/src/gpu/GrTextContext.h b/src/gpu/text/GrTextContext.h
index 206b34a403..206b34a403 100644
--- a/src/gpu/GrTextContext.h
+++ b/src/gpu/text/GrTextContext.h
diff --git a/src/gpu/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp
index 293ea4d891..293ea4d891 100644
--- a/src/gpu/GrTextUtils.cpp
+++ b/src/gpu/text/GrTextUtils.cpp
diff --git a/src/gpu/GrTextUtils.h b/src/gpu/text/GrTextUtils.h
index 8f673afbed..8f673afbed 100644
--- a/src/gpu/GrTextUtils.h
+++ b/src/gpu/text/GrTextUtils.h