Remove unused enum value and member of GrGpuObject

R=robertphillips@google.com
TBR=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/413523002

diff --git a/include/gpu/GrGpuObject.h b/include/gpu/GrGpuObject.h
index 859b8b015e555cc7e0979e67a1a269bcabf897eb..0347d441005d88af1ad46a9adf4b08c8f427a5ac 100644 (file)
--- a/include/gpu/GrGpuObject.h
+++ b/include/gpu/GrGpuObject.h
@@ -73,7 +73,6 @@ protected:
     virtual void onAbandon() {};
 
     bool isWrapped() const { return kWrapped_FlagBit & fFlags; }
-    bool needsDeferredUnref() const { return SkToBool(kDeferredUnref_FlagBit & fFlags); }
 
 private:
 #ifdef SK_DEBUG
@@ -86,8 +85,6 @@ private:
     GrGpu*              fGpu;               // not reffed. The GrGpu can be deleted while there
                                             // are still live GrGpuObjects. It will call
                                             // release() on all such objects in its destructor.
-    mutable int         fDeferredRefCount;  // How many references in deferred drawing buffers.
-
     enum Flags {
         /**
          * This object wraps a GPU object given to us by the user.
@@ -95,14 +92,6 @@ private:
          * free it).
          */
         kWrapped_FlagBit         = 0x1,
-
-        /**
-         * This texture should be de-refed when the deferred ref count goes
-         * to zero. An object gets into this state when the resource cache
-         * is holding a ref-of-obligation (i.e., someone needs to own it but
-         * no one else wants to) but doesn't really want to keep it around.
-         */
-        kDeferredUnref_FlagBit  = 0x2,
     };
     uint32_t         fFlags;
 

diff --git a/src/gpu/GrGpuObject.cpp b/src/gpu/GrGpuObject.cpp
index 43a86f2d51bace98a209eac9294e64f291191c5e..fff2a2fd8f2c94a898b1d76f7ca52b48ae7dc87e 100644 (file)
--- a/src/gpu/GrGpuObject.cpp
+++ b/src/gpu/GrGpuObject.cpp
@@ -12,7 +12,6 @@
 
 GrGpuObject::GrGpuObject(GrGpu* gpu, bool isWrapped) {
     fGpu              = gpu;
-    fDeferredRefCount = 0;
     if (isWrapped) {
         fFlags = kWrapped_FlagBit;
     } else {
@@ -23,7 +22,6 @@ GrGpuObject::GrGpuObject(GrGpu* gpu, bool isWrapped) {
 
 GrGpuObject::~GrGpuObject() {
     // subclass should have released this.
-    SkASSERT(0 == fDeferredRefCount);
     SkASSERT(this->wasDestroyed());
 }