Move some Gr headers from include/gpu to include/private and src/gpu.

Bug: skia:
Change-Id: I341dd3bff63cc99d3be830e21673073645a9cfec
Reviewed-on: https://skia-review.googlesource.com/c/176220
Auto-Submit: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

Author: bsalomon

gn/gpu.gni

@@ -16,12 +16,7 @@ skia_gpu_sources = [
   "$_include/gpu/GrContextOptions.h",
   "$_include/gpu/GrContext.h",
   "$_include/gpu/GrDriverBugWorkarounds.h",
-  "$_include/gpu/GrGpuResource.h",
-  "$_include/gpu/GrRenderTarget.h",
-  "$_include/gpu/GrResourceKey.h",
-  "$_include/gpu/GrSurface.h",
   "$_include/gpu/GrTexture.h",
-  "$_include/gpu/GrSamplerState.h",
   "$_include/gpu/GrTypes.h",
 
   "$_include/gpu/gl/GrGLAssembleInterface.h",
@@ -36,10 +31,14 @@ skia_gpu_sources = [
   "$_include/private/GrColor.h",
   "$_include/private/GrCCClipPath.h",
   "$_include/private/GrCCPerOpListPaths.h",
+  "$_include/private/GrGpuResource.h",
   "$_include/private/GrOpList.h",
   "$_include/private/GrProxyRef.h",
   "$_include/private/GrSingleOwner.h",
   "$_include/private/GrRenderTargetProxy.h",
+  "$_include/private/GrResourceKey.h",
+  "$_include/private/GrSamplerState.h",
+  "$_include/private/GrSurface.h",
   "$_include/private/GrSurfaceProxy.h",
   "$_include/private/GrTextureProxy.h",
   "$_include/private/GrTypesPriv.h",
@@ -153,6 +152,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrRenderTargetProxyPriv.h",
   "$_src/gpu/GrReducedClip.cpp",
   "$_src/gpu/GrReducedClip.h",
+  "$_src/gpu/GrRenderTarget.h",
   "$_src/gpu/GrRenderTargetContext.cpp",
   "$_src/gpu/GrRenderTargetContext.h",
   "$_src/gpu/GrRenderTargetContextPriv.h",

include/gpu/GrTexture.h

@@ -9,13 +9,12 @@
 #ifndef GrTexture_DEFINED
 #define GrTexture_DEFINED
 
+#include "../private/GrSurface.h"
+#include "../private/GrTypesPriv.h"
 #include "GrBackendSurface.h"
-#include "GrSamplerState.h"
-#include "GrSurface.h"
 #include "SkImage.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
-#include "../private/GrTypesPriv.h"
 
 class GrTexturePriv;
 

include/gpu/GrGpuResource.h renamed to include/private/GrGpuResource.h

@@ -77,7 +77,7 @@ template <typename DERIVED> class GrIORef : public SkNoncopyable {
     }
 
 protected:
-    GrIORef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) { }
+    GrIORef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) {}
 
     enum CntType {
         kRef_CntType,
@@ -95,7 +95,7 @@ template <typename DERIVED> class GrIORef : public SkNoncopyable {
     bool internalHasUniqueRef() const { return fRefCnt == 1; }
 
 private:
-    friend class GrIORefProxy; // needs to forward on wrapped IO calls
+    friend class GrIORefProxy;  // needs to forward on wrapped IO calls
     // This is for a unit test.
     template <typename T>
     friend void testingOnly_getIORefCnts(const T*, int* refCnt, int* readCnt, int* writeCnt);
@@ -133,7 +133,7 @@ template <typename DERIVED> class GrIORef : public SkNoncopyable {
     mutable int32_t fPendingReads;
     mutable int32_t fPendingWrites;
 
-    friend class GrResourceCache; // to check IO ref counts.
+    friend class GrResourceCache;  // to check IO ref counts.
 
     template <typename, GrIOType> friend class GrPendingIOResource;
 };
@@ -143,7 +143,6 @@ template <typename DERIVED> class GrIORef : public SkNoncopyable {
  */
 class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
 public:
-
     /**
      * Tests whether a object has been abandoned or released. All objects will
      * be in this state after their creating GrContext is destroyed or has
@@ -275,11 +274,11 @@ class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
     GrGpu* getGpu() const { return fGpu; }
 
     /** Overridden to free GPU resources in the backend API. */
-    virtual void onRelease() { }
+    virtual void onRelease() {}
     /** Overridden to abandon any internal handles, ptrs, etc to backend API resources.
         This may be called when the underlying 3D context is no longer valid and so no
         backend API calls should be made. */
-    virtual void onAbandon() { }
+    virtual void onAbandon() {}
 
     /**
      * Allows subclasses to add additional backing information to the SkTraceMemoryDump.
@@ -299,15 +298,14 @@ class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
     void dumpMemoryStatisticsPriv(SkTraceMemoryDump* traceMemoryDump, const SkString& resourceName,
                                   const char* type, size_t size) const;
 
-
 private:
     /**
      * Called by the registerWithCache if the resource is available to be used as scratch.
      * Resource subclasses should override this if the instances should be recycled as scratch
      * resources and populate the scratchKey with the key.
      * By default resources are not recycled as scratch.
      **/
-    virtual void computeScratchKey(GrScratchKey*) const { }
+    virtual void computeScratchKey(GrScratchKey*) const {}
 
     /**
      * Frees the object in the underlying 3D API. Called by CacheAccess.
@@ -352,7 +350,7 @@ class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
     const UniqueID fUniqueID;
 
     typedef GrIORef<GrGpuResource> INHERITED;
-    friend class GrIORef<GrGpuResource>; // to access notifyAllCntsAreZero and notifyRefCntIsZero.
+    friend class GrIORef<GrGpuResource>;  // to access notifyAllCntsAreZero and notifyRefCntIsZero.
 };
 
 #endif

include/gpu/GrResourceKey.h renamed to include/private/GrResourceKey.h

@@ -155,7 +155,7 @@ class GrResourceKey {
         SkASSERT(SkIsAlign4(this->internalSize()));
     }
 
-    friend class TestResource; // For unit test to access kMetaDataCnt.
+    friend class TestResource;  // For unit test to access kMetaDataCnt.
 
     // bmp textures require 5 uint32_t values.
     SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey;
@@ -218,7 +218,7 @@ class GrScratchKey : public GrResourceKey {
     class Builder : public INHERITED::Builder {
     public:
         Builder(GrScratchKey* key, ResourceType type, int data32Count)
-            : INHERITED::Builder(key, type, data32Count) {}
+                : INHERITED::Builder(key, type, data32Count) {}
     };
 };
 
@@ -330,7 +330,7 @@ class GrUniqueKey : public GrResourceKey {
     name##_once(gr_init_static_unique_key_once, &name##_storage); \
     static const GrUniqueKey& name = *reinterpret_cast<GrUniqueKey*>(name##_storage.get())
 
-static inline void gr_init_static_unique_key_once(SkAlignedSTStorage<1,GrUniqueKey>* keyStorage) {
+static inline void gr_init_static_unique_key_once(SkAlignedSTStorage<1, GrUniqueKey>* keyStorage) {
     GrUniqueKey* key = new (keyStorage->get()) GrUniqueKey;
     GrUniqueKey::Builder builder(key, GrUniqueKey::GenerateDomain(), 0);
 }

include/gpu/GrSamplerState.h renamed to include/private/GrSamplerState.h

@@ -112,8 +112,7 @@ class SK_API GrSurface : public GrGpuResource {
             , fConfig(desc.fConfig)
             , fWidth(desc.fWidth)
             , fHeight(desc.fHeight)
-            , fSurfaceFlags(GrInternalSurfaceFlags::kNone) {
-    }
+            , fSurfaceFlags(GrInternalSurfaceFlags::kNone) {}
 
     ~GrSurface() override {}
 

include/gpu/GrSurface.h renamed to include/private/GrSurface.h

@@ -30,7 +30,7 @@ class GrRenderTarget : virtual public GrSurface {
 
     // GrSurface overrides
     GrRenderTarget* asRenderTarget() override { return this; }
-    const GrRenderTarget* asRenderTarget() const  override { return this; }
+    const GrRenderTarget* asRenderTarget() const override { return this; }
 
     // GrRenderTarget
     bool isStencilBufferMultisampled() const { return fSampleCnt > 1; }
@@ -125,10 +125,10 @@ class GrRenderTarget : virtual public GrSurface {
 
     friend class GrRenderTargetPriv;
 
-    int                  fSampleCnt;
+    int fSampleCnt;
     sk_sp<GrStencilAttachment> fStencilAttachment;
 
-    SkIRect              fResolveRect;
+    SkIRect fResolveRect;
 
     typedef GrSurface INHERITED;
 };

include/gpu/GrRenderTarget.h renamed to src/gpu/GrRenderTarget.h

@@ -8,6 +8,7 @@
 #ifndef GrTexturePriv_DEFINED
 #define GrTexturePriv_DEFINED
 
+#include "GrSamplerState.h"
 #include "GrTexture.h"
 
 /** Class that adds methods to GrTexture that are only intended for use internal to Skia.

src/gpu/GrTexturePriv.h

@@ -23,6 +23,7 @@ DEFINE_double(frame, 1.0, "A double value in [0, 1] that specifies the point in
 #include "GrBackendSurface.h"
 #include "GrContextPriv.h"
 #include "GrGpu.h"
+#include "GrRenderTarget.h"
 #include "gl/GLTestContext.h"
 
 // Globals externed in fiddle_main.h