Replace GrResourceCache with GrResourceCache2.

Replace GrResourceCache with GrResourceCache2.

BUG=skia:2889
Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

Committed: https://skia.googlesource.com/skia/+/407aa584d183c1bf314f5defd1cf0202e8a96c89

Committed: https://skia.googlesource.com/skia/+/71cb0c241e439b6ed746b90294d0b6916644a644

[bsalomon, 2014-11-12 21:56:01]

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

[bsalomon, 2014-11-12 22:03:48]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-12 22:18:27]

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

[commit-bot: I haz the power, 2014-11-12 22:18:28]

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-13 04:18 UTC

[commit-bot: I haz the power, 2014-11-12 22:20:27]

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

[commit-bot: I haz the power, 2014-11-12 22:20:34]

Try jobs failed on following builders:
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-GC...)
  Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-GC...)

[bsalomon, 2014-11-12 23:43:24]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-12 23:43:55]

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

[commit-bot: I haz the power, 2014-11-12 23:43:56]

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-13 05:43 UTC

[commit-bot: I haz the power, 2014-11-12 23:46:31]

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

[commit-bot: I haz the power, 2014-11-12 23:46:32]

Try jobs failed on following builders:
  Build-Mac10.8-Clang-x86_64-Release-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Mac10.8-Clang-...)
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-Cl...)
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-GC...)

[bsalomon, 2014-11-13 01:12:18]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-13 01:12:51]

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

[commit-bot: I haz the power, 2014-11-13 01:12:52]

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-13 07:12 UTC

[commit-bot: I haz the power, 2014-11-13 01:15:58]

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

[commit-bot: I haz the power, 2014-11-13 01:15:59]

Try jobs failed on following builders:
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-Cl...)
  Build-Win-VS2013-x86-Debug-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Win-VS2013-x86...)

[bsalomon, 2014-11-13 01:41:50]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-13 01:42:47]

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

[commit-bot: I haz the power, 2014-11-13 01:42:48]

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-13 07:42 UTC

[bsalomon, 2014-11-13 01:47:05]

The CQ bit was unchecked by bsalomon@google.com

[robertphillips, 2014-11-13 14:34:04]

lgtm + nits

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
File bench/GrResourceCacheBench.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
bench/GrResourceCacheBench.cpp:90: static void get_texture_desc(int i,
GrSurfaceDesc* desc) {
one line ?

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
bench/GrResourceCacheBench.cpp:95: desc->fConfig = static_cast<GrPixelConfig>(i
% (kLast_GrPixelConfig + 1));
% 1 ??

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
File src/gpu/GrResourceCache2.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:12: 
out of order ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:49: 
remove this public ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:294: while (resource) {
GrGpuResource* prev = resourceIter.prev();
if (resource->isPurgable()) {
    resource->unref();
}
resource = prev;

?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:332: while (resource) {
same here ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:342: 
Does this belong here ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2.h
File src/gpu/GrResourceCache2.h (right):

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:64: /**
... the cap on the amount of gpu memory the cache can consume. ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:207: #if GR_CACHE_STATS
Move this comment down to 'fCount' and 'fBytes' ?

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:226: private:
resource -> cache ?

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest.cpp
File tests/ResourceCacheTest.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:149: REPORTER_ASSERT(reporter, b->gpuMemorySize() +
c->gpuMemorySize() + d->gpuMemorySize() ==
align this guy with "b->" ?

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:155: REPORTER_ASSERT(reporter, b->gpuMemorySize() +
d->gpuMemorySize() ==
same here ?

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:245: REPORTER_ASSERT(reporter, a->gpuMemorySize() +
b->gpuMemorySize() ==
align ?

[bsalomon, 2014-11-13 14:51:51]

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
File bench/GrResourceCacheBench.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
bench/GrResourceCacheBench.cpp:90: static void get_texture_desc(int i,
GrSurfaceDesc* desc) {
On 2014/11/13 14:34:03, robertphillips wrote:
> one line ?

Done.

https://codereview.chromium.org/716143004/diff/80001/bench/GrResourceCacheBen...
bench/GrResourceCacheBench.cpp:95: desc->fConfig = static_cast<GrPixelConfig>(i
% (kLast_GrPixelConfig + 1));
On 2014/11/13 14:34:03, robertphillips wrote:
> % 1 ??

ha, I assume it's supposed to be 2.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
File src/gpu/GrResourceCache2.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:12: 
On 2014/11/13 14:34:03, robertphillips wrote:
> out of order ?

Done.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:49: 
On 2014/11/13 14:34:03, robertphillips wrote:
> remove this public ?

Done.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:294: while (resource) {
On 2014/11/13 14:34:03, robertphillips wrote:
> GrGpuResource* prev = resourceIter.prev();
> if (resource->isPurgable()) {
>     resource->unref();
> }
> resource = prev;
> 
> ?

Done

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:332: while (resource) {
On 2014/11/13 14:34:03, robertphillips wrote:
> same here ?

Done.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.cpp:342: 
On 2014/11/13 14:34:03, robertphillips wrote:
> Does this belong here ?

I think so. If the cache was asked to purge everything then it seems like it
should make its best effort. I thought about making this function set the budget
to 0 and then call the normal purge. Then I worried about guarding against purge
itself calling something that changed the budget and I got a headache.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2.h
File src/gpu/GrResourceCache2.h (right):

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:64: /**
On 2014/11/13 14:34:03, robertphillips wrote:
> ... the cap on the amount of gpu memory the cache can consume. ?

Updated in the next CL where another query is added to differentiate between
total size and budgeted size.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:207: #if GR_CACHE_STATS
On 2014/11/13 14:34:03, robertphillips wrote:
> Move this comment down to 'fCount' and 'fBytes' ?

Done.

https://codereview.chromium.org/716143004/diff/80001/src/gpu/GrResourceCache2...
src/gpu/GrResourceCache2.h:226: private:
On 2014/11/13 14:34:03, robertphillips wrote:
> resource -> cache ?

Done.

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest.cpp
File tests/ResourceCacheTest.cpp (right):

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:149: REPORTER_ASSERT(reporter, b->gpuMemorySize() +
c->gpuMemorySize() + d->gpuMemorySize() ==
On 2014/11/13 14:34:03, robertphillips wrote:
> align this guy with "b->" ?

Done.

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:155: REPORTER_ASSERT(reporter, b->gpuMemorySize() +
d->gpuMemorySize() ==
On 2014/11/13 14:34:03, robertphillips wrote:
> same here ?

Done.

https://codereview.chromium.org/716143004/diff/80001/tests/ResourceCacheTest....
tests/ResourceCacheTest.cpp:245: REPORTER_ASSERT(reporter, a->gpuMemorySize() +
b->gpuMemorySize() ==
On 2014/11/13 14:34:03, robertphillips wrote:
> align ?

Done.

[bsalomon, 2014-11-13 21:07:57]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-13 21:08:08]

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

[commit-bot: I haz the power, 2014-11-13 21:19:25]

Committed patchset #6 (id:100001) as
https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

[bsalomon, 2014-11-13 21:31:36]

A revert of this CL (patchset #6 id:100001) has been created in
https://codereview.chromium.org/715333003/ by bsalomon@google.com.

The reason for reverting is: Breaking stuff.

[bsalomon, 2014-11-14 14:20:39]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-14 14:20:59]

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

[commit-bot: I haz the power, 2014-11-14 14:29:45]

Committed patchset #7 (id:120001) as
https://skia.googlesource.com/skia/+/407aa584d183c1bf314f5defd1cf0202e8a96c89

[bsalomon, 2014-11-14 14:46:55]

A revert of this CL (patchset #7 id:120001) has been created in
https://codereview.chromium.org/726913002/ by bsalomon@google.com.

The reason for reverting is: broken again.

[bsalomon, 2014-11-14 19:59:34]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-11-14 20:00:28]

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

[commit-bot: I haz the power, 2014-11-14 20:10:20]

Committed patchset #8 (id:140001) as
https://skia.googlesource.com/skia/+/71cb0c241e439b6ed746b90294d0b6916644a644