Reland "Move GrGpuResource GrSurface and GrTexture into src."

This reverts commit f6ed96d1c2.

Reason for revert: google3 change landed

Original change's description:
> Revert "Move GrGpuResource GrSurface and GrTexture into src."
> 
> This reverts commit e5a06ce678.
> 
> Reason for revert: Need to make change in google3 first
> 
> Original change's description:
> > Move GrGpuResource GrSurface and GrTexture into src.
> > 
> > Must land https://chromium-review.googlesource.com/c/chromium/src/+/2087980
> > before this can land.
> > 
> > Bug: skia:7966
> > Change-Id: I60bbb1765bfbb2c96b2bc0c9826b6b9d57eb2a03
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275077
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
> 
> Change-Id: Id39e0a351e49a87209de88a6ad9fadb0219db72c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:7966
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275216
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: I746ce739cb084cefc46f9dab24ef773e7c3cc621
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7966
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275436
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

RELEASE_NOTES.txt

@@ -7,6 +7,9 @@ This file includes a list of high level updates for each milestone release.
 Milestone 82
 
 <Insert new notes here- top is most recent.>
+  * Removed GrGpuResource, GrSurface, and GrTexture from public api. These were not
+    meant to be public, and we now can move them into src.
+
   * Removed Bones from SkVertices
 
   * Added a field to GrContextOptions that controls whether GL errors are checked after

bench/GrResourceCacheBench.cpp

@@ -9,9 +9,9 @@
 
 #include "include/core/SkCanvas.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrGpuResource.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrGpuResourcePriv.h"
 #include "src/gpu/GrResourceCache.h"
 

gn/gpu.gni

@@ -16,9 +16,6 @@ skia_gpu_sources = [
   "$_include/gpu/GrContext.h",
   "$_include/gpu/GrContextThreadSafeProxy.h",
   "$_include/gpu/GrDriverBugWorkarounds.h",
-  "$_include/gpu/GrGpuResource.h",
-  "$_include/gpu/GrSurface.h",
-  "$_include/gpu/GrTexture.h",
   "$_include/gpu/GrTypes.h",
 
   # Private includes
@@ -102,9 +99,10 @@ skia_gpu_sources = [
   "$_src/gpu/GrGpu.h",
   "$_src/gpu/GrGpuBuffer.cpp",
   "$_src/gpu/GrGpuBuffer.h",
+  "$_src/gpu/GrGpuResource.cpp",
+  "$_src/gpu/GrGpuResource.h",
   "$_src/gpu/GrGpuResourceCacheAccess.h",
   "$_src/gpu/GrGpuResourcePriv.h",
-  "$_src/gpu/GrGpuResource.cpp",
   "$_src/gpu/GrImageContext.cpp",
   "$_src/gpu/GrImageContextPriv.h",
   "$_src/gpu/GrImageInfo.h",
@@ -194,6 +192,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrStyle.cpp",
   "$_src/gpu/GrStyle.h",
   "$_src/gpu/GrSurface.cpp",
+  "$_src/gpu/GrSurface.h",
   "$_src/gpu/GrSurfaceContext.cpp",
   "$_src/gpu/GrSurfaceContext.h",
   "$_src/gpu/GrSurfaceContextPriv.h",
@@ -214,6 +213,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrTestUtils.cpp",
   "$_src/gpu/GrTestUtils.h",
   "$_src/gpu/GrTexture.cpp",
+  "$_src/gpu/GrTexture.h",
   "$_src/gpu/GrTextureAdjuster.cpp",
   "$_src/gpu/GrTextureAdjuster.h",
   "$_src/gpu/GrTextureMaker.cpp",

src/core/SkDeferredDisplayListRecorder.cpp

@@ -61,10 +61,10 @@ sk_sp<SkImage> SkDeferredDisplayListRecorder::makeYUVAPromiseTexture(
 
 #include "include/core/SkPromiseImageTexture.h"
 #include "include/core/SkYUVASizeInfo.h"
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/SkGr.h"
 #include "src/image/SkImage_Gpu.h"
 #include "src/image/SkImage_GpuYUVA.h"

src/effects/imagefilters/SkDisplacementMapEffect.cpp

@@ -15,7 +15,6 @@
 #include "src/core/SkSpecialImage.h"
 #include "src/core/SkWriteBuffer.h"
 #if SK_SUPPORT_GPU
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrClip.h"
@@ -23,6 +22,7 @@
 #include "src/gpu/GrCoordTransform.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureDomain.h"

src/effects/imagefilters/SkLightingImageFilter.cpp

@@ -17,7 +17,6 @@
 #include "src/core/SkWriteBuffer.h"
 
 #if SK_SUPPORT_GPU
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrFixedClip.h"
@@ -25,6 +24,7 @@
 #include "src/gpu/GrPaint.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 
 #include "src/gpu/SkGr.h"

src/effects/imagefilters/SkMagnifierImageFilter.cpp

@@ -18,9 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrColorSpaceXform.h"
 #include "src/gpu/GrCoordTransform.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/effects/generated/GrMagnifierEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/effects/imagefilters/SkMorphologyImageFilter.cpp

@@ -17,13 +17,13 @@
 
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.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/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"

src/gpu/GrAHardwareBufferImageGenerator.cpp

@@ -18,7 +18,6 @@
 
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/gpu/gl/GrGLTypes.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/core/SkExchange.h"
@@ -30,6 +29,7 @@
 #include "src/gpu/GrResourceCache.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrResourceProviderPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/gl/GrGLDefines.h"
 

src/gpu/GrAuditTrail.h

@@ -11,9 +11,9 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkString.h"
 #include "include/gpu/GrConfig.h"
-#include "include/gpu/GrGpuResource.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrRenderTargetProxy.h"
 
 class GrOp;

src/gpu/GrBackendTextureImageGenerator.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/core/SkMessageBus.h"
 #include "src/gpu/GrBackendTextureImageGenerator.h"
@@ -19,6 +18,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrResourceProviderPriv.h"
 #include "src/gpu/GrSemaphore.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 #include "src/gpu/SkGr.h"

src/gpu/GrCaps.cpp

@@ -7,9 +7,9 @@
 
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrContextOptions.h"
-#include "include/gpu/GrSurface.h"
 #include "include/private/GrTypesPriv.h"
 #include "src/gpu/GrCaps.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrSurfaceProxy.h"
 #include "src/gpu/GrWindowRectangles.h"
 #include "src/utils/SkJSONWriter.h"

src/gpu/GrContextPriv.cpp

@@ -8,7 +8,6 @@
 #include "src/gpu/GrContextPriv.h"
 
 #include "include/gpu/GrContextThreadSafeProxy.h"
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrAuditTrail.h"
 #include "src/gpu/GrContextThreadSafeProxyPriv.h"
 #include "src/gpu/GrDrawingManager.h"
@@ -18,6 +17,7 @@
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/GrSurfaceContextPriv.h"
 #include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "src/gpu/effects/generated/GrConfigConversionEffect.h"

src/gpu/GrDrawOpAtlas.cpp

@@ -8,7 +8,6 @@
 #include "src/gpu/GrDrawOpAtlas.h"
 
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkOpts.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
@@ -18,6 +17,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrResourceProviderPriv.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTracing.h"
 
 #ifdef DUMP_ATLAS_DATA

src/gpu/GrDrawingManager.cpp

@@ -9,7 +9,6 @@
 
 #include "include/core/SkDeferredDisplayList.h"
 #include "include/gpu/GrBackendSemaphore.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/core/SkTTopoSort.h"
 #include "src/gpu/GrAuditTrail.h"
@@ -28,6 +27,7 @@
 #include "src/gpu/GrSoftwarePathRenderer.h"
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrTextureProxyPriv.h"

src/gpu/GrGpuBuffer.h

@@ -8,8 +8,8 @@
 #ifndef GrGpuBuffer_DEFINED
 #define GrGpuBuffer_DEFINED
 
-#include "include/gpu/GrGpuResource.h"
 #include "src/gpu/GrBuffer.h"
+#include "src/gpu/GrGpuResource.h"
 
 class GrGpu;
 

src/gpu/GrGpuResource.cpp

@@ -7,9 +7,9 @@
 
 #include "include/core/SkTraceMemoryDump.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrGpuResource.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrGpuResourcePriv.h"
 #include "src/gpu/GrResourceCache.h"
 #include <atomic>

src/gpu/GrGpuResource.h

@@ -85,7 +85,7 @@ private:
 /**
  * Base class for objects that can be kept in the GrResourceCache.
  */
-class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
+class GrGpuResource : public GrIORef<GrGpuResource> {
 public:
     /**
      * Tests whether a object has been abandoned or released. All objects will

src/gpu/GrGpuResourceCacheAccess.h

@@ -8,7 +8,7 @@
 #ifndef GrGpuResourceCacheAccess_DEFINED
 #define GrGpuResourceCacheAccess_DEFINED
 
-#include "include/gpu/GrGpuResource.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrGpuResourcePriv.h"
 
 namespace skiatest {

src/gpu/GrGpuResourcePriv.h

@@ -8,7 +8,7 @@
 #ifndef GrGpuResourcePriv_DEFINED
 #define GrGpuResourcePriv_DEFINED
 
-#include "include/gpu/GrGpuResource.h"
+#include "src/gpu/GrGpuResource.h"
 
 /**
  * This class allows code internal to Skia privileged access to manage the cache keys and budget

src/gpu/GrOpFlushState.cpp

@@ -7,7 +7,6 @@
 
 #include "src/gpu/GrOpFlushState.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkConvertPixels.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrDrawOpAtlas.h"
@@ -15,6 +14,7 @@
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrTexture.h"
 
 //////////////////////////////////////////////////////////////////////////////
 

src/gpu/GrPath.h

@@ -10,7 +10,7 @@
 
 #include "include/core/SkPath.h"
 #include "include/core/SkRect.h"
-#include "include/gpu/GrGpuResource.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrPathRendering.h"
 #include "src/gpu/GrStyle.h"
 

src/gpu/GrProxyProvider.cpp

@@ -10,7 +10,6 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkImage.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrImageContext.h"
 #include "include/private/GrResourceKey.h"
 #include "include/private/GrSingleOwner.h"
@@ -27,6 +26,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSurfaceProxy.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxyCacheAccess.h"
 #include "src/gpu/GrTextureRenderTargetProxy.h"
 #include "src/gpu/SkGr.h"

src/gpu/GrRenderTarget.h

@@ -9,7 +9,7 @@
 #define GrRenderTarget_DEFINED
 
 #include "include/core/SkRect.h"
-#include "include/gpu/GrSurface.h"
+#include "src/gpu/GrSurface.h"
 
 class GrCaps;
 class GrRenderTargetPriv;

src/gpu/GrResourceAllocator.h

@@ -8,8 +8,8 @@
 #ifndef GrResourceAllocator_DEFINED
 #define GrResourceAllocator_DEFINED
 
-#include "include/gpu/GrSurface.h"
 #include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrSurfaceProxy.h"
 
 #include "src/core/SkArenaAlloc.h"

src/gpu/GrResourceCache.cpp

@@ -8,7 +8,6 @@
 #include "src/gpu/GrResourceCache.h"
 #include <atomic>
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrSingleOwner.h"
 #include "include/private/SkTo.h"
 #include "include/utils/SkRandom.h"
@@ -21,6 +20,7 @@
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpuResourceCacheAccess.h"
 #include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxyCacheAccess.h"
 #include "src/gpu/GrTracing.h"
 #include "src/gpu/SkGr.h"

src/gpu/GrResourceCache.h

@@ -9,7 +9,6 @@
 #define GrResourceCache_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/GrGpuResource.h"
 #include "include/private/GrResourceKey.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
@@ -17,6 +16,7 @@
 #include "src/core/SkTDPQueue.h"
 #include "src/core/SkTInternalLList.h"
 #include "src/core/SkTMultiMap.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrGpuResourceCacheAccess.h"
 #include "src/gpu/GrGpuResourcePriv.h"
 

src/gpu/GrSemaphore.h

@@ -9,7 +9,7 @@
 #define GrSemaphore_DEFINED
 
 #include "include/gpu/GrBackendSemaphore.h"
-#include "include/gpu/GrGpuResource.h"
+#include "src/gpu/GrGpuResource.h"
 
 /**
  * Represents a semaphore-like GPU synchronization object. This is a slightly odd fit for

src/gpu/GrStencilAttachment.h

@@ -9,8 +9,8 @@
 #ifndef GrStencilAttachment_DEFINED
 #define GrStencilAttachment_DEFINED
 
-#include "include/gpu/GrGpuResource.h"
 #include "src/core/SkClipStack.h"
+#include "src/gpu/GrGpuResource.h"
 
 class GrRenderTarget;
 class GrResourceKey;

src/gpu/GrSurface.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrSurface.h"
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkCompressedDataUtils.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTexture.h"
 
 #include "src/core/SkMathPriv.h"
 #include "src/gpu/SkGr.h"

src/gpu/GrSurface.h

@@ -11,8 +11,8 @@
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRect.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrGpuResource.h"
 #include "include/gpu/GrTypes.h"
+#include "src/gpu/GrGpuResource.h"
 
 class GrRenderTarget;
 class GrSurfacePriv;
@@ -42,7 +42,7 @@ public:
 
     virtual GrBackendFormat backendFormat() const = 0;
 
-    SK_API void setRelease(sk_sp<GrRefCntedCallback> releaseHelper) {
+    void setRelease(sk_sp<GrRefCntedCallback> releaseHelper) {
         this->onSetRelease(releaseHelper);
         fReleaseHelper = std::move(releaseHelper);
     }
@@ -51,7 +51,7 @@ public:
     // TODO: Remove Chrome's need to call this on a GrTexture
     typedef void* ReleaseCtx;
     typedef void (*ReleaseProc)(ReleaseCtx);
-    SK_API void setRelease(ReleaseProc proc, ReleaseCtx ctx) {
+    void setRelease(ReleaseProc proc, ReleaseCtx ctx) {
         sk_sp<GrRefCntedCallback> helper(new GrRefCntedCallback(proc, ctx));
         this->setRelease(std::move(helper));
     }

src/gpu/GrSurfacePriv.h

@@ -8,7 +8,7 @@
 #ifndef GrSurfacePriv_DEFINED
 #define GrSurfacePriv_DEFINED
 
-#include "include/gpu/GrSurface.h"
+#include "src/gpu/GrSurface.h"
 
 /** Class that adds methods to GrSurface that are only intended for use internal to Skia.
     This class is purely a privileged window into GrSurface. It should never have additional data

src/gpu/GrSurfaceProxy.h

@@ -10,12 +10,12 @@
 
 #include "include/core/SkRect.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrGpuResource.h"
-#include "include/gpu/GrSurface.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/SkNoncopyable.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrNonAtomicRef.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/GrSwizzle.h"
+#include "src/gpu/GrTexture.h"
 
 class GrCaps;
 class GrContext_Base;

src/gpu/GrTexture.cpp

@@ -8,7 +8,6 @@
 #include "include/core/SkMath.h"
 #include "include/core/SkTypes.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/GrResourceKey.h"
 #include "src/core/SkMipMap.h"
@@ -17,6 +16,7 @@
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 
 void GrTexture::markMipMapsDirty() {

src/gpu/GrTexture.h

@@ -13,8 +13,8 @@
 #include "include/core/SkPoint.h"
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrSurface.h"
 #include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrSurface.h"
 
 class GrTexturePriv;
 
@@ -29,7 +29,7 @@ public:
      * This function indicates that the texture parameters (wrap mode, filtering, ...) have been
      * changed externally to Skia.
      */
-    SK_API virtual void textureParamsModified() = 0;
+    virtual void textureParamsModified() = 0;
 
     /**
      * This function steals the backend texture from a uniquely owned GrTexture with no pending

src/gpu/GrTexturePriv.h

@@ -8,8 +8,8 @@
 #ifndef GrTexturePriv_DEFINED
 #define GrTexturePriv_DEFINED
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrSamplerState.h"
+#include "src/gpu/GrTexture.h"
 
 /** Class that adds methods to GrTexture that are only intended for use internal to Skia.
     This class is purely a privileged window into GrTexture. It should never have additional data

src/gpu/GrTextureRenderTargetProxy.cpp

@@ -7,13 +7,13 @@
 
 #include "src/gpu/GrTextureRenderTargetProxy.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrRenderTargetProxyPriv.h"
 #include "src/gpu/GrSurfacePriv.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxyPriv.h"
 

src/gpu/ccpr/GrCCClipPath.cpp

@@ -7,10 +7,10 @@
 
 #include "src/gpu/ccpr/GrCCClipPath.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrOnFlushResourceProvider.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/ccpr/GrCCPerFlushResources.h"
 
 void GrCCClipPath::init(

src/gpu/ccpr/GrCCClipProcessor.cpp

@@ -7,7 +7,7 @@
 
 #include "src/gpu/ccpr/GrCCClipProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/ccpr/GrCCClipPath.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"

src/gpu/ccpr/GrCCPathProcessor.cpp

@@ -7,9 +7,9 @@
 
 #include "src/gpu/ccpr/GrCCPathProcessor.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrOnFlushResourceProvider.h"
 #include "src/gpu/GrOpsRenderPass.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/ccpr/GrCCPerFlushResources.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/dawn/GrDawnTexture.h

@@ -8,7 +8,7 @@
 #ifndef GrDawnTexture_DEFINED
 #define GrDawnTexture_DEFINED
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "dawn/webgpu_cpp.h"
 
 class GrDawnGpu;

src/gpu/effects/GrBicubicEffect.cpp

@@ -7,8 +7,8 @@
 
 #include "src/gpu/effects/GrBicubicEffect.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkMatrixPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/gpu/effects/GrBitmapTextGeoProc.cpp

@@ -7,9 +7,9 @@
 
 #include "src/gpu/effects/GrBitmapTextGeoProc.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/effects/GrAtlasedShaderHelpers.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLGeometryProcessor.h"

src/gpu/effects/GrDistanceFieldGeoProc.cpp

@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkDistanceFieldGen.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/effects/GrAtlasedShaderHelpers.h"
 #include "src/gpu/effects/GrDistanceFieldGeoProc.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp

@@ -7,7 +7,7 @@
 
 #include "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/effects/GrMatrixConvolutionEffect.cpp

@@ -6,7 +6,7 @@
  */
 #include "src/gpu/effects/GrMatrixConvolutionEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/effects/GrSkSLFP.cpp

@@ -8,9 +8,9 @@
 #include "src/gpu/effects/GrSkSLFP.h"
 
 #include "include/effects/SkRuntimeEffect.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrContext_Base.h"
 #include "src/gpu/GrBaseContextPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/sksl/SkSLUtil.h"
 
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"

src/gpu/effects/GrTextureDomain.cpp

@@ -7,11 +7,11 @@
 
 #include "src/gpu/effects/GrTextureDomain.h"
 
-#include "include/gpu/GrTexture.h"
 #include "include/private/SkFloatingPoint.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/effects/GrTextureEffect.cpp

@@ -7,7 +7,7 @@
 
 #include "src/gpu/effects/GrTextureEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"

src/gpu/effects/GrYUVtoRGBEffect.cpp

@@ -7,8 +7,8 @@
 
 #include "src/gpu/effects/GrYUVtoRGBEffect.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/core/SkYUVMath.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrAARectEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrAARectEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp

@@ -19,7 +19,7 @@ inline GrFragmentProcessor::OptimizationFlags GrAlphaThresholdFragmentProcessor:
         return kCompatibleWithCoverageAsAlpha_OptimizationFlag;
     }
 }
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrBlurredEdgeFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp

@@ -254,7 +254,7 @@ std::unique_ptr<GrFragmentProcessor> GrCircleBlurFragmentProcessor::Make(
     return std::unique_ptr<GrFragmentProcessor>(new GrCircleBlurFragmentProcessor(
             circle, textureRadius, solidRadius, std::move(profile)));
 }
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrCircleEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrCircleEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrClampFragmentProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrClampFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrColorMatrixFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrComposeLerpEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrComposeLerpEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrComposeLerpRedEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrComposeLerpRedEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrConfigConversionEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrConfigConversionEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrConstColorProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrConstColorProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrDeviceSpaceEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrDeviceSpaceEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrEllipseEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrEllipseEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrHSLToRGBFilterEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrLumaColorFilterEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrLumaColorFilterEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrMagnifierEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrMagnifierEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrMixerEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrMixerEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrOverrideInputFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrPremulInputFragmentProcessor.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrPremulInputFragmentProcessor.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrRGBToHSLFilterEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrRRectBlurEffect.cpp

@@ -49,7 +49,7 @@ std::unique_ptr<GrFragmentProcessor> GrRRectBlurEffect::Make(GrRecordingContext*
             new GrRRectBlurEffect(xformedSigma, devRRect.getBounds(),
                                   SkRRectPriv::GetSimpleRadii(devRRect).fX, std::move(mask)));
 }
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/effects/generated/GrRectBlurEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrRectBlurEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gl/GrGLTexture.h

@@ -9,9 +9,9 @@
 #ifndef GrGLTexture_DEFINED
 #define GrGLTexture_DEFINED
 
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrGLTypesPriv.h"
 #include "src/gpu/GrGpu.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/gl/GrGLUtil.h"
 
 class GrGLGpu;

src/gpu/gl/GrGLVertexArray.h

@@ -8,10 +8,10 @@
 #ifndef GrGLVertexArray_DEFINED
 #define GrGLVertexArray_DEFINED
 
-#include "include/gpu/GrGpuResource.h"
 #include "include/gpu/gl/GrGLTypes.h"
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkTArray.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/gl/GrGLDefines.h"
 
 class GrBuffer;

src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp

@@ -7,8 +7,8 @@
 
 #include "src/gpu/glsl/GrGLSLPrimitiveProcessor.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrCoordTransform.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"

src/gpu/glsl/GrGLSLXferProcessor.cpp

@@ -7,8 +7,8 @@
 
 #include "src/gpu/glsl/GrGLSLXferProcessor.h"
 
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrXferProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"

src/gpu/gradients/generated/GrClampedGradientEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrClampedGradientEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrDualIntervalGradientColorizer.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrDualIntervalGradientColorizer.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrLinearGradientLayout.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrLinearGradientLayout.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrRadialGradientLayout.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrRadialGradientLayout.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrSingleIntervalGradientColorizer.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrSweepGradientLayout.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrSweepGradientLayout.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrTextureGradientColorizer.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrTextureGradientColorizer.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrTiledGradientEffect.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrTiledGradientEffect.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrTwoPointConicalGradientLayout.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.cpp

@@ -10,7 +10,7 @@
  **************************************************************************************************/
 #include "GrUnrolledBinaryGradientColorizer.h"
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"

src/gpu/mock/GrMockGpu.h

@@ -8,11 +8,11 @@
 #ifndef GrMockGpu_DEFINED
 #define GrMockGpu_DEFINED
 
-#include "include/gpu/GrTexture.h"
 #include "include/private/SkTHash.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrSemaphore.h"
+#include "src/gpu/GrTexture.h"
 
 class GrMockOpsRenderPass;
 struct GrMockOptions;

src/gpu/mock/GrMockTexture.h

@@ -7,11 +7,11 @@
 #ifndef GrMockTexture_DEFINED
 #define GrMockTexture_DEFINED
 
-#include "include/gpu/GrTexture.h"
 #include "include/gpu/mock/GrMockTypes.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrRenderTargetPriv.h"
 #include "src/gpu/GrStencilAttachment.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/mock/GrMockGpu.h"
 

src/gpu/mtl/GrMtlGpu.h

@@ -9,10 +9,10 @@
 #define GrMtlGpu_DEFINED
 
 #include <list>
-#include "include/gpu/GrTexture.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrSemaphore.h"
+#include "src/gpu/GrTexture.h"
 
 #include "src/gpu/mtl/GrMtlCaps.h"
 #include "src/gpu/mtl/GrMtlResourceProvider.h"

src/gpu/mtl/GrMtlTexture.h

@@ -8,7 +8,7 @@
 #ifndef GrMtlTexture_DEFINED
 #define GrMtlTexture_DEFINED
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 
 #import <Metal/Metal.h>
 

src/gpu/mtl/GrMtlUniformHandler.mm

@@ -5,7 +5,7 @@
 * found in the LICENSE file.
 */
 
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/gpu/mtl/GrMtlUniformHandler.h"

src/gpu/mtl/GrMtlUtil.mm

@@ -7,9 +7,9 @@
 
 #include "src/gpu/mtl/GrMtlUtil.h"
 
-#include "include/gpu/GrSurface.h"
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkMutex.h"
+#include "src/gpu/GrSurface.h"
 #include "src/gpu/mtl/GrMtlGpu.h"
 #include "src/gpu/mtl/GrMtlRenderTarget.h"
 #include "src/gpu/mtl/GrMtlTexture.h"

src/gpu/ops/GrOp.h

@@ -11,8 +11,8 @@
 #include "include/core/SkMatrix.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkString.h"
-#include "include/gpu/GrGpuResource.h"
 #include "include/private/GrRecordingContext.h"
+#include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrNonAtomicRef.h"
 #include "src/gpu/GrTracing.h"
 #include "src/gpu/GrXferProcessor.h"

src/gpu/ops/GrTextureOp.cpp

@@ -9,7 +9,6 @@
 
 #include "include/core/SkPoint.h"
 #include "include/core/SkPoint3.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "include/private/SkFloatingPoint.h"
 #include "include/private/SkTo.h"
@@ -27,6 +26,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrResourceProviderPriv.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/SkGr.h"

src/gpu/vk/GrVkImage.h

@@ -10,9 +10,9 @@
 
 #include "include/core/SkTypes.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrTexture.h"
 #include "include/gpu/vk/GrVkTypes.h"
 #include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/vk/GrVkImageLayout.h"
 #include "src/gpu/vk/GrVkResource.h"
 

src/gpu/vk/GrVkTexture.h

@@ -8,10 +8,10 @@
 #ifndef GrVkTexture_DEFINED
 #define GrVkTexture_DEFINED
 
-#include "include/gpu/GrTexture.h"
 #include "include/gpu/vk/GrVkTypes.h"
 #include "src/core/SkLRUCache.h"
 #include "src/gpu/GrSamplerState.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/vk/GrVkImage.h"
 
 class GrVkDescriptorSet;

src/image/SkImage.cpp

@@ -28,7 +28,7 @@
 
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrTexture.h"
 #include "src/image/SkImage_Gpu.h"
 #endif
 #include "include/gpu/GrBackendSurface.h"

src/image/SkImage_Gpu.cpp

@@ -12,7 +12,6 @@
 #include "include/core/SkCanvas.h"
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "include/private/SkImageInfoPriv.h"
 #include "src/core/SkAutoPixmapStorage.h"
@@ -37,6 +36,7 @@
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureAdjuster.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxy.h"

src/image/SkImage_GpuBase.cpp

@@ -10,7 +10,6 @@
 #include "include/core/SkPromiseImageTexture.h"
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/core/SkBitmapCache.h"
 #include "src/core/SkTLList.h"
@@ -19,6 +18,7 @@
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureAdjuster.h"
 #include "src/gpu/effects/GrYUVtoRGBEffect.h"
 #include "src/image/SkImage_Gpu.h"

src/image/SkImage_GpuYUVA.cpp

@@ -11,7 +11,6 @@
 
 #include "include/core/SkYUVASizeInfo.h"
 #include "include/gpu/GrContext.h"
-#include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkMipMap.h"
@@ -22,6 +21,7 @@
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProducer.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrYUVtoRGBEffect.h"