Move all text stuff to its own folder
BUG=skia:
Review URL: https://codereview.chromium.org/1521453002
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 8baa40f..93957bf 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -57,14 +57,8 @@
'<(skia_src_path)/gpu/GrAutoLocaleSetter.h',
'<(skia_src_path)/gpu/GrAllocator.h',
- '<(skia_src_path)/gpu/GrAtlasTextBlob.cpp',
- '<(skia_src_path)/gpu/GrAtlasTextBlob.h',
- '<(skia_src_path)/gpu/GrAtlasTextContext.cpp',
- '<(skia_src_path)/gpu/GrAtlasTextContext.h',
'<(skia_src_path)/gpu/GrBatchAtlas.cpp',
'<(skia_src_path)/gpu/GrBatchAtlas.h',
- '<(skia_src_path)/gpu/GrBatchFontCache.cpp',
- '<(skia_src_path)/gpu/GrBatchFontCache.h',
'<(skia_src_path)/gpu/GrBatchFlushState.cpp',
'<(skia_src_path)/gpu/GrBatchFlushState.h',
'<(skia_src_path)/gpu/GrBatchTest.cpp',
@@ -82,15 +76,11 @@
'<(skia_src_path)/gpu/GrCoordTransform.cpp',
'<(skia_src_path)/gpu/GrDefaultGeoProcFactory.cpp',
'<(skia_src_path)/gpu/GrDefaultGeoProcFactory.h',
- '<(skia_src_path)/gpu/GrDistanceFieldAdjustTable.cpp',
- '<(skia_src_path)/gpu/GrDistanceFieldAdjustTable.h',
'<(skia_src_path)/gpu/GrDrawContext.cpp',
'<(skia_src_path)/gpu/GrDrawingManager.cpp',
'<(skia_src_path)/gpu/GrDrawingManager.h',
'<(skia_src_path)/gpu/GrDrawTarget.cpp',
'<(skia_src_path)/gpu/GrDrawTarget.h',
- '<(skia_src_path)/gpu/GrFontScaler.cpp',
- '<(skia_src_path)/gpu/GrFontScaler.h',
'<(skia_src_path)/gpu/GrFragmentProcessor.cpp',
'<(skia_src_path)/gpu/GrGeometryBuffer.h',
'<(skia_src_path)/gpu/GrGeometryProcessor.h',
@@ -164,8 +154,6 @@
'<(skia_src_path)/gpu/GrResourceProvider.h',
'<(skia_src_path)/gpu/GrStencil.cpp',
'<(skia_src_path)/gpu/GrStencil.h',
- '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.cpp',
- '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.h',
'<(skia_src_path)/gpu/GrStencilAttachment.cpp',
'<(skia_src_path)/gpu/GrStencilAttachment.h',
'<(skia_src_path)/gpu/GrStrokeInfo.cpp',
@@ -180,18 +168,12 @@
'<(skia_src_path)/gpu/GrSoftwarePathRenderer.h',
'<(skia_src_path)/gpu/GrSurfacePriv.h',
'<(skia_src_path)/gpu/GrSurface.cpp',
- '<(skia_src_path)/gpu/GrTextBlobCache.cpp',
- '<(skia_src_path)/gpu/GrTextBlobCache.h',
- '<(skia_src_path)/gpu/GrTextContext.cpp',
- '<(skia_src_path)/gpu/GrTextContext.h',
'<(skia_src_path)/gpu/GrTexture.cpp',
'<(skia_src_path)/gpu/GrTextureParamsAdjuster.h',
'<(skia_src_path)/gpu/GrTextureParamsAdjuster.cpp',
'<(skia_src_path)/gpu/GrTextureProvider.cpp',
'<(skia_src_path)/gpu/GrTexturePriv.h',
'<(skia_src_path)/gpu/GrTextureAccess.cpp',
- '<(skia_src_path)/gpu/GrTextUtils.cpp',
- '<(skia_src_path)/gpu/GrTextUtils.h',
'<(skia_src_path)/gpu/GrTransferBuffer.h',
'<(skia_src_path)/gpu/GrTRecorder.h',
'<(skia_src_path)/gpu/GrVertexBuffer.h',
@@ -295,6 +277,26 @@
'<(skia_src_path)/gpu/effects/GrYUVtoRGBEffect.cpp',
'<(skia_src_path)/gpu/effects/GrYUVtoRGBEffect.h',
+ # text
+ '<(skia_src_path)/gpu/text/GrAtlasTextBlob.cpp',
+ '<(skia_src_path)/gpu/text/GrAtlasTextBlob.h',
+ '<(skia_src_path)/gpu/text/GrAtlasTextContext.cpp',
+ '<(skia_src_path)/gpu/text/GrAtlasTextContext.h',
+ '<(skia_src_path)/gpu/text/GrBatchFontCache.cpp',
+ '<(skia_src_path)/gpu/text/GrBatchFontCache.h',
+ '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.cpp',
+ '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.h',
+ '<(skia_src_path)/gpu/text/GrFontScaler.cpp',
+ '<(skia_src_path)/gpu/text/GrFontScaler.h',
+ '<(skia_src_path)/gpu/text/GrStencilAndCoverTextContext.cpp',
+ '<(skia_src_path)/gpu/text/GrStencilAndCoverTextContext.h',
+ '<(skia_src_path)/gpu/text/GrTextBlobCache.cpp',
+ '<(skia_src_path)/gpu/text/GrTextBlobCache.h',
+ '<(skia_src_path)/gpu/text/GrTextContext.cpp',
+ '<(skia_src_path)/gpu/text/GrTextContext.h',
+ '<(skia_src_path)/gpu/text/GrTextUtils.cpp',
+ '<(skia_src_path)/gpu/text/GrTextUtils.h',
+
'<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
'<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
'<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp',
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a4887e3..1c30d54 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 8978c6b..492d425 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 13167d4..6e84f22 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 755fabc..98ebe06 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 fcfe292..d543f14 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 efb53a3..11b35c1 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 edbe3d7..8f20313 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
similarity index 100%
rename from src/gpu/GrAtlasTextBlob.cpp
rename to src/gpu/text/GrAtlasTextBlob.cpp
diff --git a/src/gpu/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h
similarity index 100%
rename from src/gpu/GrAtlasTextBlob.h
rename to src/gpu/text/GrAtlasTextBlob.h
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp
similarity index 100%
rename from src/gpu/GrAtlasTextContext.cpp
rename to src/gpu/text/GrAtlasTextContext.cpp
diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h
similarity index 100%
rename from src/gpu/GrAtlasTextContext.h
rename to src/gpu/text/GrAtlasTextContext.h
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/text/GrBatchFontCache.cpp
similarity index 100%
rename from src/gpu/GrBatchFontCache.cpp
rename to src/gpu/text/GrBatchFontCache.cpp
diff --git a/src/gpu/GrBatchFontCache.h b/src/gpu/text/GrBatchFontCache.h
similarity index 100%
rename from src/gpu/GrBatchFontCache.h
rename to src/gpu/text/GrBatchFontCache.h
diff --git a/src/gpu/GrDistanceFieldAdjustTable.cpp b/src/gpu/text/GrDistanceFieldAdjustTable.cpp
similarity index 100%
rename from src/gpu/GrDistanceFieldAdjustTable.cpp
rename to src/gpu/text/GrDistanceFieldAdjustTable.cpp
diff --git a/src/gpu/GrDistanceFieldAdjustTable.h b/src/gpu/text/GrDistanceFieldAdjustTable.h
similarity index 100%
rename from src/gpu/GrDistanceFieldAdjustTable.h
rename to src/gpu/text/GrDistanceFieldAdjustTable.h
diff --git a/src/gpu/GrFontScaler.cpp b/src/gpu/text/GrFontScaler.cpp
similarity index 100%
rename from src/gpu/GrFontScaler.cpp
rename to src/gpu/text/GrFontScaler.cpp
diff --git a/src/gpu/GrFontScaler.h b/src/gpu/text/GrFontScaler.h
similarity index 100%
rename from src/gpu/GrFontScaler.h
rename to src/gpu/text/GrFontScaler.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp
similarity index 100%
rename from src/gpu/GrStencilAndCoverTextContext.cpp
rename to src/gpu/text/GrStencilAndCoverTextContext.cpp
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
similarity index 100%
rename from src/gpu/GrStencilAndCoverTextContext.h
rename to src/gpu/text/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrTextBlobCache.cpp b/src/gpu/text/GrTextBlobCache.cpp
similarity index 100%
rename from src/gpu/GrTextBlobCache.cpp
rename to src/gpu/text/GrTextBlobCache.cpp
diff --git a/src/gpu/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h
similarity index 100%
rename from src/gpu/GrTextBlobCache.h
rename to src/gpu/text/GrTextBlobCache.h
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
similarity index 100%
rename from src/gpu/GrTextContext.cpp
rename to src/gpu/text/GrTextContext.cpp
diff --git a/src/gpu/GrTextContext.h b/src/gpu/text/GrTextContext.h
similarity index 100%
rename from src/gpu/GrTextContext.h
rename to src/gpu/text/GrTextContext.h
diff --git a/src/gpu/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp
similarity index 100%
rename from src/gpu/GrTextUtils.cpp
rename to src/gpu/text/GrTextUtils.cpp
diff --git a/src/gpu/GrTextUtils.h b/src/gpu/text/GrTextUtils.h
similarity index 100%
rename from src/gpu/GrTextUtils.h
rename to src/gpu/text/GrTextUtils.h