Use SkImageCacherator in SkImages

Use SkImageCacherator in SkImages

Possible follow-up changes to consider

1. Roll SkImage_Raster and _Gpu into _Generator, where the generator (or cacherator) is backed by a pre-existing texture or raster.
2. Evolve SkImageUsageType into a verb requiring stretching, and have the caller (common code) digest the caps() and usage, so that subclasses are just told what to do (stretch or not)
3. Common code/utility to convert an unstretched texture into a stretch one (and cache it) if the generator can only make an unstretched one.


BUG=skia:

Committed: https://skia.googlesource.com/skia/+/85d9178832f4a64c9d80ffb14cb9dab4fe0fa54a

[reed1, 2015-08-13 22:15:12]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-08-13 22:15:21]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/40001

[reed1, 2015-08-13 22:15:42]

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

[reed1, 2015-08-13 22:16:01]

The CQ bit was unchecked by reed@google.com

[reed1, 2015-08-18 19:11:32]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-08-18 19:11:41]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/60001

[commit-bot: I haz the power, 2015-08-18 19:14:12]

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

[commit-bot: I haz the power, 2015-08-18 19:14:13]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[reed1, 2015-08-19 21:22:34]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-08-19 21:22:50]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/100001

[reed1, 2015-08-19 21:25:07]

almost ready for review -- will write a gm to test the shader-from-image (which
is not ever tested from lazy images yet)

[reed1, 2015-08-19 21:25:13]

The CQ bit was unchecked by reed@google.com

[reed1, 2015-08-20 20:58:59]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-08-20 20:59:12]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/120001

[commit-bot: I haz the power, 2015-08-20 21:08:11]

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

[commit-bot: I haz the power, 2015-08-20 21:08:11]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[reed1, 2015-08-21 19:38:19]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-08-21 19:38:38]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/140001

[commit-bot: I haz the power, 2015-08-21 19:45:35]

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

[commit-bot: I haz the power, 2015-08-21 19:45:35]

Dry run: This issue passed the CQ dry run.

[reed1, 2015-08-21 21:02:31]

reed@google.com changed reviewers:
+ fmalita@chromium.org

[reed1, 2015-08-21 21:02:32]

ptal

[bsalomon, 2015-08-24 13:42:08]

lgtm

https://codereview.chromium.org/1282363002/diff/140001/src/image/SkImage_Gene...
File src/image/SkImage_Generator.cpp (right):

https://codereview.chromium.org/1282363002/diff/140001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:13: //#include "SkImageGeneratorPriv.h"
what this?

[reed1, 2015-08-24 14:05:04]

https://codereview.chromium.org/1282363002/diff/140001/src/image/SkImage_Gene...
File src/image/SkImage_Generator.cpp (right):

https://codereview.chromium.org/1282363002/diff/140001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:13: //#include "SkImageGeneratorPriv.h"
On 2015/08/24 13:42:08, bsalomon wrote:
> what this?

cruft, gone.

[reed1, 2015-08-24 14:15:57]

Will investigate some diffs (probably related to YUV conversion between CPU and
GPU) before I try to land.

[reed1, 2015-09-09 14:00:17]

Down to 15 differences, and now believe these are due to SW -vs- HW
yuv-conversion. The old code-path would abort trying to perform the yuv in HW if
the image was subsetted. The new code path converts first and then draws the
subset.

ptal

Will land with a guard, so skia can bake the new bahavior, and we can preflight
any layouttest rebaselines before they happen.

[reed1, 2015-09-09 14:34:01]

The CQ bit was checked by reed@google.com

[reed1, 2015-09-09 14:34:02]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/1282363002/#ps280001
(title: "add guard for Chrome")

[commit-bot: I haz the power, 2015-09-09 14:34:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/280001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/280001

[commit-bot: I haz the power, 2015-09-09 14:35:09]

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

[commit-bot: I haz the power, 2015-09-09 14:35:10]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[bsalomon, 2015-09-09 14:38:06]

My only concern is the large image (but not larger than max texture size) case
and losing the tiling.

[reed1, 2015-09-09 14:41:52]

On 2015/09/09 14:38:06, bsalomon wrote:
> My only concern is the large image (but not larger than max texture size) case
> and losing the tiling.

I think in that case, the new code-path will fail to make a native texture or
yuv-texture, and fall back to a raster which you will tile/upload.

Do we have a GM that exercises this sort of thing, so I can augment it to test a
generator?

[reed1, 2015-09-09 14:41:55]

The CQ bit was checked by reed@google.com

[reed1, 2015-09-09 14:41:56]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/1282363002/#ps300001
(title: "fix no-gpu build")

[commit-bot: I haz the power, 2015-09-09 14:42:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/300001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/300001

[reed1, 2015-09-09 14:42:25]

The CQ bit was unchecked by reed@google.com

[reed1, 2015-09-10 16:08:18]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-09-10 16:08:27]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/340001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/340001

[commit-bot: I haz the power, 2015-09-10 16:13:50]

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

[commit-bot: I haz the power, 2015-09-10 16:13:51]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2015-09-10 16:19:38]

lgtm

[robertphillips, 2015-09-10 17:33:30]

lgtm + nits

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
File src/image/SkImage_Generator.cpp (right):

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:9: #include "SkBitmap.h"
Do we need SkCanvas.h ?

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:10: #include "SkCanvas.h"
Do we need SkColorTable.h ?

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:48: SkShader*
SkImage_Generator::onNewShader(SkShader::TileMode tileX, SkShader::TileMode
tileY,
line this up ?

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:49: const SkMatrix* localMatrix) const {
so we can _____ native textures ?

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Rast...
File src/image/SkImage_Raster.cpp (right):

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Rast...
src/image/SkImage_Raster.cpp:294: return nullptr;
indent issues

[reed1, 2015-09-10 21:21:32]

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
File src/image/SkImage_Generator.cpp (right):

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:9: #include "SkBitmap.h"
On 2015/09/10 17:33:30, robertphillips wrote:
> Do we need SkCanvas.h ?

Done.

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:10: #include "SkCanvas.h"
On 2015/09/10 17:33:30, robertphillips wrote:
> Do we need SkColorTable.h ?

Done.

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:48: SkShader*
SkImage_Generator::onNewShader(SkShader::TileMode tileX, SkShader::TileMode
tileY,
On 2015/09/10 17:33:30, robertphillips wrote:
> line this up ?

Done.

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Gene...
src/image/SkImage_Generator.cpp:49: const SkMatrix* localMatrix) const {
On 2015/09/10 17:33:30, robertphillips wrote:
> so we can _____ native textures ?

Done.

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Rast...
File src/image/SkImage_Raster.cpp (right):

https://codereview.chromium.org/1282363002/diff/340001/src/image/SkImage_Rast...
src/image/SkImage_Raster.cpp:294: return nullptr;
On 2015/09/10 17:33:30, robertphillips wrote:
> indent issues

Done.

[reed1, 2015-09-10 21:21:42]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-09-10 21:21:59]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/360001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/360001

[commit-bot: I haz the power, 2015-09-10 21:30:46]

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

[commit-bot: I haz the power, 2015-09-10 21:30:48]

Dry run: This issue passed the CQ dry run.

[reed1, 2015-09-10 21:32:29]

The CQ bit was checked by reed@google.com

[reed1, 2015-09-10 21:32:30]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1282363002/#ps360001
(title: "fix rob comments")

[commit-bot: I haz the power, 2015-09-10 21:32:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1282363002/360001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1282363002/360001

[commit-bot: I haz the power, 2015-09-10 21:33:42]

Committed patchset #19 (id:360001) as
https://skia.googlesource.com/skia/+/85d9178832f4a64c9d80ffb14cb9dab4fe0fa54a