Move a bunch of gpu files out of include/private and into src/gpu.
In GrRecordingContext I moved the auditTrail onto the heap and only there
when compiling for tests. This allowed us to move a lot of files out of
include private.
Change-Id: Ib76ac211c0c6fd10bacaccf0c5f93f21a59f35d5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221344
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
diff --git a/bench/ParagraphBench.cpp b/bench/ParagraphBench.cpp
index 6b333fc..cffbef8 100644
--- a/bench/ParagraphBench.cpp
+++ b/bench/ParagraphBench.cpp
@@ -5,9 +5,9 @@
#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_GOOGLE3)
+#include "modules/skparagraph/include/FontCollection.h"
#include "modules/skparagraph/include/Paragraph.h"
#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
-#include "modules/skparagraph/include/FontCollection.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
#include "tools/Resources.h"
diff --git a/experimental/xform/SkXform.h b/experimental/xform/SkXform.h
index 6929f08..c47a7be 100644
--- a/experimental/xform/SkXform.h
+++ b/experimental/xform/SkXform.h
@@ -8,12 +8,12 @@
#ifndef SkXform_DEFINED
#define SkXform_DEFINED
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkMatrix.h"
#include "include/core/SkClipOp.h"
-#include "include/core/SkRect.h"
-#include "include/core/SkRRect.h"
+#include "include/core/SkMatrix.h"
#include "include/core/SkPath.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
#include "include/private/SkTDArray.h"
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 6adc688..02ef01e 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -20,8 +20,6 @@
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "src/gpu/GrBuffer.h"
@@ -45,6 +43,8 @@
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/GrShaderVar.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/glsl/GrGLSLPrimitiveProcessor.h"
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index beb16d6..d678af8 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -27,9 +27,9 @@
#include "include/effects/SkGradientShader.h"
#include "include/gpu/GrConfig.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrColor.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrFragmentProcessor.h"
#include "src/gpu/GrPaint.h"
#include "src/gpu/GrRenderTargetContext.h"
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index c47fb28..1d54c0d 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -28,11 +28,11 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/core/SkMakeUnique.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkImage_Gpu.h"
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 94a5c0e..baec473 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -19,8 +19,6 @@
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "src/gpu/GrBuffer.h"
@@ -43,6 +41,8 @@
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/GrShaderVar.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 9171f2d..aa58777 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -25,7 +25,6 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "src/gpu/GrCaps.h"
@@ -35,6 +34,7 @@
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/ops/GrDrawOp.h"
diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp
index feda039..13d0489 100644
--- a/gm/windowrectangles.cpp
+++ b/gm/windowrectangles.cpp
@@ -22,7 +22,6 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "src/core/SkClipOpPriv.h"
@@ -38,6 +37,7 @@
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrStencilClip.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrUserStencilSettings.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "tools/ToolUtils.h"
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index 872fc34..07a552f 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -23,7 +23,6 @@
#include "include/core/SkYUVAIndex.h"
#include "include/gpu/GrContext.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
@@ -32,6 +31,7 @@
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
#include "src/gpu/effects/GrYUVtoRGBEffect.h"
#include "src/gpu/ops/GrDrawOp.h"
diff --git a/gn/gpu.gni b/gn/gpu.gni
index 8a1904d..664295c 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -32,23 +32,17 @@
"$_include/gpu/gl/GrGLTypes.h",
# Private includes
- "$_include/private/GrAuditTrail.h",
- "$_include/private/GrColor.h",
"$_include/private/GrContext_Base.h",
"$_include/private/GrGLTypesPriv.h",
"$_include/private/GrImageContext.h",
- "$_include/private/GrOpList.h",
- "$_include/private/GrProxyRef.h",
"$_include/private/GrRecordingContext.h",
- "$_include/private/GrRenderTargetProxy.h",
"$_include/private/GrResourceKey.h",
"$_include/private/GrSingleOwner.h",
- "$_include/private/GrSurfaceProxy.h",
- "$_include/private/GrTextureProxy.h",
"$_include/private/GrTypesPriv.h",
"$_src/gpu/GrAppliedClip.h",
"$_src/gpu/GrAuditTrail.cpp",
+ "$_src/gpu/GrAuditTrail.h",
"$_src/gpu/GrAutoLocaleSetter.h",
"$_src/gpu/GrAllocator.h",
"$_src/gpu/GrBackendSurface.cpp",
@@ -71,6 +65,7 @@
"$_src/gpu/GrClip.h",
"$_src/gpu/GrClipStackClip.h",
"$_src/gpu/GrClipStackClip.cpp",
+ "$_src/gpu/GrColor.h",
"$_src/gpu/GrColorSpaceInfo.cpp",
"$_src/gpu/GrColorSpaceXform.cpp",
"$_src/gpu/GrColorSpaceXform.h",
@@ -127,6 +122,7 @@
"$_src/gpu/GrOpFlushState.cpp",
"$_src/gpu/GrOpFlushState.h",
"$_src/gpu/GrOpList.cpp",
+ "$_src/gpu/GrOpList.h",
"$_src/gpu/GrPaint.cpp",
"$_src/gpu/GrPaint.h",
"$_src/gpu/GrPathRendererChain.cpp",
@@ -134,6 +130,7 @@
"$_src/gpu/GrPathRenderer.cpp",
"$_src/gpu/GrPathRenderer.h",
"$_src/gpu/GrPendingIOResource.h",
+ "$_src/gpu/GrProxyRef.h",
"$_src/gpu/GrOnFlushResourceProvider.cpp",
"$_src/gpu/GrOnFlushResourceProvider.h",
"$_src/gpu/GrPipeline.cpp",
@@ -162,6 +159,7 @@
"$_src/gpu/GrRenderTarget.cpp",
"$_src/gpu/GrRenderTargetPriv.h",
"$_src/gpu/GrRenderTargetProxy.cpp",
+ "$_src/gpu/GrRenderTargetProxy.h",
"$_src/gpu/GrRenderTargetProxyPriv.h",
"$_src/gpu/GrReducedClip.cpp",
"$_src/gpu/GrReducedClip.h",
@@ -184,6 +182,12 @@
"$_src/gpu/GrSemaphore.h",
"$_src/gpu/GrShaderCaps.h",
"$_src/gpu/GrShaderCaps.cpp",
+ "$_src/gpu/GrShaderUtils.cpp",
+ "$_src/gpu/GrShaderUtils.h",
+ "$_src/gpu/GrShaderVar.cpp",
+ "$_src/gpu/GrShaderVar.h",
+ "$_src/gpu/GrSoftwarePathRenderer.cpp",
+ "$_src/gpu/GrSoftwarePathRenderer.h",
"$_src/gpu/GrStencilAttachment.cpp",
"$_src/gpu/GrStencilAttachment.h",
"$_src/gpu/GrStencilClip.h",
@@ -191,32 +195,23 @@
"$_src/gpu/GrStencilSettings.h",
"$_src/gpu/GrStyle.cpp",
"$_src/gpu/GrStyle.h",
- "$_src/gpu/GrSurfaceContextPriv.h",
- "$_src/gpu/GrSurfaceProxyPriv.h",
- "$_src/gpu/GrSwizzle.cpp",
- "$_src/gpu/GrSwizzle.h",
- "$_src/gpu/GrTessellator.cpp",
- "$_src/gpu/GrTessellator.h",
- "$_src/gpu/GrTextureOpList.cpp",
- "$_src/gpu/GrTextureOpList.h",
- "$_src/gpu/GrTextureProxyCacheAccess.h",
- "$_src/gpu/GrTextureProxyPriv.h",
- "$_src/gpu/GrTracing.h",
- "$_src/gpu/GrTestUtils.cpp",
- "$_src/gpu/GrTestUtils.h",
- "$_src/gpu/GrShaderUtils.cpp",
- "$_src/gpu/GrShaderUtils.h",
- "$_src/gpu/GrShaderVar.cpp",
- "$_src/gpu/GrShaderVar.h",
- "$_src/gpu/GrSoftwarePathRenderer.cpp",
- "$_src/gpu/GrSoftwarePathRenderer.h",
- "$_src/gpu/GrSurfacePriv.h",
"$_src/gpu/GrSurface.cpp",
"$_src/gpu/GrSurfaceContext.cpp",
"$_src/gpu/GrSurfaceContext.h",
+ "$_src/gpu/GrSurfaceContextPriv.h",
"$_src/gpu/GrSurfaceProxy.cpp",
+ "$_src/gpu/GrSurfaceProxy.h",
+ "$_src/gpu/GrSurfaceProxyPriv.h",
+ "$_src/gpu/GrSurfacePriv.h",
+ "$_src/gpu/GrSwizzle.cpp",
+ "$_src/gpu/GrSwizzle.h",
"$_src/gpu/GrSWMaskHelper.cpp",
"$_src/gpu/GrSWMaskHelper.h",
+ "$_src/gpu/GrTracing.h",
+ "$_src/gpu/GrTessellator.cpp",
+ "$_src/gpu/GrTessellator.h",
+ "$_src/gpu/GrTestUtils.cpp",
+ "$_src/gpu/GrTestUtils.h",
"$_src/gpu/GrTexture.cpp",
"$_src/gpu/GrTextureAdjuster.cpp",
"$_src/gpu/GrTextureAdjuster.h",
@@ -224,10 +219,15 @@
"$_src/gpu/GrTextureContext.h",
"$_src/gpu/GrTextureMaker.cpp",
"$_src/gpu/GrTextureMaker.h",
+ "$_src/gpu/GrTextureOpList.cpp",
+ "$_src/gpu/GrTextureOpList.h",
"$_src/gpu/GrTexturePriv.h",
"$_src/gpu/GrTextureProducer.cpp",
"$_src/gpu/GrTextureProducer.h",
"$_src/gpu/GrTextureProxy.cpp",
+ "$_src/gpu/GrTextureProxy.h",
+ "$_src/gpu/GrTextureProxyCacheAccess.h",
+ "$_src/gpu/GrTextureProxyPriv.h",
"$_src/gpu/GrTextureRenderTargetProxy.cpp",
"$_src/gpu/GrTextureRenderTargetProxy.h",
"$_src/gpu/GrTRecorder.h",
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 76b6317..039c444 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -11,6 +11,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkPathEffect.h"
#include "include/core/SkTypes.h"
+#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextOptions.h"
#include "include/private/GrRecordingContext.h"
@@ -18,7 +19,6 @@
#include "include/core/SkUnPreMultiply.h"
class GrAtlasManager;
-class GrBackendFormat;
class GrBackendSemaphore;
class GrCaps;
class GrContextPriv;
@@ -357,7 +357,7 @@
// For the Vulkan backend the layout of the created VkImage will be:
// VK_IMAGE_LAYOUT_UNDEFINED.
GrBackendTexture createBackendTexture(int width, int height,
- GrBackendFormat,
+ const GrBackendFormat&,
GrMipMapped,
GrRenderable);
@@ -377,7 +377,7 @@
// For the Vulkan backend the layout of the created VkImage will be:
// VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
GrBackendTexture createBackendTexture(int width, int height,
- GrBackendFormat, const SkColor4f& color,
+ const GrBackendFormat&, const SkColor4f& color,
GrMipMapped, GrRenderable);
// If possible, create a backend texture initialized to a particular color. The client should
diff --git a/include/private/GrRecordingContext.h b/include/private/GrRecordingContext.h
index d2cc7fc..c00052e 100644
--- a/include/private/GrRecordingContext.h
+++ b/include/private/GrRecordingContext.h
@@ -9,14 +9,17 @@
#define GrRecordingContext_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrAuditTrail.h"
#include "include/private/GrImageContext.h"
+class GrAuditTrail;
+class GrBackendFormat;
class GrDrawingManager;
class GrOnFlushCallbackObject;
class GrOpMemoryPool;
class GrRecordingContextPriv;
class GrStrikeCache;
+class GrSurfaceContext;
+class GrSurfaceProxy;
class GrTextBlobCache;
class SK_API GrRecordingContext : public GrImageContext {
@@ -101,7 +104,7 @@
const SkSurfaceProps* surfaceProps = nullptr,
SkBudgeted budgeted = SkBudgeted::kYes);
- GrAuditTrail* auditTrail() { return &fAuditTrail; }
+ GrAuditTrail* auditTrail() { return fAuditTrail.get(); }
GrRecordingContext* asRecordingContext() override { return this; }
@@ -113,7 +116,7 @@
std::unique_ptr<GrStrikeCache> fStrikeCache;
std::unique_ptr<GrTextBlobCache> fTextBlobCache;
- GrAuditTrail fAuditTrail;
+ std::unique_ptr<GrAuditTrail> fAuditTrail;
typedef GrImageContext INHERITED;
};
diff --git a/modules/skottie/src/effects/TintEffect.cpp b/modules/skottie/src/effects/TintEffect.cpp
index f43fe58..69073af 100644
--- a/modules/skottie/src/effects/TintEffect.cpp
+++ b/modules/skottie/src/effects/TintEffect.cpp
@@ -8,8 +8,8 @@
#include "modules/skottie/src/effects/Effects.h"
#include "modules/skottie/src/SkottieValue.h"
-#include "modules/sksg/include/SkSGPaint.h"
#include "modules/sksg/include/SkSGColorFilter.h"
+#include "modules/sksg/include/SkSGPaint.h"
#include "src/utils/SkJSON.h"
namespace skottie {
diff --git a/modules/skparagraph/include/FontCollection.h b/modules/skparagraph/include/FontCollection.h
index b678547..8472b7e 100644
--- a/modules/skparagraph/include/FontCollection.h
+++ b/modules/skparagraph/include/FontCollection.h
@@ -4,10 +4,10 @@
#include <memory>
#include <set>
-#include "modules/skparagraph/include/TextStyle.h"
#include "include/core/SkFontMgr.h"
#include "include/core/SkRefCnt.h"
#include "include/private/SkTHash.h"
+#include "modules/skparagraph/include/TextStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/include/ParagraphStyle.h b/modules/skparagraph/include/ParagraphStyle.h
index 55ce1aa..679a2dd 100644
--- a/modules/skparagraph/include/ParagraphStyle.h
+++ b/modules/skparagraph/include/ParagraphStyle.h
@@ -2,9 +2,9 @@
#ifndef ParagraphStyle_DEFINED
#define ParagraphStyle_DEFINED
+#include "include/core/SkFontStyle.h"
#include "modules/skparagraph/include/DartTypes.h"
#include "modules/skparagraph/include/TextStyle.h"
-#include "include/core/SkFontStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/include/TextStyle.h b/modules/skparagraph/include/TextStyle.h
index 9fad675..500b88b 100644
--- a/modules/skparagraph/include/TextStyle.h
+++ b/modules/skparagraph/include/TextStyle.h
@@ -3,13 +3,13 @@
#define TextStyle_DEFINED
#include <vector>
-#include "modules/skparagraph/include/DartTypes.h"
-#include "modules/skparagraph/include/TextShadow.h"
#include "include/core/SkColor.h"
#include "include/core/SkFont.h"
#include "include/core/SkFontMetrics.h"
#include "include/core/SkFontStyle.h"
#include "include/core/SkPaint.h"
+#include "modules/skparagraph/include/DartTypes.h"
+#include "modules/skparagraph/include/TextShadow.h"
// TODO: Make it external so the other platforms (Android) could use it
#define DEFAULT_FONT_FAMILY "sans-serif"
diff --git a/modules/skparagraph/src/FontIterator.h b/modules/skparagraph/src/FontIterator.h
index 68858ec..9848258 100644
--- a/modules/skparagraph/src/FontIterator.h
+++ b/modules/skparagraph/src/FontIterator.h
@@ -4,11 +4,11 @@
#include <unicode/brkiter.h>
#include <unicode/ubidi.h>
-#include "modules/skparagraph/src/ParagraphImpl.h"
#include "include/core/SkBlurTypes.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkFontMgr.h"
#include "include/core/SkPictureRecorder.h"
+#include "modules/skparagraph/src/ParagraphImpl.h"
#include "src/core/SkSpan.h"
#include "src/utils/SkUTF.h"
diff --git a/modules/skparagraph/src/ParagraphBuilderImpl.cpp b/modules/skparagraph/src/ParagraphBuilderImpl.cpp
index 0a97527..9ef730d 100644
--- a/modules/skparagraph/src/ParagraphBuilderImpl.cpp
+++ b/modules/skparagraph/src/ParagraphBuilderImpl.cpp
@@ -1,7 +1,7 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "include/core/SkPaint.h"
#include "modules/skparagraph/include/ParagraphStyle.h"
+#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkSpan.h"
diff --git a/modules/skparagraph/src/ParagraphImpl.h b/modules/skparagraph/src/ParagraphImpl.h
index fca49ee..ab960e0 100644
--- a/modules/skparagraph/src/ParagraphImpl.h
+++ b/modules/skparagraph/src/ParagraphImpl.h
@@ -2,13 +2,13 @@
#ifndef ParagraphImpl_DEFINED
#define ParagraphImpl_DEFINED
-#include "modules/skparagraph/src/TextLine.h"
-#include "modules/skparagraph/src/Run.h"
#include "include/core/SkPicture.h"
-#include "include/private//SkTHash.h"
+#include "include/private/SkTHash.h"
#include "modules/skparagraph/include/Paragraph.h"
#include "modules/skparagraph/include/ParagraphStyle.h"
#include "modules/skparagraph/include/TextStyle.h"
+#include "modules/skparagraph/src/Run.h"
+#include "modules/skparagraph/src/TextLine.h"
class SkCanvas;
diff --git a/modules/skparagraph/src/TextLine.h b/modules/skparagraph/src/TextLine.h
index de71e38..0082f45 100644
--- a/modules/skparagraph/src/TextLine.h
+++ b/modules/skparagraph/src/TextLine.h
@@ -2,12 +2,12 @@
#ifndef TextLine_DEFINED
#define TextLine_DEFINED
-#include "modules/skparagraph/src/Run.h"
#include "include/core/SkCanvas.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
#include "modules/skparagraph/include/DartTypes.h"
#include "modules/skparagraph/include/TextStyle.h"
+#include "modules/skparagraph/src/Run.h"
#include "src/core/SkSpan.h"
namespace skia {
diff --git a/modules/skparagraph/src/TextShadow.cpp b/modules/skparagraph/src/TextShadow.cpp
index 00ef8f2..6df35f4 100644
--- a/modules/skparagraph/src/TextShadow.cpp
+++ b/modules/skparagraph/src/TextShadow.cpp
@@ -1,6 +1,6 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/include/TextShadow.h"
#include "include/core/SkColor.h"
+#include "modules/skparagraph/include/TextShadow.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/src/TextStyle.cpp b/modules/skparagraph/src/TextStyle.cpp
index 8ba3d2d..85a387b 100644
--- a/modules/skparagraph/src/TextStyle.cpp
+++ b/modules/skparagraph/src/TextStyle.cpp
@@ -1,7 +1,7 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/include/TextStyle.h"
#include "include/core/SkColor.h"
#include "include/core/SkFontStyle.h"
+#include "modules/skparagraph/include/TextStyle.h"
namespace skia {
namespace textlayout {
diff --git a/modules/skparagraph/src/TextWrapper.cpp b/modules/skparagraph/src/TextWrapper.cpp
index f8adfd1..87a9835 100644
--- a/modules/skparagraph/src/TextWrapper.cpp
+++ b/modules/skparagraph/src/TextWrapper.cpp
@@ -1,6 +1,6 @@
// Copyright 2019 Google LLC.
-#include "modules/skparagraph/src/TextWrapper.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
+#include "modules/skparagraph/src/TextWrapper.h"
namespace skia {
namespace textlayout {
diff --git a/samplecode/SampleParagraph.cpp b/samplecode/SampleParagraph.cpp
index 8407c42..9da445e 100644
--- a/samplecode/SampleParagraph.cpp
+++ b/samplecode/SampleParagraph.cpp
@@ -1,5 +1,4 @@
// Copyright 2019 Google LLC.
-#include "Sample.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkColorFilter.h"
#include "include/core/SkColorPriv.h"
@@ -18,6 +17,7 @@
#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
#include "modules/skparagraph/src/TypefaceFontProvider.h"
+#include "samplecode/Sample.h"
#include "src/core/SkOSFile.h"
#include "src/shaders/SkColorShader.h"
#include "src/utils/SkUTF.h"
diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp
index 9ffe9fb..b3f203f 100644
--- a/src/c/sk_surface.cpp
+++ b/src/c/sk_surface.cpp
@@ -20,8 +20,8 @@
#include "include/c/sk_image.h"
#include "include/c/sk_paint.h"
#include "include/c/sk_path.h"
-#include "include/c/sk_surface.h"
#include "include/c/sk_picture.h"
+#include "include/c/sk_surface.h"
#include "src/c/sk_types_priv.h"
const struct {
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 8e89d7e..850d785 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -20,7 +20,6 @@
#if SK_SUPPORT_GPU
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrFragmentProcessor.h"
#include "src/gpu/GrRecordingContextPriv.h"
@@ -28,6 +27,7 @@
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/GrStyle.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h"
#include "src/gpu/effects/generated/GrRRectBlurEffect.h"
diff --git a/src/core/SkDeferredDisplayList.cpp b/src/core/SkDeferredDisplayList.cpp
index 639b1fa..9536210 100644
--- a/src/core/SkDeferredDisplayList.cpp
+++ b/src/core/SkDeferredDisplayList.cpp
@@ -12,7 +12,7 @@
class SkSurfaceCharacterization;
#if SK_SUPPORT_GPU
-#include "include/private/GrOpList.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/ccpr/GrCCPerOpListPaths.h"
#endif
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 6afce5a..5371f17 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -23,12 +23,12 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrContext.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#endif
#include <atomic>
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index dade54d..c51c1b0 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -59,7 +59,7 @@
}
#if SK_SUPPORT_GPU
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
sk_sp<GrTextureProxy> SkImageGenerator::generateTexture(GrRecordingContext* ctx,
const SkImageInfo& info,
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index 505019b..70d5600 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -20,8 +20,8 @@
#include "src/core/SkWriteBuffer.h"
#if SK_SUPPORT_GPU
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrFragmentProcessor.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrXfermodeFragmentProcessor.h"
#include "src/gpu/text/GrSDFMaskFilter.h"
#endif
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index 0104366..7a39314 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -18,11 +18,11 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrContext.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/image/SkImage_Gpu.h"
#endif
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index a66a09c..0c90091 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -17,12 +17,12 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrContext.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#endif
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 9ca4192..c5ff816 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -16,11 +16,11 @@
#include "src/core/SkWriteBuffer.h"
#if SK_SUPPORT_GPU
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrSkSLFP.h"
#include "src/gpu/effects/GrTextureDomain.h"
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 6148b2b..2170c0c 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -24,7 +24,7 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#endif
diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
index 7d969ee..c176f45 100644
--- a/src/effects/imagefilters/SkDisplacementMapEffect.cpp
+++ b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
@@ -17,13 +17,13 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrCoordTransform.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index e89542d..c1a8a7b 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -18,13 +18,13 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrFragmentProcessor.h"
#include "src/gpu/GrPaint.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrTextureDomain.h"
diff --git a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
index d4632a8..52db6c5 100644
--- a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
@@ -17,7 +17,7 @@
#if SK_SUPPORT_GPU
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrMatrixConvolutionEffect.h"
#endif
diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index ae3328c..86cd55e 100644
--- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -19,12 +19,12 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrCoordTransform.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index 53fbdcb..ff66985 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -16,12 +16,12 @@
#include "src/core/SkWriteBuffer.h"
#if SK_SUPPORT_GPU
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrColorSpaceXform.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrTextureDomain.h"
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index 8bb6be5..6bf0b2c 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -21,7 +21,6 @@
#include "include/gpu/GrTexture.h"
#include "include/gpu/gl/GrGLTypes.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkExchange.h"
#include "src/core/SkMessageBus.h"
#include "src/gpu/GrAHardwareBufferUtils.h"
@@ -31,6 +30,7 @@
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrResourceProviderPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/gl/GrGLDefines.h"
#include <EGL/egl.h>
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index 92b9066..609fe84 100644
--- a/src/gpu/GrAuditTrail.cpp
+++ b/src/gpu/GrAuditTrail.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/GrAuditTrail.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/ops/GrOp.h"
#include "src/utils/SkJSONWriter.h"
diff --git a/include/private/GrAuditTrail.h b/src/gpu/GrAuditTrail.h
similarity index 98%
rename from include/private/GrAuditTrail.h
rename to src/gpu/GrAuditTrail.h
index 4376106..74f47d3 100644
--- a/include/private/GrAuditTrail.h
+++ b/src/gpu/GrAuditTrail.h
@@ -12,9 +12,9 @@
#include "include/core/SkString.h"
#include "include/gpu/GrConfig.h"
#include "include/gpu/GrGpuResource.h"
-#include "include/private/GrRenderTargetProxy.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
+#include "src/gpu/GrRenderTargetProxy.h"
class GrOp;
class SkJSONWriter;
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index f35507b..577641a 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -8,7 +8,6 @@
#include "src/gpu/GrBlurUtils.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrProxyProvider.h"
@@ -17,6 +16,7 @@
#include "src/gpu/GrRenderTargetContextPriv.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
#include "src/gpu/GrStyle.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
#include "src/gpu/geometry/GrShape.h"
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 74e3b70..8932a48 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -8,9 +8,9 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrSurface.h"
-#include "include/private/GrSurfaceProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrWindowRectangles.h"
#include "src/utils/SkJSONWriter.h"
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 43342ed..48d4cb4 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTo.h"
#include "src/core/SkClipOpPriv.h"
#include "src/core/SkMakeUnique.h"
@@ -24,6 +23,7 @@
#include "src/gpu/GrSWMaskHelper.h"
#include "src/gpu/GrStencilAttachment.h"
#include "src/gpu/GrStyle.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrConvexPolyEffect.h"
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
diff --git a/include/private/GrColor.h b/src/gpu/GrColor.h
similarity index 100%
rename from include/private/GrColor.h
rename to src/gpu/GrColor.h
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index f5cbb53..2226247 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -8,7 +8,6 @@
#include "include/core/SkTraceMemoryDump.h"
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrRenderTargetProxy.h"
#include "include/private/SkDeferredDisplayList.h"
#include "include/private/SkImageInfoPriv.h"
#include "src/core/SkMakeUnique.h"
@@ -18,6 +17,7 @@
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrPathRendererChain.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSemaphore.h"
@@ -318,7 +318,7 @@
//////////////////////////////////////////////////////////////////////////////
GrBackendTexture GrContext::createBackendTexture(int width, int height,
- GrBackendFormat backendFormat,
+ const GrBackendFormat& backendFormat,
GrMipMapped mipMapped,
GrRenderable renderable) {
if (!this->asDirectContext()) {
@@ -359,7 +359,7 @@
}
GrBackendTexture GrContext::createBackendTexture(int width, int height,
- GrBackendFormat backendFormat,
+ const GrBackendFormat& backendFormat,
const SkColor4f& color,
GrMipMapped mipMapped,
GrRenderable renderable) {
diff --git a/src/gpu/GrContextPriv.cpp b/src/gpu/GrContextPriv.cpp
index 174de02..562ba85 100644
--- a/src/gpu/GrContextPriv.cpp
+++ b/src/gpu/GrContextPriv.cpp
@@ -9,12 +9,13 @@
#include "include/gpu/GrContextThreadSafeProxy.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrContextThreadSafeProxyPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/GrSurfacePriv.h"
#include "src/gpu/GrTextureContext.h"
diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index 77fb801..428fcde 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -10,9 +10,9 @@
#include "include/core/SkSurfaceCharacterization.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrBaseContextPriv.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
#include "src/image/SkSurface_Gpu.h"
GrContextThreadSafeProxy::GrContextThreadSafeProxy(GrBackendApi backend,
diff --git a/src/gpu/GrContext_Base.cpp b/src/gpu/GrContext_Base.cpp
index d462c9c..31e7ff1 100644
--- a/src/gpu/GrContext_Base.cpp
+++ b/src/gpu/GrContext_Base.cpp
@@ -7,9 +7,9 @@
#include "include/private/GrContext_Base.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrBaseContextPriv.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
static int32_t next_id() {
static std::atomic<int32_t> nextID{1};
diff --git a/src/gpu/GrCoordTransform.h b/src/gpu/GrCoordTransform.h
index ff6ed92..fac7844 100644
--- a/src/gpu/GrCoordTransform.h
+++ b/src/gpu/GrCoordTransform.h
@@ -9,8 +9,8 @@
#define GrCoordTransform_DEFINED
#include "include/core/SkMatrix.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
class GrTexture;
diff --git a/src/gpu/GrDDLContext.cpp b/src/gpu/GrDDLContext.cpp
index 1939348..27a8667 100644
--- a/src/gpu/GrDDLContext.cpp
+++ b/src/gpu/GrDDLContext.cpp
@@ -6,10 +6,10 @@
*/
#include "include/gpu/GrContext.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrContextThreadSafeProxyPriv.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
/**
* The DDL Context is the one in effect during DDL Recording. It isn't backed by a GrGPU and
diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/GrDataUtils.cpp
index 965251e..9537e73 100644
--- a/src/gpu/GrDataUtils.cpp
+++ b/src/gpu/GrDataUtils.cpp
@@ -7,8 +7,8 @@
#include "src/gpu/GrDataUtils.h"
-#include "include/private/GrColor.h"
#include "src/core/SkUtils.h"
+#include "src/gpu/GrColor.h"
struct ETC1Block {
uint32_t fHigh;
diff --git a/src/gpu/GrDeinstantiateProxyTracker.cpp b/src/gpu/GrDeinstantiateProxyTracker.cpp
index 0aa4b75..25c1d15 100644
--- a/src/gpu/GrDeinstantiateProxyTracker.cpp
+++ b/src/gpu/GrDeinstantiateProxyTracker.cpp
@@ -7,7 +7,7 @@
#include "src/gpu/GrDeinstantiateProxyTracker.h"
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
void GrDeinstantiateProxyTracker::addProxy(GrSurfaceProxy* proxy) {
diff --git a/src/gpu/GrDeinstantiateProxyTracker.h b/src/gpu/GrDeinstantiateProxyTracker.h
index 32a8771..06f0b1d 100644
--- a/src/gpu/GrDeinstantiateProxyTracker.h
+++ b/src/gpu/GrDeinstantiateProxyTracker.h
@@ -8,8 +8,8 @@
#ifndef GrDeinstantiateProxyTracker_DEFINED
#define GrDeinstantiateProxyTracker_DEFINED
-#include "include/private/GrSurfaceProxy.h"
#include "include/private/SkTArray.h"
+#include "src/gpu/GrSurfaceProxy.h"
class GrResourceCache;
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 217d56e..5cedb39 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -9,18 +9,18 @@
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrOpList.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkDeferredDisplayList.h"
#include "src/core/SkTTopoSort.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceAllocator.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
@@ -28,6 +28,7 @@
#include "src/gpu/GrTextureContext.h"
#include "src/gpu/GrTextureOpList.h"
#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrTextureProxyPriv.h"
#include "src/gpu/GrTracing.h"
#include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
diff --git a/src/gpu/GrFragmentProcessor.h b/src/gpu/GrFragmentProcessor.h
index 46333d4..92ab9c0 100644
--- a/src/gpu/GrFragmentProcessor.h
+++ b/src/gpu/GrFragmentProcessor.h
@@ -8,8 +8,8 @@
#ifndef GrFragmentProcessor_DEFINED
#define GrFragmentProcessor_DEFINED
-#include "include/private/GrProxyRef.h"
#include "src/gpu/GrProcessor.h"
+#include "src/gpu/GrProxyRef.h"
#include "src/gpu/ops/GrOp.h"
class GrCoordTransform;
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index caa17d3..1b737d4 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -12,6 +12,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
#include "src/core/SkMathPriv.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpuResourcePriv.h"
diff --git a/src/gpu/GrImageContext.cpp b/src/gpu/GrImageContext.cpp
index 8a66eab..db4c9cb 100644
--- a/src/gpu/GrImageContext.cpp
+++ b/src/gpu/GrImageContext.cpp
@@ -7,10 +7,10 @@
#include "include/private/GrImageContext.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrImageContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
#define ASSERT_SINGLE_OWNER \
SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(this->singleOwner());)
diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/GrOnFlushResourceProvider.cpp
index f84f2fe..0b607aa 100644
--- a/src/gpu/GrOnFlushResourceProvider.cpp
+++ b/src/gpu/GrOnFlushResourceProvider.cpp
@@ -8,12 +8,12 @@
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
sk_sp<GrRenderTargetContext> GrOnFlushResourceProvider::makeRenderTargetContext(
sk_sp<GrSurfaceProxy> proxy,
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index ad0260f..3eeb5fc 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -9,13 +9,13 @@
#define GrOpFlushState_DEFINED
#include <utility>
-#include "include/private/GrRenderTargetProxy.h"
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkArenaAllocList.h"
#include "src/gpu/GrAppliedClip.h"
#include "src/gpu/GrBufferAllocPool.h"
#include "src/gpu/GrDeferredUpload.h"
#include "src/gpu/GrDeinstantiateProxyTracker.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
class GrGpu;
diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp
index 6704a43..9d85aa8 100644
--- a/src/gpu/GrOpList.cpp
+++ b/src/gpu/GrOpList.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "include/private/GrOpList.h"
+#include "src/gpu/GrOpList.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrDeferredProxyUploader.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrTextureProxyPriv.h"
#include <atomic>
diff --git a/include/private/GrOpList.h b/src/gpu/GrOpList.h
similarity index 98%
rename from include/private/GrOpList.h
rename to src/gpu/GrOpList.h
index bfed37f..066582b 100644
--- a/include/private/GrOpList.h
+++ b/src/gpu/GrOpList.h
@@ -9,10 +9,10 @@
#define GrOpList_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrProxyRef.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkColorData.h"
#include "include/private/SkTDArray.h"
+#include "src/gpu/GrProxyRef.h"
+#include "src/gpu/GrTextureProxy.h"
class GrAuditTrail;
class GrCaps;
diff --git a/src/gpu/GrPaint.h b/src/gpu/GrPaint.h
index 9f92dac..7aafcb6 100644
--- a/src/gpu/GrPaint.h
+++ b/src/gpu/GrPaint.h
@@ -13,8 +13,8 @@
#include "include/core/SkBlendMode.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkRegion.h"
-#include "include/private/GrColor.h"
#include "src/core/SkTLazy.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrFragmentProcessor.h"
class GrTextureProxy;
diff --git a/src/gpu/GrPendingIOResource.h b/src/gpu/GrPendingIOResource.h
index 229277b..09340fe 100644
--- a/src/gpu/GrPendingIOResource.h
+++ b/src/gpu/GrPendingIOResource.h
@@ -10,8 +10,8 @@
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrGpuResource.h"
-#include "include/private/GrSurfaceProxy.h"
#include "include/private/SkNoncopyable.h"
+#include "src/gpu/GrSurfaceProxy.h"
class GrProxyPendingIO : SkNoncopyable {
public:
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 819ef9b..a582e3b 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -10,7 +10,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkRefCnt.h"
-#include "include/private/GrColor.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrFragmentProcessor.h"
#include "src/gpu/GrNonAtomicRef.h"
#include "src/gpu/GrPendingIOResource.h"
diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h
index a5fc8be..e47f60a 100644
--- a/src/gpu/GrPrimitiveProcessor.h
+++ b/src/gpu/GrPrimitiveProcessor.h
@@ -8,10 +8,10 @@
#ifndef GrPrimitiveProcessor_DEFINED
#define GrPrimitiveProcessor_DEFINED
-#include "include/private/GrColor.h"
-#include "include/private/GrProxyRef.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrNonAtomicRef.h"
#include "src/gpu/GrProcessor.h"
+#include "src/gpu/GrProxyRef.h"
#include "src/gpu/GrShaderVar.h"
class GrCoordTransform;
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 2a58b54..e545933 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -7,12 +7,12 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkSpinlock.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGeometryProcessor.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrProcessor.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrXferProcessor.h"
#if GR_TEST_UTILS
diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h
index 656f418..b6c88ef 100644
--- a/src/gpu/GrProcessor.h
+++ b/src/gpu/GrProcessor.h
@@ -11,12 +11,12 @@
#include "include/core/SkMath.h"
#include "include/core/SkString.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrColor.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrGpuBuffer.h"
#include "src/gpu/GrProcessorUnitTest.h"
#include "src/gpu/GrShaderVar.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
class GrContext;
class GrResourceProvider;
diff --git a/src/gpu/GrProcessorUnitTest.h b/src/gpu/GrProcessorUnitTest.h
index 8ed5297..0e9392a 100644
--- a/src/gpu/GrProcessorUnitTest.h
+++ b/src/gpu/GrProcessorUnitTest.h
@@ -12,9 +12,9 @@
#if GR_TEST_UTILS
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTArray.h"
#include "src/gpu/GrTestUtils.h"
+#include "src/gpu/GrTextureProxy.h"
class SkMatrix;
class GrCaps;
diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h
index b320ebb..ed919ac 100644
--- a/src/gpu/GrProgramDesc.h
+++ b/src/gpu/GrProgramDesc.h
@@ -8,11 +8,11 @@
#ifndef GrProgramDesc_DEFINED
#define GrProgramDesc_DEFINED
-#include "include/private/GrColor.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTo.h"
#include "src/core/SkOpts.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
class GrShaderCaps;
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index bb9ca00..1331fe4 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -15,7 +15,6 @@
#include "include/private/GrImageContext.h"
#include "include/private/GrResourceKey.h"
#include "include/private/GrSingleOwner.h"
-#include "include/private/GrSurfaceProxy.h"
#include "include/private/SkImageInfoPriv.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkImagePriv.h"
@@ -25,6 +24,7 @@
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrImageContextPriv.h"
#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
#include "src/gpu/GrTextureProxyCacheAccess.h"
#include "src/gpu/GrTextureRenderTargetProxy.h"
diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/GrProxyProvider.h
index cc42269..bfa2243 100644
--- a/src/gpu/GrProxyProvider.h
+++ b/src/gpu/GrProxyProvider.h
@@ -10,8 +10,8 @@
#include "include/gpu/GrTypes.h"
#include "include/private/GrResourceKey.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkTDynamicHash.h"
+#include "src/gpu/GrTextureProxy.h"
class GrImageContext;
class GrBackendRenderTarget;
diff --git a/include/private/GrProxyRef.h b/src/gpu/GrProxyRef.h
similarity index 93%
rename from include/private/GrProxyRef.h
rename to src/gpu/GrProxyRef.h
index ddf286e..5ea5c33 100644
--- a/include/private/GrProxyRef.h
+++ b/src/gpu/GrProxyRef.h
@@ -8,9 +8,9 @@
#ifndef GrProxyRef_DEFINED
#define GrProxyRef_DEFINED
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
/**
* Helper for owning a ref on a GrSurfaceProxy.
diff --git a/src/gpu/GrRecordingContext.cpp b/src/gpu/GrRecordingContext.cpp
index 1117ff1..bdf5edf 100644
--- a/src/gpu/GrRecordingContext.cpp
+++ b/src/gpu/GrRecordingContext.cpp
@@ -8,13 +8,14 @@
#include "include/private/GrRecordingContext.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrTextureContext.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/text/GrTextBlobCache.h"
@@ -25,7 +26,8 @@
GrRecordingContext::GrRecordingContext(GrBackendApi backend,
const GrContextOptions& options,
uint32_t contextID)
- : INHERITED(backend, options, contextID) {
+ : INHERITED(backend, options, contextID)
+ , fAuditTrail(new GrAuditTrail()) {
}
GrRecordingContext::~GrRecordingContext() { }
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 08a11b9..c22eeaa 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "include/private/GrColor.h"
#include "src/core/SkClipOpPriv.h"
#include "src/gpu/GrAppliedClip.h"
#include "src/gpu/GrClip.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrPathRenderer.h"
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 597631c..f10bda9 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -8,9 +8,6 @@
#include "include/core/SkDrawable.h"
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/GrRenderTarget.h"
-#include "include/private/GrAuditTrail.h"
-#include "include/private/GrColor.h"
-#include "include/private/GrOpList.h"
#include "include/private/GrRecordingContext.h"
#include "include/private/SkShadowFlags.h"
#include "include/utils/SkShadowUtils.h"
@@ -23,13 +20,16 @@
#include "src/core/SkRRectPriv.h"
#include "src/core/SkSurfacePriv.h"
#include "src/gpu/GrAppliedClip.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrBlurUtils.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrGpuResourcePriv.h"
#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index 63fc044..fd72e52 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -13,9 +13,9 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSurface.h"
#include "include/core/SkSurfaceProps.h"
-#include "include/private/GrRenderTargetProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/gpu/GrPaint.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrSurfaceContext.h"
#include "src/gpu/GrXferProcessor.h"
#include "src/gpu/text/GrTextTarget.h"
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index adc98d2..3fd6d85 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "include/private/GrAuditTrail.h"
#include "include/private/GrRecordingContext.h"
#include "src/core/SkExchange.h"
#include "src/core/SkRectPriv.h"
#include "src/core/SkTraceEvent.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrGpuCommandBuffer.h"
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index 8d266b3..3269113 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -11,13 +11,13 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkStrokeRec.h"
#include "include/core/SkTypes.h"
-#include "include/private/GrOpList.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"
#include "src/gpu/GrAppliedClip.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrPathRendering.h"
#include "src/gpu/GrPrimitiveProcessor.h"
#include "src/gpu/ops/GrDrawOp.h"
diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp
index bd453c8..6dad311 100644
--- a/src/gpu/GrRenderTargetProxy.cpp
+++ b/src/gpu/GrRenderTargetProxy.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/core/SkMathPriv.h"
#include "src/gpu/GrCaps.h"
diff --git a/include/private/GrRenderTargetProxy.h b/src/gpu/GrRenderTargetProxy.h
similarity index 98%
rename from include/private/GrRenderTargetProxy.h
rename to src/gpu/GrRenderTargetProxy.h
index 040acea..1a2b2fc 100644
--- a/include/private/GrRenderTargetProxy.h
+++ b/src/gpu/GrRenderTargetProxy.h
@@ -8,8 +8,8 @@
#ifndef GrRenderTargetProxy_DEFINED
#define GrRenderTargetProxy_DEFINED
-#include "include/private/GrSurfaceProxy.h"
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
class GrResourceProvider;
class GrRenderTargetProxyPriv;
diff --git a/src/gpu/GrRenderTargetProxyPriv.h b/src/gpu/GrRenderTargetProxyPriv.h
index 9bbef3d..bf2e770 100644
--- a/src/gpu/GrRenderTargetProxyPriv.h
+++ b/src/gpu/GrRenderTargetProxyPriv.h
@@ -8,7 +8,7 @@
#ifndef GrRenderTargetProxyPriv_DEFINED
#define GrRenderTargetProxyPriv_DEFINED
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
/**
* This class hides the more specialized capabilities of GrRenderTargetProxy.
diff --git a/src/gpu/GrResourceAllocator.cpp b/src/gpu/GrResourceAllocator.cpp
index bffbc54..d37d81c 100644
--- a/src/gpu/GrResourceAllocator.cpp
+++ b/src/gpu/GrResourceAllocator.cpp
@@ -7,16 +7,16 @@
#include "src/gpu/GrResourceAllocator.h"
-#include "include/private/GrOpList.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrDeinstantiateProxyTracker.h"
#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrOpList.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#if GR_TRACK_INTERVAL_CREATION
#include <atomic>
diff --git a/src/gpu/GrResourceAllocator.h b/src/gpu/GrResourceAllocator.h
index 668c996..a8c4f58 100644
--- a/src/gpu/GrResourceAllocator.h
+++ b/src/gpu/GrResourceAllocator.h
@@ -9,8 +9,8 @@
#define GrResourceAllocator_DEFINED
#include "include/gpu/GrSurface.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkTDynamicHash.h"
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 1051047..8f3b39e 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -8,11 +8,11 @@
#include "src/gpu/GrSWMaskHelper.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/geometry/GrShape.h"
/*
diff --git a/include/private/GrSkSLFPFactoryCache.h b/src/gpu/GrSkSLFPFactoryCache.h
similarity index 100%
rename from include/private/GrSkSLFPFactoryCache.h
rename to src/gpu/GrSkSLFPFactoryCache.h
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 4a6680b..6ab0dbe 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "include/private/GrAuditTrail.h"
-#include "include/private/GrOpList.h"
#include "include/private/SkSemaphore.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkTaskGroup.h"
#include "src/core/SkTraceEvent.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDeferredProxyUploader.h"
#include "src/gpu/GrGpuResourcePriv.h"
#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 2a20456..52ba3eb 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -9,7 +9,7 @@
#include "include/gpu/GrRenderTarget.h"
#include "include/gpu/GrSurface.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrOpList.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfacePriv.h"
diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index 71113b4..b1f8903 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -7,14 +7,14 @@
#include "src/gpu/GrSurfaceContext.h"
-#include "include/private/GrAuditTrail.h"
-#include "include/private/GrOpList.h"
#include "include/private/GrRecordingContext.h"
#include "src/core/SkAutoPixmapStorage.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrSurfaceContextPriv.h"
diff --git a/src/gpu/GrSurfaceContext.h b/src/gpu/GrSurfaceContext.h
index e72364c..319caec 100644
--- a/src/gpu/GrSurfaceContext.h
+++ b/src/gpu/GrSurfaceContext.h
@@ -9,8 +9,8 @@
#define GrSurfaceContext_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrColorSpaceInfo.h"
+#include "src/gpu/GrSurfaceProxy.h"
class GrAuditTrail;
class GrDrawingManager;
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index ccf2e55..d3cf8ff 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrOpList.h"
#include "include/private/GrRecordingContext.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrOpList.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
diff --git a/include/private/GrSurfaceProxy.h b/src/gpu/GrSurfaceProxy.h
similarity index 100%
rename from include/private/GrSurfaceProxy.h
rename to src/gpu/GrSurfaceProxy.h
diff --git a/src/gpu/GrSurfaceProxyPriv.h b/src/gpu/GrSurfaceProxyPriv.h
index 2b89376..b585dae 100644
--- a/src/gpu/GrSurfaceProxyPriv.h
+++ b/src/gpu/GrSurfaceProxyPriv.h
@@ -8,7 +8,7 @@
#ifndef GrSurfaceProxyPriv_DEFINED
#define GrSurfaceProxyPriv_DEFINED
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrResourceProvider.h"
diff --git a/src/gpu/GrSwizzle.cpp b/src/gpu/GrSwizzle.cpp
index 21fe834..ae07d3d 100644
--- a/src/gpu/GrSwizzle.cpp
+++ b/src/gpu/GrSwizzle.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "src/gpu/GrSwizzle.h"
#include "src/core/SkRasterPipeline.h"
+#include "src/gpu/GrSwizzle.h"
void GrSwizzle::apply(SkRasterPipeline* pipeline) const {
SkASSERT(pipeline);
diff --git a/src/gpu/GrSwizzle.h b/src/gpu/GrSwizzle.h
index cbee3eb..16e473c 100644
--- a/src/gpu/GrSwizzle.h
+++ b/src/gpu/GrSwizzle.h
@@ -8,8 +8,8 @@
#ifndef GrSwizzle_DEFINED
#define GrSwizzle_DEFINED
-#include "include/private/GrColor.h"
#include "include/private/SkColorData.h"
+#include "src/gpu/GrColor.h"
class SkRasterPipeline;
diff --git a/src/gpu/GrTessellator.h b/src/gpu/GrTessellator.h
index 1793e12..e892a19 100644
--- a/src/gpu/GrTessellator.h
+++ b/src/gpu/GrTessellator.h
@@ -9,8 +9,8 @@
#define GrTessellator_DEFINED
#include "include/core/SkPoint.h"
-#include "include/private/GrColor.h"
#include "include/private/SkColorData.h"
+#include "src/gpu/GrColor.h"
class SkPath;
struct SkRect;
diff --git a/src/gpu/GrTestUtils.h b/src/gpu/GrTestUtils.h
index daf6ebe..b4da37b 100644
--- a/src/gpu/GrTestUtils.h
+++ b/src/gpu/GrTestUtils.h
@@ -15,10 +15,10 @@
#include "include/core/SkPathEffect.h"
#include "include/core/SkStrokeRec.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrColor.h"
#include "include/private/SkMacros.h"
#include "include/private/SkTemplates.h"
#include "include/utils/SkRandom.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrFPArgs.h"
#include "src/shaders/SkShaderBase.h"
diff --git a/src/gpu/GrTextureAdjuster.h b/src/gpu/GrTextureAdjuster.h
index 825e211..aa26f45 100644
--- a/src/gpu/GrTextureAdjuster.h
+++ b/src/gpu/GrTextureAdjuster.h
@@ -8,9 +8,9 @@
#ifndef GrTextureAdjuster_DEFINED
#define GrTextureAdjuster_DEFINED
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkTLazy.h"
#include "src/gpu/GrTextureProducer.h"
+#include "src/gpu/GrTextureProxy.h"
class GrRecordingContext;
diff --git a/src/gpu/GrTextureContext.cpp b/src/gpu/GrTextureContext.cpp
index d0bdaa1..f5c4a3b 100644
--- a/src/gpu/GrTextureContext.cpp
+++ b/src/gpu/GrTextureContext.cpp
@@ -7,12 +7,11 @@
#include "src/gpu/GrTextureContext.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrTextureOpList.h"
-#include "include/private/GrAuditTrail.h"
-
#define ASSERT_SINGLE_OWNER \
SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(this->singleOwner());)
#define RETURN_FALSE_IF_ABANDONED if (this->drawingManager()->wasAbandoned()) { return false; }
diff --git a/src/gpu/GrTextureContext.h b/src/gpu/GrTextureContext.h
index f4bac34..0282fc2 100644
--- a/src/gpu/GrTextureContext.h
+++ b/src/gpu/GrTextureContext.h
@@ -8,8 +8,8 @@
#ifndef GrTextureContext_DEFINED
#define GrTextureContext_DEFINED
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrTextureProxy.h"
class GrContext;
class GrDrawingManager;
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index 843537e..732e6cb 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -8,15 +8,15 @@
#include "src/gpu/GrTextureOpList.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrAuditTrail.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkStringUtils.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrResourceAllocator.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/ops/GrCopySurfaceOp.h"
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrTextureOpList.h b/src/gpu/GrTextureOpList.h
index 987dd2a..ebb4787 100644
--- a/src/gpu/GrTextureOpList.h
+++ b/src/gpu/GrTextureOpList.h
@@ -9,8 +9,8 @@
#define GrTexureOpList_DEFINED
#include "include/gpu/GrGpuResource.h"
-#include "include/private/GrOpList.h"
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrOpList.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "include/private/SkTArray.h"
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index f644e9e..0e09fc0 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -6,7 +6,6 @@
*/
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkMipMap.h"
#include "src/core/SkRectPriv.h"
#include "src/gpu/GrClip.h"
@@ -15,6 +14,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrTextureProducer.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrBicubicEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index e0c0b47..73578bf 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrTextureProxyPriv.h"
#include "include/gpu/GrContext.h"
diff --git a/include/private/GrTextureProxy.h b/src/gpu/GrTextureProxy.h
similarity index 98%
rename from include/private/GrTextureProxy.h
rename to src/gpu/GrTextureProxy.h
index 5d136e3..098168f 100644
--- a/include/private/GrTextureProxy.h
+++ b/src/gpu/GrTextureProxy.h
@@ -9,7 +9,7 @@
#define GrTextureProxy_DEFINED
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrSurfaceProxy.h"
class GrCaps;
class GrDeferredProxyUploader;
diff --git a/src/gpu/GrTextureProxyCacheAccess.h b/src/gpu/GrTextureProxyCacheAccess.h
index 0ea372d..26478c6 100644
--- a/src/gpu/GrTextureProxyCacheAccess.h
+++ b/src/gpu/GrTextureProxyCacheAccess.h
@@ -8,7 +8,7 @@
#ifndef GrTextureProxyCacheAccess_DEFINED
#define GrTextureProxyCacheAccess_DEFINED
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
/**
* This class allows GrResourceCache increased privileged access to GrTextureProxy objects.
diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h
index 4b8a880..1e64194 100644
--- a/src/gpu/GrTextureProxyPriv.h
+++ b/src/gpu/GrTextureProxyPriv.h
@@ -8,7 +8,7 @@
#ifndef GrTextureProxyPriv_DEFINED
#define GrTextureProxyPriv_DEFINED
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
class GrDeferredProxyUploader;
class GrOpFlushState;
diff --git a/src/gpu/GrTextureRenderTargetProxy.h b/src/gpu/GrTextureRenderTargetProxy.h
index 852309b..57b4150 100644
--- a/src/gpu/GrTextureRenderTargetProxy.h
+++ b/src/gpu/GrTextureRenderTargetProxy.h
@@ -8,8 +8,8 @@
#ifndef GrTextureRenderTargetProxy_DEFINED
#define GrTextureRenderTargetProxy_DEFINED
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#ifdef SK_BUILD_FOR_WIN
// Windows gives warnings about inheriting asTextureProxy/asRenderTargetProxy via dominance.
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index 3ed59ae..df66eb8 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -10,6 +10,8 @@
#include "src/core/SkTraceEvent.h"
+#include "src/gpu/GrAuditTrail.h"
+
class GrContext;
/**
@@ -18,5 +20,4 @@
#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context) \
GR_AUDIT_TRAIL_AUTO_FRAME(context->priv().auditTrail(), classname "::" op); \
TRACE_EVENT0("skia.gpu", classname "::" op)
-
#endif
diff --git a/src/gpu/GrVertexWriter.h b/src/gpu/GrVertexWriter.h
index 6365446..7b1ddc1 100644
--- a/src/gpu/GrVertexWriter.h
+++ b/src/gpu/GrVertexWriter.h
@@ -8,8 +8,8 @@
#ifndef GrVertexWriter_DEFINED
#define GrVertexWriter_DEFINED
-#include "include/private/GrColor.h"
#include "include/private/SkTemplates.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/geometry/GrQuad.h"
#include <type_traits>
diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp
index 22cd6fb..2e5e29f 100644
--- a/src/gpu/GrYUVProvider.cpp
+++ b/src/gpu/GrYUVProvider.cpp
@@ -10,7 +10,6 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkYUVAIndex.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkAutoMalloc.h"
#include "src/core/SkCachedData.h"
#include "src/core/SkResourceCache.h"
@@ -21,6 +20,7 @@
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrYUVtoRGBEffect.h"
sk_sp<SkCachedData> GrYUVProvider::getPlanes(SkYUVASizeInfo* size,
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 911262b..27a12a7 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -12,7 +12,6 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkImageInfoPriv.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkAutoMalloc.h"
@@ -32,6 +31,7 @@
#include "src/gpu/GrPaint.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrXferProcessor.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrBicubicEffect.h"
diff --git a/src/gpu/SkGr.h b/src/gpu/SkGr.h
index f9e32c6..fa39ff8 100644
--- a/src/gpu/SkGr.h
+++ b/src/gpu/SkGr.h
@@ -17,10 +17,10 @@
#include "include/gpu/GrBlend.h"
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/GrColor.h"
#include "include/private/SkColorData.h"
#include "src/core/SkBlendModePriv.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
class GrCaps;
class GrColorSpaceInfo;
diff --git a/src/gpu/ccpr/GrCCAtlas.cpp b/src/gpu/ccpr/GrCCAtlas.cpp
index 3cfb5d0..d42f4ea 100644
--- a/src/gpu/ccpr/GrCCAtlas.cpp
+++ b/src/gpu/ccpr/GrCCAtlas.cpp
@@ -8,7 +8,6 @@
#include "src/gpu/ccpr/GrCCAtlas.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkIPoint16.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkMathPriv.h"
@@ -17,6 +16,7 @@
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRectanizer_skyline.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include <atomic>
diff --git a/src/gpu/ccpr/GrCCClipPath.h b/src/gpu/ccpr/GrCCClipPath.h
index 754c011..17e628c 100644
--- a/src/gpu/ccpr/GrCCClipPath.h
+++ b/src/gpu/ccpr/GrCCClipPath.h
@@ -9,7 +9,7 @@
#define GrCCClipPath_DEFINED
#include "include/core/SkPath.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
struct GrCCPerFlushResourceSpecs;
class GrCCAtlas;
diff --git a/src/gpu/ccpr/GrCCClipProcessor.cpp b/src/gpu/ccpr/GrCCClipProcessor.cpp
index ec3d43f..eebfd47 100644
--- a/src/gpu/ccpr/GrCCClipProcessor.cpp
+++ b/src/gpu/ccpr/GrCCClipProcessor.cpp
@@ -8,8 +8,8 @@
#include "src/gpu/ccpr/GrCCClipProcessor.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkMakeUnique.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/ccpr/GrCCClipPath.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp
index c121201..13e1c8f 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/GrColor.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrPipeline.h"
#include "src/gpu/GrProcessor.h"
#include "src/gpu/GrRenderTargetContext.h"
diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index 471c122..d79444d 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -8,7 +8,7 @@
#include "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 57e4a8c..f4ec11d 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -7,7 +7,7 @@
#include "src/gpu/effects/GrMatrixConvolutionEffect.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/effects/GrSkSLFP.h
index 5e0bd84..1764e9d 100644
--- a/src/gpu/effects/GrSkSLFP.h
+++ b/src/gpu/effects/GrSkSLFP.h
@@ -9,11 +9,11 @@
#define GrSkSLFP_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrSkSLFPFactoryCache.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrCoordTransform.h"
#include "src/gpu/GrFragmentProcessor.h"
#include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrSkSLFPFactoryCache.h"
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLPipelineStageCodeGenerator.h"
#include <atomic>
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp
index f6aa176..58783ce 100644
--- a/src/gpu/gl/GrGLPathRendering.cpp
+++ b/src/gpu/gl/GrGLPathRendering.cpp
@@ -9,7 +9,7 @@
#include "src/gpu/gl/GrGLPathRendering.h"
#include "src/gpu/gl/GrGLUtil.h"
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/gl/GrGLPath.h"
#include "src/gpu/gl/GrGLPathRendering.h"
diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/gradients/GrGradientShader.cpp
index 871c18a..9571a8f 100644
--- a/src/gpu/gradients/GrGradientShader.cpp
+++ b/src/gpu/gradients/GrGradientShader.cpp
@@ -21,9 +21,9 @@
#include "src/gpu/gradients/generated/GrTextureGradientColorizer.h"
#include "src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h"
-#include "include/private/GrColor.h"
#include "include/private/GrRecordingContext.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrColorSpaceInfo.h"
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/SkGr.h"
diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/mtl/GrMtlCaps.mm
index da2e374..52c9494 100644
--- a/src/gpu/mtl/GrMtlCaps.mm
+++ b/src/gpu/mtl/GrMtlCaps.mm
@@ -10,9 +10,9 @@
#include "include/core/SkRect.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrRenderTarget.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/mtl/GrMtlUtil.h"
#if !__has_feature(objc_arc)
diff --git a/src/gpu/mtl/GrMtlGpuCommandBuffer.mm b/src/gpu/mtl/GrMtlGpuCommandBuffer.mm
index fe6c576..c6d32da 100644
--- a/src/gpu/mtl/GrMtlGpuCommandBuffer.mm
+++ b/src/gpu/mtl/GrMtlGpuCommandBuffer.mm
@@ -7,7 +7,7 @@
#include "src/gpu/mtl/GrMtlGpuCommandBuffer.h"
-#include "include/private/GrColor.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrFixedClip.h"
#include "src/gpu/GrRenderTargetPriv.h"
#include "src/gpu/GrTexturePriv.h"
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index edb81a0..85ea734 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -10,6 +10,7 @@
#include "src/core/SkGeometry.h"
#include "src/core/SkPathPriv.h"
#include "src/core/SkPointPriv.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrGeometryProcessor.h"
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 42906a4..1aa1638 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -12,6 +12,7 @@
#include "src/core/SkPointPriv.h"
#include "src/core/SkRectPriv.h"
#include "src/core/SkStroke.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrBuffer.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index bac3f5f..5cbb89a 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -9,6 +9,7 @@
#include "src/core/SkGeometry.h"
#include "src/core/SkPathPriv.h"
#include "src/core/SkTraceEvent.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDefaultGeoProcFactory.h"
#include "src/gpu/GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index b43762b..4049936 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -8,8 +8,8 @@
#ifndef GrClearStencilClipOp_DEFINED
#define GrClearStencilClipOp_DEFINED
-#include "include/private/GrRenderTargetProxy.h"
#include "src/gpu/GrFixedClip.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/ops/GrOp.h"
class GrOpFlushState;
diff --git a/src/gpu/ops/GrDashLinePathRenderer.cpp b/src/gpu/ops/GrDashLinePathRenderer.cpp
index 8399d3b..5c06cfd 100644
--- a/src/gpu/ops/GrDashLinePathRenderer.cpp
+++ b/src/gpu/ops/GrDashLinePathRenderer.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/GrAuditTrail.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/geometry/GrShape.h"
diff --git a/src/gpu/ops/GrDebugMarkerOp.h b/src/gpu/ops/GrDebugMarkerOp.h
index bf7b9eb..fd7eb0c 100644
--- a/src/gpu/ops/GrDebugMarkerOp.h
+++ b/src/gpu/ops/GrDebugMarkerOp.h
@@ -8,7 +8,7 @@
#ifndef GrDebugMarkerOp_DEFINED
#define GrDebugMarkerOp_DEFINED
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/ops/GrOp.h"
class GrOpFlushState;
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 0ee7cb5..2e3af82 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -12,6 +12,7 @@
#include "src/core/SkGeometry.h"
#include "src/core/SkTLazy.h"
#include "src/core/SkTraceEvent.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDefaultGeoProcFactory.h"
#include "src/gpu/GrDrawOpTest.h"
diff --git a/src/gpu/ops/GrOvalOpFactory.h b/src/gpu/ops/GrOvalOpFactory.h
index a684641..de25fa1 100644
--- a/src/gpu/ops/GrOvalOpFactory.h
+++ b/src/gpu/ops/GrOvalOpFactory.h
@@ -9,7 +9,7 @@
#define GrOvalOpFactory_DEFINED
#include "include/core/SkRefCnt.h"
-#include "include/private/GrColor.h"
+#include "src/gpu/GrColor.h"
class GrDrawOp;
class GrPaint;
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.h b/src/gpu/ops/GrQuadPerEdgeAA.h
index 7133a1b..d643c2f 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.h
+++ b/src/gpu/ops/GrQuadPerEdgeAA.h
@@ -11,8 +11,8 @@
#include "include/core/SkPoint.h"
#include "include/core/SkPoint3.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrColor.h"
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrGeometryProcessor.h"
#include "src/gpu/geometry/GrQuad.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
diff --git a/src/gpu/ops/GrSemaphoreOp.h b/src/gpu/ops/GrSemaphoreOp.h
index 4307da4..215fb22 100644
--- a/src/gpu/ops/GrSemaphoreOp.h
+++ b/src/gpu/ops/GrSemaphoreOp.h
@@ -11,7 +11,7 @@
#include "src/gpu/ops/GrOp.h"
#include "include/core/SkRefCnt.h"
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrSemaphore.h"
class GrRecordingContext;
diff --git a/src/gpu/ops/GrShadowRRectOp.h b/src/gpu/ops/GrShadowRRectOp.h
index 45fbc6c..c4d313d 100644
--- a/src/gpu/ops/GrShadowRRectOp.h
+++ b/src/gpu/ops/GrShadowRRectOp.h
@@ -9,7 +9,7 @@
#define GrShadowRRectOp_DEFINED
#include <memory>
-#include "include/private/GrColor.h"
+#include "src/gpu/GrColor.h"
class GrDrawOp;
class GrRecordingContext;
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index e05984b..95d6f7c 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -15,6 +15,7 @@
#include "src/core/SkDraw.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkRasterClip.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrBuffer.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDistanceFieldGenFromVector.h"
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 9c27e47..a016c77 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -8,10 +8,10 @@
#include "src/gpu/ops/GrStrokeRectOp.h"
#include "include/core/SkStrokeRec.h"
-#include "include/private/GrColor.h"
#include "include/private/GrResourceKey.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrDefaultGeoProcFactory.h"
#include "src/gpu/GrDrawOpTest.h"
#include "src/gpu/GrOpFlushState.h"
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index be15c5d..b8f4cfb 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -7,8 +7,8 @@
#include "src/gpu/ops/GrTessellatingPathRenderer.h"
#include <stdio.h>
-#include "include/private/GrAuditTrail.h"
#include "src/core/SkGeometry.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrDefaultGeoProcFactory.h"
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 790d7e9..692500f 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -11,7 +11,6 @@
#include "include/core/SkPoint3.h"
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTo.h"
#include "src/core/SkMathPriv.h"
#include "src/core/SkMatrixPriv.h"
@@ -28,6 +27,7 @@
#include "src/gpu/GrResourceProviderPriv.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/geometry/GrQuad.h"
#include "src/gpu/geometry/GrQuadList.h"
diff --git a/src/gpu/ops/GrTextureOp.h b/src/gpu/ops/GrTextureOp.h
index 5d07d34..8061a35 100644
--- a/src/gpu/ops/GrTextureOp.h
+++ b/src/gpu/ops/GrTextureOp.h
@@ -8,8 +8,8 @@
#include "include/core/SkCanvas.h"
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrSamplerState.h"
-#include "include/private/GrColor.h"
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrRenderTargetContext.h"
class GrColorSpaceXform;
diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index d736478..be5d05c 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -68,10 +68,10 @@
}
#ifdef SK_DEBUG
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkImageEncoder.h"
diff --git a/src/gpu/text/GrStrikeCache.cpp b/src/gpu/text/GrStrikeCache.cpp
index 1569146..211e73a 100644
--- a/src/gpu/text/GrStrikeCache.cpp
+++ b/src/gpu/text/GrStrikeCache.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/GrColor.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrDistanceFieldGenFromVector.h"
#include "src/gpu/text/GrAtlasManager.h"
#include "src/gpu/text/GrStrikeCache.h"
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 5bd633c..81d6d65 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -11,7 +11,6 @@
#include "include/core/SkPathEffect.h"
#include "include/core/SkPoint3.h"
#include "include/core/SkSurfaceProps.h"
-#include "include/private/GrColor.h"
#include "src/core/SkDescriptor.h"
#include "src/core/SkMaskFilterBase.h"
#include "src/core/SkOpts.h"
@@ -19,6 +18,7 @@
#include "src/core/SkStrikeCache.h"
#include "src/core/SkStrikeSpec.h"
#include "src/core/SkTInternalLList.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrDrawOpAtlas.h"
#include "src/gpu/text/GrStrikeCache.h"
#include "src/gpu/text/GrTextContext.h"
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 5db4d45..50f7d7c 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -9,7 +9,7 @@
#include "include/gpu/GrRenderTarget.h"
#include "include/gpu/vk/GrVkBackendContext.h"
#include "include/gpu/vk/GrVkExtensions.h"
-#include "include/private/GrRenderTargetProxy.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrShaderCaps.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/vk/GrVkCaps.h"
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.h b/src/gpu/vk/GrVkGpuCommandBuffer.h
index d3eb668..a821356 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.h
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.h
@@ -12,7 +12,7 @@
#include "include/gpu/GrTypes.h"
#include "include/gpu/vk/GrVkTypes.h"
-#include "include/private/GrColor.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrMesh.h"
#include "src/gpu/GrTRecorder.h"
#include "src/gpu/vk/GrVkPipelineState.h"
diff --git a/src/gpu/vk/GrVkUtil.h b/src/gpu/vk/GrVkUtil.h
index 06e052e..7d2b241 100644
--- a/src/gpu/vk/GrVkUtil.h
+++ b/src/gpu/vk/GrVkUtil.h
@@ -10,8 +10,8 @@
#include "include/gpu/GrTypes.h"
#include "include/gpu/vk/GrVkTypes.h"
-#include "include/private/GrColor.h"
#include "include/private/SkMacros.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrDataUtils.h"
#include "src/gpu/vk/GrVkInterface.h"
#include "src/sksl/ir/SkSLProgram.h"
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index a3b86c5..856c41e 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -13,8 +13,8 @@
#include <atomic>
#if SK_SUPPORT_GPU
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTDArray.h"
+#include "src/gpu/GrTextureProxy.h"
class GrRecordingContext;
class GrTexture;
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 7d3c772..443fd35 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -14,7 +14,6 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkImageInfoPriv.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkBitmapCache.h"
@@ -42,6 +41,7 @@
#include "src/gpu/GrTextureAdjuster.h"
#include "src/gpu/GrTextureContext.h"
#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrTextureProxyPriv.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/effects/GrYUVtoRGBEffect.h"
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index 100cd99..8f17716 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -18,10 +18,10 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
#include "include/gpu/GrContextOptions.h"
-#include "include/private/GrColor.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "tests/Test.h"
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index 3fbe40b..3ebd44d 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -24,7 +24,6 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTexture.h"
#include "include/private/GrResourceKey.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTemplates.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkClipOpPriv.h"
@@ -35,6 +34,7 @@
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrReducedClip.h"
#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrTextureProxy.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp
index 3c9e48c..1be4732 100644
--- a/tests/CopySurfaceTest.cpp
+++ b/tests/CopySurfaceTest.cpp
@@ -12,8 +12,6 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkUtils.h"
@@ -21,6 +19,8 @@
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index f128f6c..683e5c3 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -25,8 +25,6 @@
#include "include/gpu/GrContextThreadSafeProxy.h"
#include "include/gpu/GrTypes.h"
#include "include/gpu/gl/GrGLTypes.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkDeferredDisplayList.h"
#include "src/core/SkDeferredDisplayListPriv.h"
@@ -34,6 +32,8 @@
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGpuDevice.h"
#include "src/gpu/gl/GrGLDefines.h"
#include "src/image/SkImage_GpuBase.h"
diff --git a/tests/DetermineDomainModeTest.cpp b/tests/DetermineDomainModeTest.cpp
index c7d350e..53dd93e 100644
--- a/tests/DetermineDomainModeTest.cpp
+++ b/tests/DetermineDomainModeTest.cpp
@@ -13,12 +13,12 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrSamplerState.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrTextureProducer.h"
+#include "src/gpu/GrTextureProxy.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index e7e2e45..996ef0a 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -18,7 +18,6 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
#include "src/core/SkIPoint16.h"
#include "src/gpu/GrCaps.h"
@@ -30,6 +29,7 @@
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "src/gpu/GrOpFlushState.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrXferProcessor.h"
#include "src/gpu/ops/GrDrawOp.h"
#include "src/gpu/ops/GrOp.h"
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index e5e041f..944ec21 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -15,10 +15,10 @@
#include "tests/Test.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkHalf.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrTextureProxy.h"
#include "tools/gpu/ProxyUtils.h"
#include <float.h>
diff --git a/tests/GLBackendSurfaceTest.cpp b/tests/GLBackendSurfaceTest.cpp
index c5e360c..ace8a1f 100644
--- a/tests/GLBackendSurfaceTest.cpp
+++ b/tests/GLBackendSurfaceTest.cpp
@@ -17,8 +17,8 @@
#include "include/gpu/GrTexture.h"
#include "include/gpu/gl/GrGLTypes.h"
#include "include/private/GrGLTypesPriv.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/gl/GrGLCaps.h"
#include "src/gpu/gl/GrGLTexture.h"
#include "src/image/SkImage_Base.h"
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index ef0ef66..d0e8d5c 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -12,7 +12,6 @@
#include "include/core/SkSurface.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrBackendTextureImageGenerator.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
@@ -20,6 +19,7 @@
#include "src/gpu/GrSemaphore.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGpuDevice.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkSurface_Gpu.h"
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index e01d98c..fc3f8f9 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -9,9 +9,9 @@
#include "tests/Test.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrColor.h"
#include "include/private/GrRecordingContext.h"
#include "src/core/SkMakeUnique.h"
+#include "src/gpu/GrColor.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGeometryProcessor.h"
#include "src/gpu/GrGpuCommandBuffer.h"
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index b655053..f3713a3 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -164,8 +164,8 @@
}
}
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrTextureContext.h"
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(InitialTextureClear, reporter, context_info) {
diff --git a/tests/GrUploadPixelsTests.cpp b/tests/GrUploadPixelsTests.cpp
index c3b8250..7da3e12 100644
--- a/tests/GrUploadPixelsTests.cpp
+++ b/tests/GrUploadPixelsTests.cpp
@@ -9,8 +9,8 @@
#include "include/core/SkTypes.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/SkGr.h"
#include "tests/Test.h"
#include "tests/TestUtils.h"
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index d4fa9f7..e806fe4 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -193,11 +193,11 @@
#include "include/gpu/GrContext.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
static sk_sp<GrTextureProxy> create_proxy(GrProxyProvider* proxyProvider) {
SkBitmap srcBM = create_bm();
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index 8343c8d..e42e79d 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -9,8 +9,6 @@
#include "include/gpu/GrTexture.h"
#include "include/gpu/mock/GrMockTypes.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/core/SkExchange.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkRectPriv.h"
@@ -22,7 +20,9 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/GrTextureProxyPriv.h"
#include "src/gpu/mock/GrMockGpu.h"
diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp
index 4e8a49e..e450d2e 100644
--- a/tests/PackedConfigsTextureTest.cpp
+++ b/tests/PackedConfigsTextureTest.cpp
@@ -14,9 +14,9 @@
#include "tests/Test.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrTextureProxy.h"
#include "tools/gpu/ProxyUtils.h"
static const int DEV_W = 10, DEV_H = 10;
diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp
index 3573d19..091fe4f 100644
--- a/tests/ProxyConversionTest.cpp
+++ b/tests/ProxyConversionTest.cpp
@@ -12,12 +12,12 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrRenderTarget.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetProxy.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
static sk_sp<GrSurfaceProxy> make_wrapped_rt(GrProxyProvider* provider,
GrGpu* gpu,
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index b24a123..2a5ecb4 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -10,13 +10,13 @@
#include "tests/Test.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrPendingIOResource.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
int32_t GrIORefProxy::getBackingRefCnt_TestOnly() const {
if (fTarget) {
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index cdc4421..4c7dc4a 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -11,14 +11,14 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrRenderTargetProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfacePriv.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
#include "src/gpu/gl/GrGLDefines.h"
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 06f8457..7fa5028 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -11,13 +11,13 @@
#include "include/core/SkCanvas.h"
#include "include/core/SkSurface.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/private/SkTo.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "tools/gpu/ProxyUtils.h"
// This was made indivisible by 4 to ensure we test setting GL_PACK_ALIGNMENT properly.
diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp
index 1f0ed4b..dff1b44 100644
--- a/tests/RenderTargetContextTest.cpp
+++ b/tests/RenderTargetContextTest.cpp
@@ -13,8 +13,8 @@
// mixes this test up. Re-enable once backing GPU resources are distributed by MDB at flush time.
#if 0
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
static const int kSize = 64;
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index 5bbb63c..aa344c2 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -10,7 +10,6 @@
#include "tests/Test.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDeinstantiateProxyTracker.h"
#include "src/gpu/GrGpu.h"
@@ -18,6 +17,7 @@
#include "src/gpu/GrResourceAllocator.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxy.h"
#include "include/core/SkSurface.h"
diff --git a/tests/SkParagraphTest.cpp b/tests/SkParagraphTest.cpp
index 9f4b385..960951d 100644
--- a/tests/SkParagraphTest.cpp
+++ b/tests/SkParagraphTest.cpp
@@ -1,11 +1,11 @@
// Copyright 2019 Google LLC.
#include <sstream>
-#include "Test.h"
#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
#include "modules/skparagraph/src/ParagraphImpl.h"
#include "modules/skparagraph/src/TypefaceFontProvider.h"
#include "src/core/SkOSFile.h"
#include "src/utils/SkShaperJSONWriter.h"
+#include "tests/Test.h"
#include "tools/Resources.h"
#define VeryLongCanvasWidth 1000000
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index d22534d..5e1a292 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -17,10 +17,10 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index 1a6236f..93c1734 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -8,15 +8,15 @@
#include "tests/TestUtils.h"
#include "include/encode/SkPngEncoder.h"
-#include "include/private/GrSurfaceProxy.h"
-#include "include/private/GrTextureProxy.h"
#include "include/utils/SkBase64.h"
#include "src/core/SkUtils.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrDrawingManager.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/GrTextureContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
void test_read_pixels(skiatest::Reporter* reporter,
diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp
index cc22e8e..fbf8f27 100644
--- a/tests/TextureProxyTest.cpp
+++ b/tests/TextureProxyTest.cpp
@@ -11,11 +11,11 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrTextureProxy.h"
#include "include/core/SkImage.h"
#include "src/gpu/SkGr.h"
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index ed36a14..0da2096 100644
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -11,10 +11,10 @@
#include "include/core/SkSurface.h"
#include "include/gpu/GrTexture.h"
-#include "include/private/GrSurfaceProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceProxy.h"
#include "src/gpu/SkGr.h"
#include "tests/Test.h"
#include "tools/gpu/GrContextFactory.h"
diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp
index ced9f88..9f77029 100644
--- a/tests/VkBackendSurfaceTest.cpp
+++ b/tests/VkBackendSurfaceTest.cpp
@@ -19,9 +19,9 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrTexture.h"
#include "include/gpu/vk/GrVkTypes.h"
-#include "include/private/GrTextureProxy.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGpuDevice.h"
#include "src/gpu/vk/GrVkGpu.h"
#include "src/gpu/vk/GrVkImageLayout.h"
diff --git a/tools/debugger/DebugCanvas.cpp b/tools/debugger/DebugCanvas.cpp
index 40f0cf7..24d467c 100644
--- a/tools/debugger/DebugCanvas.cpp
+++ b/tools/debugger/DebugCanvas.cpp
@@ -16,7 +16,7 @@
#include "tools/debugger/DrawCommand.h"
#include "include/gpu/GrContext.h"
-#include "include/private/GrAuditTrail.h"
+#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 88a3a8c..f64458f 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -10,7 +10,6 @@
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrTexture.h"
#include "include/private/GrRecordingContext.h"
-#include "include/private/GrRenderTargetProxy.h"
#include "include/private/SkTo.h"
#include "src/core/SkMathPriv.h"
#include "src/gpu/GrClip.h"
@@ -23,6 +22,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrRenderTargetProxy.h"
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrSemaphore.h"
#include "src/gpu/GrSurfaceContextPriv.h"
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index b85a3cd..75280c5 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -8,8 +8,8 @@
#ifndef ProxyUtils_DEFINED
#define ProxyUtils_DEFINED
-#include "include/private/GrTextureProxy.h"
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrTextureProxy.h"
namespace sk_gpu_test {