Remove custom data from GrGpuResource

Chrome is no longer relying on this feature to track mailboxes for textures.

BUG=skia:4134

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2291203002

Review-Url: https://codereview.chromium.org/2291203002

diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index 37a87d3..fb7cb8c 100644 (file)
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -10,7 +10,6 @@
 
 #include "GrResourceKey.h"
 #include "GrTypesPriv.h"
-#include "SkData.h"
 
 class GrContext;
 class GrGpu;
@@ -188,20 +187,6 @@ public:
     const GrUniqueKey& getUniqueKey() const { return fUniqueKey; }
 
     /**
-     * Attach a custom data object to this resource. The data will remain attached
-     * for the lifetime of this resource (until it is abandoned or released).
-     * Takes a ref on data. Previously attached data, if any, is unrefed.
-     * Returns the data argument, for convenience.
-     */
-    const SkData* setCustomData(const SkData* data);
-
-    /**
-     * Returns the custom data object that was attached to this resource by
-     * calling setCustomData.
-     */
-    const SkData* getCustomData() const { return fData.get(); }
-
-    /**
      * Internal-only helper class used for manipulations of the resource by the cache.
      */
     class CacheAccess;
@@ -317,8 +302,6 @@ private:
     bool                        fRefsWrappedObjects;
     const uint32_t              fUniqueID;
 
-    SkAutoTUnref<const SkData>  fData;
-
     typedef GrIORef<GrGpuResource> INHERITED;
     friend class GrIORef<GrGpuResource>; // to access notifyAllCntsAreZero and notifyRefCntIsZero.
 };

diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp
index ff858fe..49b9349 100644 (file)
--- a/src/gpu/GrGpuResource.cpp
+++ b/src/gpu/GrGpuResource.cpp
@@ -83,12 +83,6 @@ void GrGpuResource::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) con
     this->setMemoryBacking(traceMemoryDump, dumpName);
 }
 
-const SkData* GrGpuResource::setCustomData(const SkData* data) {
-    SkSafeRef(data);
-    fData.reset(data);
-    return data;
-}
-
 const GrContext* GrGpuResource::getContext() const {
     if (fGpu) {
         return fGpu->getContext();

diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 289fdd9..24a748d 100644 (file)
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -1282,8 +1282,6 @@ static void test_abandoned(skiatest::Reporter* reporter) {
 
     int foo = 4132;
     sk_sp<SkData> data(SkData::MakeWithCopy(&foo, sizeof(foo)));
-    resource->setCustomData(data.get());
-    resource->getCustomData();
     resource->getUniqueID();
     resource->getUniqueKey();
     resource->wasDestroyed();