Workaround to set the sRGB flag on SkImageGenerator

Workaround to set the sRGB flag on SkImageGenerator

BUG=skia:4895
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1820413002

Committed: https://skia.googlesource.com/skia/+/3ec5db42cc145fb11e352eca6474f91d7a4957e3

[msarett, 2016-03-22 20:09:39]

Description was changed from

==========
Workaround to set the sRGB flag on SkImageGenerator

BUG=skia:4895
==========

to

==========
Workaround to set the sRGB flag on SkImageGenerator

BUG=skia:4895
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[msarett, 2016-03-22 20:12:21]

msarett@google.com changed reviewers:
+ brianosman@google.com, reed@google.com, scroggo@google.com

[msarett, 2016-03-22 20:12:22]

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
File src/codec/SkCodecImageGenerator.cpp (right):

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:29: SkColorProfileType profileType =
(codec->getColorSpace()) ? kSRGB_SkColorProfileType :
Insert whatever hack here is most useful in the short term...

[scroggo, 2016-03-23 13:02:26]

lgtm

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
File src/codec/SkCodecImageGenerator.cpp (right):

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:21: //        format and request the an
output format.  For now, as a
the an -> an?

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:23: static SkImageInfo fix_info(SkCodec*
codec) {
I think this should be a const ref. You do not modify codec, and it looks like
it should never be null.

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:28: // Crudely guess that the presence of a
color space means sRGB.
I was going to suggest a FIXME here, but when SkImageInfo updates to have an
SkColorSpace instead of a ColorProfileType, we'll have to change this to
compile.

I'm guessing that the drawing code will first support sRGB, at which point we've
just moved this crude guess up stack.

[msarett, 2016-03-23 13:23:28]

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
File src/codec/SkCodecImageGenerator.cpp (right):

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:21: //        format and request the an
output format.  For now, as a
On 2016/03/23 13:02:26, scroggo wrote:
> the an -> an?

Done.

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:23: static SkImageInfo fix_info(SkCodec*
codec) {
On 2016/03/23 13:02:26, scroggo wrote:
> I think this should be a const ref. You do not modify codec, and it looks like
> it should never be null.

Done.

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:28: // Crudely guess that the presence of a
color space means sRGB.
On 2016/03/23 13:02:26, scroggo wrote:
> I was going to suggest a FIXME here, but when SkImageInfo updates to have an
> SkColorSpace instead of a ColorProfileType, we'll have to change this to
> compile.
> 
> I'm guessing that the drawing code will first support sRGB, at which point
we've
> just moved this crude guess up stack.

Acknowledged.  sgtm, I was counting on the FIXME above this function to apply
here anyway.

[scroggo, 2016-03-23 13:26:38]

LGTM patch set 2

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
File src/codec/SkCodecImageGenerator.cpp (right):

https://codereview.chromium.org/1820413002/diff/1/src/codec/SkCodecImageGener...
src/codec/SkCodecImageGenerator.cpp:28: // Crudely guess that the presence of a
color space means sRGB.
On 2016/03/23 13:23:28, msarett wrote:
> On 2016/03/23 13:02:26, scroggo wrote:
> > I was going to suggest a FIXME here, but when SkImageInfo updates to have an
> > SkColorSpace instead of a ColorProfileType, we'll have to change this to
> > compile.
> > 
> > I'm guessing that the drawing code will first support sRGB, at which point
> we've
> > just moved this crude guess up stack.
> 
> Acknowledged.  sgtm, I was counting on the FIXME above this function to apply
> here anyway.

Haha, touche.

[msarett, 2016-03-23 13:27:45]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-03-23 13:27:46]

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

[commit-bot: I haz the power, 2016-03-23 13:33:45]

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

[commit-bot: I haz the power, 2016-03-23 13:33:46]

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...)

[msarett, 2016-03-23 13:36:57]

The CQ bit was checked by msarett@google.com

[msarett, 2016-03-23 13:36:58]

The patchset sent to the CQ was uploaded after l-g-t-m from scroggo@google.com
Link to the patchset: https://codereview.chromium.org/1820413002/#ps40001
(title: "Fix jpeg")

[commit-bot: I haz the power, 2016-03-23 13:37:04]

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

[commit-bot: I haz the power, 2016-03-23 13:51:02]

Description was changed from

==========
Workaround to set the sRGB flag on SkImageGenerator

BUG=skia:4895
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Workaround to set the sRGB flag on SkImageGenerator

BUG=skia:4895
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/3ec5db42cc145fb11e352eca6474f91d7a4957e3
==========

[commit-bot: I haz the power, 2016-03-23 13:51:03]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/3ec5db42cc145fb11e352eca6474f91d7a4957e3