Remove GrGpuResource::abandon from the public API.

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

2 files changed, 7 insertions, 11 deletions

diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index fd7ead5b6c..0215e2ba91 100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -229,16 +229,6 @@ public:
     inline const ResourcePriv resourcePriv() const;
 
     /**
-     * Removes references to objects in the underlying 3D API without freeing them.
-     * Called by CacheAccess.
-     * In general this method should not be called outside of skia. It was
-     * made by public for a special case where it needs to be called in Blink
-     * when a texture becomes unsafe to use after having been shared through
-     * a texture mailbox.
-     */
-    void abandon();
-
-    /**
      * Dumps memory usage information for this GrGpuResource to traceMemoryDump.
      * Typically, subclasses should not need to override this, and should only
      * need to override setMemoryBacking.
@@ -310,6 +300,12 @@ private:
     virtual void computeScratchKey(GrScratchKey*) const {}
 
     /**
+     * Removes references to objects in the underlying 3D API without freeing them.
+     * Called by CacheAccess.
+     */
+    void abandon();
+
+    /**
      * Frees the object in the underlying 3D API. Called by CacheAccess.
      */
     void release();
diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index 80dd3f31b7..508bedac10 100644
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -39,7 +39,7 @@ public:
      * Note that if the GrTexture is not uniquely owned (no other refs), or has pending IO, this
      * function will fail.
      */
-    static bool StealBackendTexture(sk_sp<GrTexture>&&,
+    static bool StealBackendTexture(sk_sp<GrTexture>,
                                     GrBackendTexture*,
                                     SkImage::BackendTextureReleaseProc*);