Move ccpr headers for display list out of include/private.

This partially undoes 774168efac "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>

gn/core.gni

@@ -198,6 +198,7 @@ skia_core_sources = [
   "$_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 @@ skia_core_sources = [
   "$_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 @@ skia_core_sources = [
   "$_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 @@ skia_core_sources = [
   "$_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",

gn/gpu.gni

@@ -35,8 +35,6 @@ skia_gpu_sources = [
   "$_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 @@ skia_ccpr_sources = [
   "$_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",

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 @@ public:
         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;
     }
 

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"
 

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>
 

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

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"
 

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"

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"

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"

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"

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"

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"

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)

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"

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;

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"

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;

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"
 

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 };

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.

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>

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"

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"

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"

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
 

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"

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.

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"

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"

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"

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"

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>
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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

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"

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"

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"
 

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"

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"

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>
 

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>
 
 /**

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;

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"

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"

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"

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:

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"

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"
 

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"

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;

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;

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"

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"
 

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;

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"

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"

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"

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"

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"

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"

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"

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"

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"

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;

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>
 

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"

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

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;

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>

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;

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"
 

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"

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"
 
 /*