Move ccpr headers for display list out of include/private.
This partially undoes 774168efac172d096cd7f09841bce51650cb6e84 "Allow
CCPR in DDL mode (take 2)". The issue appears to have been the use of a
not fully defined type (destructor could not be instantiated) because
the private fields were also dllexported, requiring the destructors to
exist in all translation units which included the header. Only the parts
of the class which are actually public are now marked as exported.
Change-Id: I8a79bd5d8962e94c24f7563d496744bb278153fa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214020
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/gn/core.gni b/gn/core.gni
index 9f0a2e7..12c549c 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -198,6 +198,7 @@
"$_src/core/SkEdge.h",
"$_src/core/SkFDot6.h",
"$_src/core/SkArenaAlloc.cpp",
+ "$_src/core/SkArenaAlloc.h",
"$_src/core/SkArenaAllocList.h",
"$_src/core/SkGaussFilter.cpp",
"$_src/core/SkGaussFilter.h",
@@ -369,7 +370,7 @@
"$_src/core/SkTextFormatParams.h",
"$_src/core/SkTextToPathIter.h",
"$_src/core/SkTime.cpp",
-
+ "$_src/core/SkTInternalLList.h",
"$_src/core/SkThreadID.cpp",
"$_src/core/SkTLazy.h",
"$_src/core/SkTLList.h",
@@ -444,7 +445,6 @@
"$_src/opts/SkXfermode_opts.h",
# private
- "$_include/private/SkArenaAlloc.h",
"$_include/private/SkChecksum.h",
"$_include/private/SkDeferredDisplayList.h",
"$_include/private/SkFixed.h",
@@ -467,7 +467,6 @@
"$_include/private/SkTDArray.h",
"$_include/private/SkTFitsIn.h",
"$_include/private/SkTHash.h",
- "$_include/private/SkTInternalLList.h",
"$_include/private/SkThreadAnnotations.h",
"$_include/private/SkThreadID.h",
"$_include/private/SkTLogic.h",
diff --git a/gn/gpu.gni b/gn/gpu.gni
index f7006d6..d6ce983 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -35,8 +35,6 @@
"$_include/private/GrAuditTrail.h",
"$_include/private/GrColor.h",
"$_include/private/GrContext_Base.h",
- "$_include/private/GrCCClipPath.h",
- "$_include/private/GrCCPerOpListPaths.h",
"$_include/private/GrImageContext.h",
"$_include/private/GrOpList.h",
"$_include/private/GrProxyRef.h",
@@ -543,12 +541,14 @@
"$_src/gpu/ccpr/GrCCAtlas.cpp",
"$_src/gpu/ccpr/GrCCAtlas.h",
"$_src/gpu/ccpr/GrCCClipPath.cpp",
+ "$_src/gpu/ccpr/GrCCClipPath.h",
"$_src/gpu/ccpr/GrCCClipProcessor.cpp",
"$_src/gpu/ccpr/GrCCClipProcessor.h",
"$_src/gpu/ccpr/GrCCConicShader.cpp",
"$_src/gpu/ccpr/GrCCConicShader.h",
"$_src/gpu/ccpr/GrCCCoverageProcessor.cpp",
"$_src/gpu/ccpr/GrCCCoverageProcessor.h",
+ "$_src/gpu/ccpr/GrCCPerOpListPaths.h",
"$_src/gpu/ccpr/GrGSCoverageProcessor.cpp",
"$_src/gpu/ccpr/GrGSCoverageProcessor.h",
"$_src/gpu/ccpr/GrVSCoverageProcessor.cpp",
diff --git a/include/private/SkDeferredDisplayList.h b/include/private/SkDeferredDisplayList.h
index 1f34beb..376c133 100644
--- a/include/private/SkDeferredDisplayList.h
+++ b/include/private/SkDeferredDisplayList.h
@@ -8,31 +8,34 @@
#ifndef SkDeferredDisplayList_DEFINED
#define SkDeferredDisplayList_DEFINED
+#include "include/core/SkRefCnt.h"
#include "include/core/SkSurfaceCharacterization.h"
-
-#if SK_SUPPORT_GPU
-#include "include/private/GrCCPerOpListPaths.h"
-#include "include/private/GrOpList.h"
-
-#include <map>
-#endif
+#include "include/core/SkTypes.h"
class SkDeferredDisplayListPriv;
-class SkSurface;
+
+#if SK_SUPPORT_GPU
+#include "include/private/SkTArray.h"
+#include <map>
+class GrOpList;
+class GrRenderTargetProxy;
+struct GrCCPerOpListPaths;
+#endif
+
/*
* This class contains pre-processed gpu operations that can be replayed into
* an SkSurface via draw(SkDeferredDisplayList*).
*
* TODO: we probably need to expose this class so users can query it for memory usage.
*/
-class SK_API SkDeferredDisplayList {
+class SkDeferredDisplayList {
public:
#if SK_SUPPORT_GPU
// This object is the source from which the lazy proxy backing the DDL will pull its backing
// texture when the DDL is replayed. It has to be separately ref counted bc the lazy proxy
// can outlive the DDL.
- class LazyProxyData : public SkRefCnt {
+ class SK_API LazyProxyData : public SkRefCnt {
public:
// Upon being replayed - this field will be filled in (by the DrawingManager) with the proxy
// backing the destination SkSurface. Note that, since there is no good place to clear it
@@ -40,14 +43,14 @@
GrRenderTargetProxy* fReplayDest = nullptr;
};
#else
- class LazyProxyData : public SkRefCnt {};
+ class SK_API LazyProxyData : public SkRefCnt {};
#endif
- SkDeferredDisplayList(const SkSurfaceCharacterization& characterization,
- sk_sp<LazyProxyData>);
- ~SkDeferredDisplayList();
+ SK_API SkDeferredDisplayList(const SkSurfaceCharacterization& characterization,
+ sk_sp<LazyProxyData>);
+ SK_API ~SkDeferredDisplayList();
- const SkSurfaceCharacterization& characterization() const {
+ SK_API const SkSurfaceCharacterization& characterization() const {
return fCharacterization;
}
diff --git a/src/atlastext/SkInternalAtlasTextContext.h b/src/atlastext/SkInternalAtlasTextContext.h
index a3381b9..d0f7f23 100644
--- a/src/atlastext/SkInternalAtlasTextContext.h
+++ b/src/atlastext/SkInternalAtlasTextContext.h
@@ -9,7 +9,7 @@
#define SkInternalAtlasTextContext_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkArenaAllocList.h"
#include "src/gpu/GrDeferredUpload.h"
diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp
index 14ee5d8..fc67c2d 100644
--- a/src/core/SkArenaAlloc.cpp
+++ b/src/core/SkArenaAlloc.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include <algorithm>
#include <new>
diff --git a/include/private/SkArenaAlloc.h b/src/core/SkArenaAlloc.h
similarity index 100%
rename from include/private/SkArenaAlloc.h
rename to src/core/SkArenaAlloc.h
diff --git a/src/core/SkArenaAllocList.h b/src/core/SkArenaAllocList.h
index 1c156a4..c544b86 100644
--- a/src/core/SkArenaAllocList.h
+++ b/src/core/SkArenaAllocList.h
@@ -9,7 +9,7 @@
#define SkArenaAllocList_DEFINED
#include "include/core/SkTypes.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
/**
* A singly linked list of Ts stored in a SkArenaAlloc. The arena rather than the list owns
diff --git a/src/core/SkAutoBlitterChoose.h b/src/core/SkAutoBlitterChoose.h
index ff3fc7e..9098c7b 100644
--- a/src/core/SkAutoBlitterChoose.h
+++ b/src/core/SkAutoBlitterChoose.h
@@ -8,8 +8,8 @@
#ifndef SkAutoBlitterChoose_DEFINED
#define SkAutoBlitterChoose_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkMacros.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlitter.h"
#include "src/core/SkDraw.h"
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
index ae29057..75d3a0e 100644
--- a/src/core/SkBitmapController.cpp
+++ b/src/core/SkBitmapController.cpp
@@ -7,8 +7,8 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkMatrix.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapCache.h"
#include "src/core/SkBitmapController.h"
#include "src/core/SkBitmapProvider.h"
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index 74fc56f..43841ae 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -11,10 +11,10 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkPaint.h"
#include "include/core/SkShader.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkFixed.h"
#include "include/private/SkFloatBits.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapController.h"
#include "src/core/SkBitmapProvider.h"
#include "src/core/SkMatrixPriv.h"
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index e118a4c..6967234 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -10,10 +10,10 @@
#include "include/core/SkColor.h"
#include "include/core/SkColorFilter.h"
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTo.h"
#include "src/core/SkAntiRun.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkMask.h"
#include "src/core/SkMaskFilterBase.h"
#include "src/core/SkPaintPriv.h"
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index 3d9b9d0..89b107b 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkColorSpace.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkCoreBlitters.h"
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 0ea506b..195a800 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -18,10 +18,10 @@
#include "include/core/SkString.h"
#include "include/core/SkTextBlob.h"
#include "include/core/SkVertices.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNx.h"
#include "include/private/SkTo.h"
#include "include/utils/SkNoDrawCanvas.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapDevice.h"
#include "src/core/SkCanvasPriv.h"
#include "src/core/SkClipOpPriv.h"
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index cb84aeb..16d0528 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -9,9 +9,9 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/core/SkUnPreMultiply.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNx.h"
#include "include/private/SkTDArray.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkColorFilterPriv.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkColorSpaceXformSteps.h"
diff --git a/src/core/SkDeferredDisplayList.cpp b/src/core/SkDeferredDisplayList.cpp
index c4ce656..639b1fa 100644
--- a/src/core/SkDeferredDisplayList.cpp
+++ b/src/core/SkDeferredDisplayList.cpp
@@ -5,10 +5,16 @@
* found in the LICENSE file.
*/
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
#include "include/private/SkDeferredDisplayList.h"
+#include <utility>
+class SkSurfaceCharacterization;
-#include "include/core/SkCanvas.h"
-#include "include/core/SkSurface.h"
+#if SK_SUPPORT_GPU
+#include "include/private/GrOpList.h"
+#include "src/gpu/ccpr/GrCCPerOpListPaths.h"
+#endif
SkDeferredDisplayList::SkDeferredDisplayList(const SkSurfaceCharacterization& characterization,
sk_sp<LazyProxyData> lazyProxyData)
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 5d225fd..3d86ea9 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -15,11 +15,11 @@
#include "include/core/SkShader.h"
#include "include/core/SkString.h"
#include "include/core/SkStrokeRec.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkMacros.h"
#include "include/private/SkTemplates.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkAutoBlitterChoose.h"
#include "src/core/SkBlendModePriv.h"
#include "src/core/SkBlitter.h"
diff --git a/src/core/SkDrawLooper.cpp b/src/core/SkDrawLooper.cpp
index bfe89b3..e888bd2 100644
--- a/src/core/SkDrawLooper.cpp
+++ b/src/core/SkDrawLooper.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkPaint.h"
#include "include/core/SkRect.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
bool SkDrawLooper::canComputeFastBounds(const SkPaint& paint) const {
SkCanvas canvas;
diff --git a/src/core/SkDraw_vertices.cpp b/src/core/SkDraw_vertices.cpp
index 939757c..d84daa7 100644
--- a/src/core/SkDraw_vertices.cpp
+++ b/src/core/SkDraw_vertices.cpp
@@ -6,8 +6,8 @@
*/
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNx.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkAutoBlitterChoose.h"
#include "src/core/SkConvertPixels.h"
#include "src/core/SkCoreBlitters.h"
diff --git a/src/core/SkEdgeBuilder.h b/src/core/SkEdgeBuilder.h
index 96b4e15..4f16705 100644
--- a/src/core/SkEdgeBuilder.h
+++ b/src/core/SkEdgeBuilder.h
@@ -8,9 +8,9 @@
#define SkEdgeBuilder_DEFINED
#include "include/core/SkRect.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTDArray.h"
#include "src/core/SkAnalyticEdge.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkEdge.h"
class SkPath;
diff --git a/src/core/SkGlyph.cpp b/src/core/SkGlyph.cpp
index f151a6d..6c7b65c 100644
--- a/src/core/SkGlyph.cpp
+++ b/src/core/SkGlyph.cpp
@@ -7,7 +7,7 @@
#include "src/core/SkGlyph.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkScalerContext.h"
diff --git a/src/core/SkImageFilterCache.cpp b/src/core/SkImageFilterCache.cpp
index e851f46..7cdc595 100644
--- a/src/core/SkImageFilterCache.cpp
+++ b/src/core/SkImageFilterCache.cpp
@@ -14,10 +14,10 @@
#include "include/private/SkMutex.h"
#include "include/private/SkOnce.h"
#include "include/private/SkTHash.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkOpts.h"
#include "src/core/SkSpecialImage.h"
#include "src/core/SkTDynamicHash.h"
+#include "src/core/SkTInternalLList.h"
#ifdef SK_BUILD_FOR_IOS
enum { kDefaultCacheSize = 2 * 1024 * 1024 };
diff --git a/src/core/SkLRUCache.h b/src/core/SkLRUCache.h
index f168c5b..9c5e671 100644
--- a/src/core/SkLRUCache.h
+++ b/src/core/SkLRUCache.h
@@ -10,7 +10,7 @@
#include "include/private/SkChecksum.h"
#include "include/private/SkTHash.h"
-#include "include/private/SkTInternalLList.h"
+#include "src/core/SkTInternalLList.h"
/**
* A generic LRU cache.
diff --git a/src/core/SkMaskBlurFilter.cpp b/src/core/SkMaskBlurFilter.cpp
index 22ce3ef..a2c84e2 100644
--- a/src/core/SkMaskBlurFilter.cpp
+++ b/src/core/SkMaskBlurFilter.cpp
@@ -8,11 +8,11 @@
#include "src/core/SkMaskBlurFilter.h"
#include "include/core/SkColorPriv.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkMalloc.h"
#include "include/private/SkNx.h"
#include "include/private/SkTemplates.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkGaussFilter.h"
#include <cmath>
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index e9630a2..f3642fb 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkColorFilter.h"
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/utils/SkRandom.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlendModePriv.h"
#include "src/core/SkBlitRow.h"
#include "src/core/SkColorSpacePriv.h"
diff --git a/src/core/SkNormalFlatSource.cpp b/src/core/SkNormalFlatSource.cpp
index 8483647..13fa2af 100644
--- a/src/core/SkNormalFlatSource.cpp
+++ b/src/core/SkNormalFlatSource.cpp
@@ -8,7 +8,7 @@
#include "src/core/SkNormalFlatSource.h"
#include "include/core/SkPoint3.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkNormalSource.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkWriteBuffer.h"
diff --git a/src/core/SkNormalMapSource.cpp b/src/core/SkNormalMapSource.cpp
index fab80a3..b359733 100644
--- a/src/core/SkNormalMapSource.cpp
+++ b/src/core/SkNormalMapSource.cpp
@@ -8,7 +8,7 @@
#include "src/core/SkNormalMapSource.h"
#include "include/core/SkMatrix.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkNormalSource.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkWriteBuffer.h"
diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h
index b869e54..f0d8fbb 100644
--- a/src/core/SkRasterPipeline.h
+++ b/src/core/SkRasterPipeline.h
@@ -11,9 +11,9 @@
#include "include/core/SkColor.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNx.h"
#include "include/private/SkTArray.h"
+#include "src/core/SkArenaAlloc.h"
#include <functional>
#include <vector> // TODO: unused
diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index b02a4a5..d09c16d 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -9,8 +9,8 @@
#include "include/core/SkColorFilter.h"
#include "include/core/SkPaint.h"
#include "include/core/SkShader.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlendModePriv.h"
#include "src/core/SkBlitter.h"
#include "src/core/SkColorSpacePriv.h"
diff --git a/src/core/SkRecord.h b/src/core/SkRecord.h
index 0565acc..68c63492 100644
--- a/src/core/SkRecord.h
+++ b/src/core/SkRecord.h
@@ -8,9 +8,9 @@
#ifndef SkRecord_DEFINED
#define SkRecord_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTLogic.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkRecords.h"
// SkRecord represents a sequence of SkCanvas calls, saved for future use.
diff --git a/src/core/SkRemoteGlyphCacheImpl.h b/src/core/SkRemoteGlyphCacheImpl.h
index cabc619..a98f630 100644
--- a/src/core/SkRemoteGlyphCacheImpl.h
+++ b/src/core/SkRemoteGlyphCacheImpl.h
@@ -8,7 +8,7 @@
#ifndef SkRemoteGlyphCacheImpl_DEFINED
#define SkRemoteGlyphCacheImpl_DEFINED
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkDescriptor.h"
#include "src/core/SkGlyphRun.h"
#include "src/core/SkGlyphRunPainter.h"
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index 8e94fb2..457929d 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkColorFilter.h"
#include "include/core/SkPaint.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlitRow.h"
#include "src/core/SkSpriteBlitter.h"
#include "src/core/SkXfermodePriv.h"
diff --git a/src/core/SkSpriteBlitter_RGB565.cpp b/src/core/SkSpriteBlitter_RGB565.cpp
index 1cf7558..d0d5a99 100644
--- a/src/core/SkSpriteBlitter_RGB565.cpp
+++ b/src/core/SkSpriteBlitter_RGB565.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkColorFilter.h"
#include "include/core/SkPaint.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlitRow.h"
#include "src/core/SkSpriteBlitter.h"
#include "src/core/SkXfermodePriv.h"
diff --git a/src/core/SkStrike.h b/src/core/SkStrike.h
index c86b316..f0d081d 100644
--- a/src/core/SkStrike.h
+++ b/src/core/SkStrike.h
@@ -10,9 +10,9 @@
#include "include/core/SkFontMetrics.h"
#include "include/core/SkFontTypes.h"
#include "include/core/SkPaint.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTHash.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkDescriptor.h"
#include "src/core/SkGlyph.h"
#include "src/core/SkGlyphRunPainter.h"
diff --git a/include/private/SkTInternalLList.h b/src/core/SkTInternalLList.h
similarity index 100%
rename from include/private/SkTInternalLList.h
rename to src/core/SkTInternalLList.h
diff --git a/src/core/SkTLList.h b/src/core/SkTLList.h
index d542926..496ee9e 100644
--- a/src/core/SkTLList.h
+++ b/src/core/SkTLList.h
@@ -10,8 +10,8 @@
#include "include/core/SkTypes.h"
#include "include/private/SkMalloc.h"
-#include "include/private/SkTInternalLList.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkTInternalLList.h"
#include <new>
#include <utility>
diff --git a/src/effects/SkHighContrastFilter.cpp b/src/effects/SkHighContrastFilter.cpp
index de9c4ab..131f4f5 100644
--- a/src/effects/SkHighContrastFilter.cpp
+++ b/src/effects/SkHighContrastFilter.cpp
@@ -7,8 +7,8 @@
#include "include/core/SkString.h"
#include "include/effects/SkHighContrastFilter.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkEffectPriv.h"
#include "src/core/SkRasterPipeline.h"
#include "src/core/SkReadBuffer.h"
diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp
index d9b6eb7..1dd5b29 100644
--- a/src/effects/SkLayerDrawLooper.cpp
+++ b/src/effects/SkLayerDrawLooper.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkUnPreMultiply.h"
#include "include/effects/SkBlurDrawLooper.h"
#include "include/effects/SkLayerDrawLooper.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlendModePriv.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkMaskFilterBase.h"
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 00cb8f8..6928aac 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -6,7 +6,7 @@
*/
#include "include/effects/SkOverdrawColorFilter.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkEffectPriv.h"
#include "src/core/SkRasterPipeline.h"
#include "src/core/SkReadBuffer.h"
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index b8dbe47..89be992 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -10,9 +10,9 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkString.h"
#include "include/core/SkUnPreMultiply.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkEffectPriv.h"
#include "src/core/SkRasterPipeline.h"
#include "src/core/SkReadBuffer.h"
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 8d756f9..6148b2b 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -10,10 +10,10 @@
#include <algorithm>
#include "include/core/SkBitmap.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkNx.h"
#include "include/private/SkTFitsIn.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkGpuBlurUtils.h"
#include "src/core/SkImageFilterPriv.h"
diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h
index bb3a0a3..f488f6e 100644
--- a/src/gpu/GrDrawOpAtlas.h
+++ b/src/gpu/GrDrawOpAtlas.h
@@ -12,9 +12,9 @@
#include "include/core/SkSize.h"
#include "include/private/SkTDArray.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkGlyphRunPainter.h"
#include "src/core/SkIPoint16.h"
+#include "src/core/SkTInternalLList.h"
#include "src/gpu/ops/GrDrawOp.h"
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index e87f0d2..ad0260f 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -10,7 +10,7 @@
#include <utility>
#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkArenaAllocList.h"
#include "src/gpu/GrAppliedClip.h"
#include "src/gpu/GrBufferAllocPool.h"
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index e27f694..2eec472 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -12,8 +12,8 @@
#include "include/core/SkStrokeRec.h"
#include "include/core/SkTypes.h"
#include "include/private/GrOpList.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTArray.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkClipStack.h"
#include "src/core/SkStringUtils.h"
#include "src/core/SkTLazy.h"
diff --git a/src/gpu/GrResourceAllocator.h b/src/gpu/GrResourceAllocator.h
index 2bb201f..668c996 100644
--- a/src/gpu/GrResourceAllocator.h
+++ b/src/gpu/GrResourceAllocator.h
@@ -12,7 +12,7 @@
#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrGpuResourcePriv.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkTDynamicHash.h"
#include "src/core/SkTMultiMap.h"
diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h
index 7796b23..3734d39 100644
--- a/src/gpu/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
@@ -13,9 +13,9 @@
#include "include/private/GrResourceKey.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkMessageBus.h"
#include "src/core/SkTDPQueue.h"
+#include "src/core/SkTInternalLList.h"
#include "src/core/SkTMultiMap.h"
#include "src/gpu/GrGpuResourceCacheAccess.h"
#include "src/gpu/GrGpuResourcePriv.h"
diff --git a/src/gpu/GrTRecorder.h b/src/gpu/GrTRecorder.h
index bf630fe..46e5bc3 100644
--- a/src/gpu/GrTRecorder.h
+++ b/src/gpu/GrTRecorder.h
@@ -9,8 +9,8 @@
#define GrTRecorder_DEFINED
#include "include/gpu/GrTypes.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTLogic.h"
+#include "src/core/SkArenaAlloc.h"
/**
* Records a list of items with a common base type, optional associated data, and
diff --git a/src/gpu/GrTessellator.cpp b/src/gpu/GrTessellator.cpp
index 1d8c5d2..1ceed08 100644
--- a/src/gpu/GrTessellator.cpp
+++ b/src/gpu/GrTessellator.cpp
@@ -12,7 +12,7 @@
#include "src/gpu/GrVertexWriter.h"
#include "include/core/SkPath.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkGeometry.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkTDPQueue.h"
diff --git a/src/gpu/ccpr/GrCCClipPath.cpp b/src/gpu/ccpr/GrCCClipPath.cpp
index 77de299..fc73699 100644
--- a/src/gpu/ccpr/GrCCClipPath.cpp
+++ b/src/gpu/ccpr/GrCCClipPath.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/GrCCClipPath.h"
+#include "src/gpu/ccpr/GrCCClipPath.h"
#include "include/gpu/GrTexture.h"
#include "src/gpu/GrOnFlushResourceProvider.h"
diff --git a/include/private/GrCCClipPath.h b/src/gpu/ccpr/GrCCClipPath.h
similarity index 100%
rename from include/private/GrCCClipPath.h
rename to src/gpu/ccpr/GrCCClipPath.h
diff --git a/src/gpu/ccpr/GrCCClipProcessor.cpp b/src/gpu/ccpr/GrCCClipProcessor.cpp
index dbfcc04..ec3d43f 100644
--- a/src/gpu/ccpr/GrCCClipProcessor.cpp
+++ b/src/gpu/ccpr/GrCCClipProcessor.cpp
@@ -8,9 +8,9 @@
#include "src/gpu/ccpr/GrCCClipProcessor.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrCCClipPath.h"
#include "include/private/GrTextureProxy.h"
#include "src/core/SkMakeUnique.h"
+#include "src/gpu/ccpr/GrCCClipPath.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index 46d03c9..85c339f 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -8,7 +8,7 @@
#ifndef GrCCDrawPathsOp_DEFINED
#define GrCCDrawPathsOp_DEFINED
-#include "include/private/SkTInternalLList.h"
+#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include "src/gpu/ccpr/GrCCSTLList.h"
diff --git a/src/gpu/ccpr/GrCCPathCache.h b/src/gpu/ccpr/GrCCPathCache.h
index 17e11b4..eb8d6c5 100644
--- a/src/gpu/ccpr/GrCCPathCache.h
+++ b/src/gpu/ccpr/GrCCPathCache.h
@@ -9,8 +9,8 @@
#define GrCCPathCache_DEFINED
#include "include/private/SkTHash.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkExchange.h"
+#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrShape.h"
#include "src/gpu/ccpr/GrCCAtlas.h"
#include "src/gpu/ccpr/GrCCPathProcessor.h"
diff --git a/include/private/GrCCPerOpListPaths.h b/src/gpu/ccpr/GrCCPerOpListPaths.h
similarity index 85%
rename from include/private/GrCCPerOpListPaths.h
rename to src/gpu/ccpr/GrCCPerOpListPaths.h
index 71b82bc..e0dd115 100644
--- a/include/private/GrCCPerOpListPaths.h
+++ b/src/gpu/ccpr/GrCCPerOpListPaths.h
@@ -9,9 +9,9 @@
#define GrCCPerOpListPaths_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrCCClipPath.h"
-#include "include/private/SkArenaAlloc.h"
-#include "include/private/SkTInternalLList.h"
+#include "src/core/SkArenaAlloc.h"
+#include "src/core/SkTInternalLList.h"
+#include "src/gpu/ccpr/GrCCClipPath.h"
#include <map>
diff --git a/src/gpu/ccpr/GrCCSTLList.h b/src/gpu/ccpr/GrCCSTLList.h
index ef81104..eb75863 100644
--- a/src/gpu/ccpr/GrCCSTLList.h
+++ b/src/gpu/ccpr/GrCCSTLList.h
@@ -8,8 +8,8 @@
#ifndef GrCCSTLList_DEFINED
#define GrCCSTLList_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNoncopyable.h"
+#include "src/core/SkArenaAlloc.h"
#include <new>
/**
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
index 83ecc8d..fe59c20 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
@@ -9,11 +9,11 @@
#define GrCoverageCountingPathRenderer_DEFINED
#include <map>
-#include "include/private/GrCCPerOpListPaths.h"
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/GrRenderTargetOpList.h"
#include "src/gpu/ccpr/GrCCPerFlushResources.h"
+#include "src/gpu/ccpr/GrCCPerOpListPaths.h"
class GrCCDrawPathsOp;
class GrCCPathCache;
diff --git a/src/gpu/text/GrStrikeCache.h b/src/gpu/text/GrStrikeCache.h
index a3877a0..f2fdce7 100644
--- a/src/gpu/text/GrStrikeCache.h
+++ b/src/gpu/text/GrStrikeCache.h
@@ -8,8 +8,8 @@
#ifndef GrStrikeCache_DEFINED
#define GrStrikeCache_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "src/codec/SkMasks.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkStrike.h"
#include "src/core/SkTDynamicHash.h"
#include "src/gpu/GrDrawOpAtlas.h"
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 3a9e2fa..b32c886 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -12,12 +12,12 @@
#include "include/core/SkPoint3.h"
#include "include/core/SkSurfaceProps.h"
#include "include/private/GrColor.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkDescriptor.h"
#include "src/core/SkMaskFilterBase.h"
#include "src/core/SkOpts.h"
#include "src/core/SkRectPriv.h"
#include "src/core/SkStrikeCache.h"
+#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrDrawOpAtlas.h"
#include "src/gpu/text/GrStrikeCache.h"
#include "src/gpu/text/GrTextContext.h"
diff --git a/src/gpu/vk/GrVkResourceProvider.h b/src/gpu/vk/GrVkResourceProvider.h
index 46088f9..3df1a4d 100644
--- a/src/gpu/vk/GrVkResourceProvider.h
+++ b/src/gpu/vk/GrVkResourceProvider.h
@@ -10,9 +10,9 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "include/private/SkTArray.h"
-#include "include/private/SkTInternalLList.h"
#include "src/core/SkLRUCache.h"
#include "src/core/SkTDynamicHash.h"
+#include "src/core/SkTInternalLList.h"
#include "src/gpu/GrResourceHandle.h"
#include "src/gpu/vk/GrVkDescriptorPool.h"
#include "src/gpu/vk/GrVkDescriptorSetManager.h"
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp
index fa68e49..fe09a2c 100644
--- a/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/src/lazy/SkDiscardableMemoryPool.cpp
@@ -7,10 +7,10 @@
#include "include/private/SkMalloc.h"
#include "include/private/SkMutex.h"
-#include "include/private/SkTInternalLList.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkDiscardableMemory.h"
#include "src/core/SkMakeUnique.h"
+#include "src/core/SkTInternalLList.h"
#include "src/lazy/SkDiscardableMemoryPool.h"
// Note:
diff --git a/src/pathops/SkOpBuilder.cpp b/src/pathops/SkOpBuilder.cpp
index 38bbf3c..9dac160 100644
--- a/src/pathops/SkOpBuilder.cpp
+++ b/src/pathops/SkOpBuilder.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkMatrix.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkPathPriv.h"
#include "src/pathops/SkOpEdgeBuilder.h"
#include "src/pathops/SkPathOpsCommon.h"
diff --git a/src/pathops/SkOpCoincidence.h b/src/pathops/SkOpCoincidence.h
index fe75909..283c28e 100644
--- a/src/pathops/SkOpCoincidence.h
+++ b/src/pathops/SkOpCoincidence.h
@@ -7,8 +7,8 @@
#ifndef SkOpCoincidence_DEFINED
#define SkOpCoincidence_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTDArray.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkOpSpan.h"
#include "src/pathops/SkPathOpsTypes.h"
diff --git a/src/pathops/SkOpSegment.h b/src/pathops/SkOpSegment.h
index a6366ae..e75554b 100644
--- a/src/pathops/SkOpSegment.h
+++ b/src/pathops/SkOpSegment.h
@@ -7,7 +7,7 @@
#ifndef SkOpSegment_DEFINE
#define SkOpSegment_DEFINE
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkOpAngle.h"
#include "src/pathops/SkOpSpan.h"
#include "src/pathops/SkPathOpsBounds.h"
diff --git a/src/pathops/SkPathOpsCubic.h b/src/pathops/SkPathOpsCubic.h
index f774359..cc923e4 100644
--- a/src/pathops/SkPathOpsCubic.h
+++ b/src/pathops/SkPathOpsCubic.h
@@ -9,7 +9,7 @@
#define SkPathOpsCubic_DEFINED
#include "include/core/SkPath.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkPathOpsTCurve.h"
struct SkDCubicPair;
diff --git a/src/pathops/SkPathOpsQuad.h b/src/pathops/SkPathOpsQuad.h
index 0e8cd27..5489485 100644
--- a/src/pathops/SkPathOpsQuad.h
+++ b/src/pathops/SkPathOpsQuad.h
@@ -8,7 +8,7 @@
#ifndef SkPathOpsQuad_DEFINED
#define SkPathOpsQuad_DEFINED
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkPathOpsTCurve.h"
struct SkOpCurve;
diff --git a/src/pathops/SkPathOpsTSect.h b/src/pathops/SkPathOpsTSect.h
index 59ddcc3..587209d 100644
--- a/src/pathops/SkPathOpsTSect.h
+++ b/src/pathops/SkPathOpsTSect.h
@@ -7,8 +7,8 @@
#ifndef SkPathOpsTSect_DEFINED
#define SkPathOpsTSect_DEFINED
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkMacros.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkTSort.h"
#include "src/pathops/SkIntersections.h"
#include "src/pathops/SkPathOpsBounds.h"
diff --git a/src/pathops/SkPathOpsTypes.cpp b/src/pathops/SkPathOpsTypes.cpp
index ac57bc4..92c3a7a 100644
--- a/src/pathops/SkPathOpsTypes.cpp
+++ b/src/pathops/SkPathOpsTypes.cpp
@@ -4,8 +4,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkFloatBits.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkOpCoincidence.h"
#include "src/pathops/SkPathOpsTypes.h"
diff --git a/src/pdf/SkPDFTag.h b/src/pdf/SkPDFTag.h
index 11158b0..0b859bb 100644
--- a/src/pdf/SkPDFTag.h
+++ b/src/pdf/SkPDFTag.h
@@ -9,9 +9,9 @@
#define SkPDFTag_DEFINED
#include "include/docs/SkPDFDocument.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
+#include "src/core/SkArenaAlloc.h"
class SkPDFDocument;
struct SkPDFTagNode;
diff --git a/src/shaders/SkBitmapProcShader.cpp b/src/shaders/SkBitmapProcShader.cpp
index 0d5dc2b..9676798 100644
--- a/src/shaders/SkBitmapProcShader.cpp
+++ b/src/shaders/SkBitmapProcShader.cpp
@@ -7,7 +7,7 @@
#include "src/shaders/SkBitmapProcShader.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapProcState.h"
#include "src/core/SkBitmapProvider.h"
#include "src/core/SkXfermodePriv.h"
diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp
index 0db94ea..64eff11 100644
--- a/src/shaders/SkColorFilterShader.cpp
+++ b/src/shaders/SkColorFilterShader.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkShader.h"
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkWriteBuffer.h"
#include "src/shaders/SkColorFilterShader.h"
diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp
index ecbd3c7..2820e26 100644
--- a/src/shaders/SkColorShader.cpp
+++ b/src/shaders/SkColorShader.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkColorSpace.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkRasterPipeline.h"
diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp
index 1d3bba6..8f9f7e3 100644
--- a/src/shaders/SkComposeShader.cpp
+++ b/src/shaders/SkComposeShader.cpp
@@ -7,8 +7,8 @@
#include "include/core/SkColorFilter.h"
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlendModePriv.h"
#include "src/core/SkRasterPipeline.h"
#include "src/core/SkReadBuffer.h"
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 24162fc..fe3fbfd 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapController.h"
#include "src/core/SkBitmapProvider.h"
#include "src/core/SkColorSpacePriv.h"
diff --git a/src/shaders/SkLightingShader.cpp b/src/shaders/SkLightingShader.cpp
index bc4e631..fc8dff8 100644
--- a/src/shaders/SkLightingShader.cpp
+++ b/src/shaders/SkLightingShader.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkColor.h"
#include "include/core/SkPoint3.h"
#include "include/core/SkUnPreMultiply.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapProcState.h"
#include "src/core/SkMathPriv.h"
#include "src/core/SkNormalSource.h"
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 56bbb93..f72a631 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkShader.h"
#include "include/core/SkString.h"
#include "include/core/SkUnPreMultiply.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkWriteBuffer.h"
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index 53bdf72..60a08e5 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkImage.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkMatrixUtils.h"
#include "src/core/SkPicturePriv.h"
#include "src/core/SkReadBuffer.h"
diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp
index 6c7b757..0095a95 100644
--- a/src/shaders/SkShader.cpp
+++ b/src/shaders/SkShader.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkPaint.h"
#include "include/core/SkPicture.h"
#include "include/core/SkScalar.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkRasterPipeline.h"
diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index eec9a99..b362e90 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -11,9 +11,9 @@
#include "include/effects/SkGradientShader.h"
#include "include/core/SkMatrix.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/shaders/SkShaderBase.h"
class SkColorSpace;
diff --git a/src/utils/SkJSON.h b/src/utils/SkJSON.h
index 23aa322..931b30f 100644
--- a/src/utils/SkJSON.h
+++ b/src/utils/SkJSON.h
@@ -9,9 +9,9 @@
#define SkJSON_DEFINED
#include "include/core/SkTypes.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNoncopyable.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include <cstring>
diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index 2113422..9387331 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -7,9 +7,9 @@
#include "src/utils/SkPatchUtils.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTo.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkConvertPixels.h"
#include "src/core/SkGeometry.h"
diff --git a/src/utils/SkPolyUtils.cpp b/src/utils/SkPolyUtils.cpp
index 86212f1..c3b2e31 100644
--- a/src/utils/SkPolyUtils.cpp
+++ b/src/utils/SkPolyUtils.cpp
@@ -11,10 +11,10 @@
#include "include/private/SkNx.h"
#include "include/private/SkTArray.h"
-#include "include/private/SkTInternalLList.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkTDPQueue.h"
+#include "src/core/SkTInternalLList.h"
//////////////////////////////////////////////////////////////////////////////////
// Helper data structures and functions
diff --git a/src/xml/SkDOM.h b/src/xml/SkDOM.h
index 4d0ab9d..01d5157 100644
--- a/src/xml/SkDOM.h
+++ b/src/xml/SkDOM.h
@@ -10,9 +10,9 @@
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkArenaAlloc.h"
#include "include/private/SkNoncopyable.h"
#include "include/private/SkTemplates.h"
+#include "src/core/SkArenaAlloc.h"
struct SkDOMNode;
struct SkDOMAttr;
diff --git a/tests/ArenaAllocTest.cpp b/tests/ArenaAllocTest.cpp
index b4a8d56..e7059f9 100644
--- a/tests/ArenaAllocTest.cpp
+++ b/tests/ArenaAllocTest.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "tests/Test.h"
#include <memory>
diff --git a/tests/JSONTest.cpp b/tests/JSONTest.cpp
index fface4a..66b801d 100644
--- a/tests/JSONTest.cpp
+++ b/tests/JSONTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkStream.h"
#include "include/core/SkString.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/utils/SkJSON.h"
using namespace skjson;
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index 9735aee..2ed880d 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/SkTInternalLList.h"
#include "include/utils/SkRandom.h"
+#include "src/core/SkTInternalLList.h"
#include "src/core/SkTLList.h"
#include "tests/Test.h"
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 18a756f..d6b0de6 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -13,7 +13,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkScalar.h"
#include "include/effects/SkLayerDrawLooper.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBitmapDevice.h"
#include "src/core/SkDraw.h"
#include "tests/Test.h"
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 580ba78..05cbd6d 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkPoint3.h"
#include "include/core/SkTypes.h"
#include "include/effects/SkLightingImageFilter.h"
-#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkArenaAlloc.h"
#include "tests/Test.h"
/*