Revert "Move GrGpuResource GrSurface and GrTexture into src."

This reverts commit e5a06ce.

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>

Author: egdaniel

RELEASE_NOTES.txt

@@ -7,9 +7,6 @@ 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,6 +16,9 @@ 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
@@ -99,10 +102,9 @@ 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",
@@ -192,7 +194,6 @@ 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",
@@ -213,7 +214,6 @@ 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/gpu/GrGpuResource.h renamed to include/gpu/GrGpuResource.h

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

src/gpu/GrSurface.h renamed to include/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 @@ class GrSurface : public GrGpuResource {
 
     virtual GrBackendFormat backendFormat() const = 0;
 
-    void setRelease(sk_sp<GrRefCntedCallback> releaseHelper) {
+    SK_API void setRelease(sk_sp<GrRefCntedCallback> releaseHelper) {
         this->onSetRelease(releaseHelper);
         fReleaseHelper = std::move(releaseHelper);
     }
@@ -51,7 +51,7 @@ class GrSurface : public GrGpuResource {
     // TODO: Remove Chrome's need to call this on a GrTexture
     typedef void* ReleaseCtx;
     typedef void (*ReleaseProc)(ReleaseCtx);
-    void setRelease(ReleaseProc proc, ReleaseCtx ctx) {
+    SK_API void setRelease(ReleaseProc proc, ReleaseCtx ctx) {
         sk_sp<GrRefCntedCallback> helper(new GrRefCntedCallback(proc, ctx));
         this->setRelease(std::move(helper));
     }

src/gpu/GrTexture.h renamed to include/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 @@ class GrTexture : virtual public GrSurface {
      * This function indicates that the texture parameters (wrap mode, filtering, ...) have been
      * changed externally to Skia.
      */
-    virtual void textureParamsModified() = 0;
+    SK_API virtual void textureParamsModified() = 0;
 
     /**
      * This function steals the backend texture from a uniquely owned GrTexture with no pending

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,14 +15,14 @@
 #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"
 #include "src/gpu/GrColorSpaceXform.h"
 #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,14 +17,14 @@
 #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"
 #include "src/gpu/GrFragmentProcessor.h"
 #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"