Update layer hoisting code to correctly render sub-picture layers

Update layer hoisting code to correctly render sub-picture layers

The prior code assumed all layers came from a single picture.

BUG=skia:2315
Committed: https://skia.googlesource.com/skia/+/30d2cc6ff47cb7f981d83e9a536971beec920f61

[robertphillips, 2014-09-22 15:15:03]

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

[robertphillips, 2014-09-23 12:36:53]

ping

[bsalomon, 2014-09-23 14:57:35]

some naming suggestions and Q, but otherwise lgtm

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.cpp
File src/gpu/GrLayerHoister.cpp (right):

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.cpp#n...
src/gpu/GrLayerHoister.cpp:32: if (0 == mainGPUData->numSaveLayers()) {
does numSaveLayers() count the nested layers?

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h
File src/gpu/GrLayerHoister.h (right):

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h#new...
src/gpu/GrLayerHoister.h:26: struct HoistingInfo {
I can't think of anything much better but this name doesn't capture that this is
for a particular layer...

HoistedLayer?

or maybe just mimic the Gr thing's name: CachedLayer?

Also, shouldn't the fields be 'f' prefixed?

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h#new...
src/gpu/GrLayerHoister.h:31: /** Find the layers in 'mainPicture' that need
hoisting. Note that the discovered
"topLevel", "root", or "base" seem clearer to me than "main"

[robertphillips, 2014-09-24 14:48:46]

The CQ bit was checked by robertphillips@google.com

[robertphillips, 2014-09-24 14:49:04]

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.cpp
File src/gpu/GrLayerHoister.cpp (right):

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.cpp#n...
src/gpu/GrLayerHoister.cpp:32: if (0 == mainGPUData->numSaveLayers()) {
On 2014/09/23 14:57:35, bsalomon wrote:
> does numSaveLayers() count the nested layers?

Yes all the layers (both nested and appearing in sub-pictures) are included in
the count returned by numSaveLayers.

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h
File src/gpu/GrLayerHoister.h (right):

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h#new...
src/gpu/GrLayerHoister.h:26: struct HoistingInfo {
On 2014/09/23 14:57:35, bsalomon wrote:
> I can't think of anything much better but this name doesn't capture that this
is
> for a particular layer...
> 
> HoistedLayer?
> 
> or maybe just mimic the Gr thing's name: CachedLayer?
> 
> Also, shouldn't the fields be 'f' prefixed?

Done. Went with HoistedLayer.

https://codereview.chromium.org/595543002/diff/1/src/gpu/GrLayerHoister.h#new...
src/gpu/GrLayerHoister.h:31: /** Find the layers in 'mainPicture' that need
hoisting. Note that the discovered
On 2014/09/23 14:57:35, bsalomon wrote:
> "topLevel", "root", or "base" seem clearer to me than "main"

Done. Went with topLevel.

[commit-bot: I haz the power, 2014-09-24 14:49:07]

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

[commit-bot: I haz the power, 2014-09-24 14:52:57]

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

[commit-bot: I haz the power, 2014-09-24 14:52:58]

Try jobs failed on following builders:
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-Clang-x86_64-Debug-Try...)
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Andr...)

[robertphillips, 2014-09-24 14:56:29]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-09-24 14:57:26]

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

[commit-bot: I haz the power, 2014-09-24 15:52:24]

Committed patchset #4 (id:60001) as 30d2cc6ff47cb7f981d83e9a536971beec920f61