Make GrGpuResource::gpuMemorySize non-virtual w/ onGpuMemorySize virtual impl

Make GrGpuResource::gpuMemorySize non-virtual w/ onGpuMemorySize virtual impl

BUG=skia:2889
Committed: https://skia.googlesource.com/skia/+/69ed47f42d4877c178fdc0031cb01af2966ae235

[bsalomon, 2014-11-11 16:35:04]

Patchset #2 (id:20001) has been deleted

[bsalomon, 2014-11-11 16:35:08]

Patchset #1 (id:1) has been deleted

[bsalomon, 2014-11-11 16:36:02]

bsalomon@google.com changed reviewers:
+ robertphillips@google.com

[bsalomon, 2014-11-11 16:38:17]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-11 16:38:41]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/702413003/40001

[commit-bot: I haz the power, 2014-11-11 16:38:42]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2014-11-11 22:38 UTC

[commit-bot: I haz the power, 2014-11-11 16:38:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-11 16:38:49]

Failed to apply patch for include/gpu/GrGpuResource.h:
While running git apply --index -3 -p1;
  error: patch failed: include/gpu/GrGpuResource.h:172
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: include/gpu/GrGpuResource.h: patch does not apply

Patch:       include/gpu/GrGpuResource.h
Index: include/gpu/GrGpuResource.h
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index
3d6701a7026e7f124932d7985177e868f4679300..5231b15f897cd86278443c257ee7b6ae0e90bb86
100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -172,7 +172,13 @@ public:
      *
      * @return the amount of GPU memory used in bytes
      */
-    virtual size_t gpuMemorySize() const = 0;
+    size_t gpuMemorySize() const {
+        if (kInvalidGpuMemorySize == fGpuMemorySize) {
+            fGpuMemorySize = this->onGpuMemorySize();
+            SkASSERT(kInvalidGpuMemorySize != fGpuMemorySize);
+        }
+        return fGpuMemorySize;
+    }
 
     /**
      * Gets an id that is unique for this GrGpuResource object. It is static in
that it does
@@ -206,10 +212,8 @@ protected:
     bool isWrapped() const { return kWrapped_FlagBit & fFlags; }
 
     /**
-     * This entry point should be called whenever gpuMemorySize() begins
-     * reporting a different size. If the object is in the cache, it will call
-     * gpuMemorySize() immediately and pass the new size on to the resource
-     * cache.
+     * This entry point should be called whenever gpuMemorySize() should report
a different size.
+     * The cache will call gpuMemorySize() to update the current size of the
resource.
      */
     void didChangeGpuMemorySize() const;
 
@@ -220,6 +224,8 @@ protected:
     void setScratchKey(const GrResourceKey& scratchKey);
 
 private:
+    virtual size_t onGpuMemorySize() const = 0;
+
     // See comments in CacheAccess.
     bool setContentKey(const GrResourceKey& contentKey);
 
@@ -247,9 +253,12 @@ private:
         kWrapped_FlagBit         = 0x1,
     };
 
+    static const size_t kInvalidGpuMemorySize = ~static_cast<size_t>(0);
+
     uint32_t                fFlags;
 
     GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
+    mutable size_t          fGpuMemorySize;
     const uint32_t          fUniqueID;
 
     // TODO(bsalomon): Remove GrResourceKey and use different simpler types for
content and scratch

[bsalomon, 2014-11-11 16:39:35]

oops, didn't mean to check CQ on this one yet.

[robertphillips, 2014-11-11 18:17:45]

lgtm

[bsalomon, 2014-11-11 18:18:42]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-11 18:19:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/702413003/40001

[commit-bot: I haz the power, 2014-11-11 18:19:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-11 18:19:49]

Failed to apply patch for include/gpu/GrGpuResource.h:
While running git apply --index -3 -p1;
  error: patch failed: include/gpu/GrGpuResource.h:172
  Falling back to three-way merge...
  Applied patch to 'include/gpu/GrGpuResource.h' with conflicts.
  U include/gpu/GrGpuResource.h

Patch:       include/gpu/GrGpuResource.h
Index: include/gpu/GrGpuResource.h
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index
3d6701a7026e7f124932d7985177e868f4679300..5231b15f897cd86278443c257ee7b6ae0e90bb86
100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -172,7 +172,13 @@ public:
      *
      * @return the amount of GPU memory used in bytes
      */
-    virtual size_t gpuMemorySize() const = 0;
+    size_t gpuMemorySize() const {
+        if (kInvalidGpuMemorySize == fGpuMemorySize) {
+            fGpuMemorySize = this->onGpuMemorySize();
+            SkASSERT(kInvalidGpuMemorySize != fGpuMemorySize);
+        }
+        return fGpuMemorySize;
+    }
 
     /**
      * Gets an id that is unique for this GrGpuResource object. It is static in
that it does
@@ -206,10 +212,8 @@ protected:
     bool isWrapped() const { return kWrapped_FlagBit & fFlags; }
 
     /**
-     * This entry point should be called whenever gpuMemorySize() begins
-     * reporting a different size. If the object is in the cache, it will call
-     * gpuMemorySize() immediately and pass the new size on to the resource
-     * cache.
+     * This entry point should be called whenever gpuMemorySize() should report
a different size.
+     * The cache will call gpuMemorySize() to update the current size of the
resource.
      */
     void didChangeGpuMemorySize() const;
 
@@ -220,6 +224,8 @@ protected:
     void setScratchKey(const GrResourceKey& scratchKey);
 
 private:
+    virtual size_t onGpuMemorySize() const = 0;
+
     // See comments in CacheAccess.
     bool setContentKey(const GrResourceKey& contentKey);
 
@@ -247,9 +253,12 @@ private:
         kWrapped_FlagBit         = 0x1,
     };
 
+    static const size_t kInvalidGpuMemorySize = ~static_cast<size_t>(0);
+
     uint32_t                fFlags;
 
     GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
+    mutable size_t          fGpuMemorySize;
     const uint32_t          fUniqueID;
 
     // TODO(bsalomon): Remove GrResourceKey and use different simpler types for
content and scratch

[bsalomon, 2014-11-12 19:01:30]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-12 19:02:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/702413003/60001

[commit-bot: I haz the power, 2014-11-12 19:13:43]

Committed patchset #2 (id:60001) as
https://skia.googlesource.com/skia/+/69ed47f42d4877c178fdc0031cb01af2966ae235