check for null-layer-paint after prev fix to savelayer ops

check for null-layer-paint after prev fix to savelayer ops

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2314073002

Committed: https://skia.googlesource.com/skia/+/6669010af4e6bd30bf05e256daae641dab7ac783

[reed1, 2016-09-06 15:55:21]

Description was changed from

==========
check for null-layer-paint after prev fix to savelayer ops

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

to

==========
check for null-layer-paint after prev fix to savelayer ops

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2314073002
==========

[reed1, 2016-09-06 15:55:26]

reed@google.com changed reviewers:
+ mtklein@google.com

[reed1, 2016-09-06 15:55:30]

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

[commit-bot: I haz the power, 2016-09-06 15:55:37]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[reed1, 2016-09-06 15:56:33]

The CQ bit was unchecked by reed@google.com

[reed1, 2016-09-06 15:57:32]

add the previously failed ASAN bot

[reed1, 2016-09-06 15:59:33]

reed@google.com changed reviewers:
+ caryclark@google.com

[mtklein, 2016-09-06 16:00:53]

https://codereview.chromium.org/2314073002/diff/1/src/core/SkRecordOpts.cpp
File src/core/SkRecordOpts.cpp (right):

https://codereview.chromium.org/2314073002/diff/1/src/core/SkRecordOpts.cpp#n...
src/core/SkRecordOpts.cpp:124: const uint32_t layerColor = layerPaint ?
layerPaint->getColor() : SK_ColorBLACK;
How about

if (layerPaint) {
  SkColor layerColor = layerPaint->getColor();
  // The layer paint color must have only alpha component.
  if (SK_ColorTRANSPARENT != SkColorSetA(layerColor, SK_AlphaTRANSPARENT)) {
    return false;
  }

  // The layer paint can not have any effects.
  if (layerPaint->getPathEffect() || ... ) {
    return false;
  }

  paint->setAlpha(SkMulDiv255Round(paint->getAlpha(), SkColorGetA(layerColor)));
}

return true;

[reed1, 2016-09-06 16:49:44]

https://codereview.chromium.org/2314073002/diff/1/src/core/SkRecordOpts.cpp
File src/core/SkRecordOpts.cpp (right):

https://codereview.chromium.org/2314073002/diff/1/src/core/SkRecordOpts.cpp#n...
src/core/SkRecordOpts.cpp:124: const uint32_t layerColor = layerPaint ?
layerPaint->getColor() : SK_ColorBLACK;
On 2016/09/06 16:00:53, mtklein wrote:
> How about
> 
> if (layerPaint) {
>   SkColor layerColor = layerPaint->getColor();
>   // The layer paint color must have only alpha component.
>   if (SK_ColorTRANSPARENT != SkColorSetA(layerColor, SK_AlphaTRANSPARENT)) {
>     return false;
>   }
> 
>   // The layer paint can not have any effects.
>   if (layerPaint->getPathEffect() || ... ) {
>     return false;
>   }
> 
>   paint->setAlpha(SkMulDiv255Round(paint->getAlpha(),
SkColorGetA(layerColor)));
> }
> 
> return true;

Done.

[reed1, 2016-09-06 16:49:49]

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

[commit-bot: I haz the power, 2016-09-06 16:49:58]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[reed1, 2016-09-06 16:50:28]

The CQ bit was unchecked by reed@google.com

[reed1, 2016-09-06 16:50:32]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2016-09-06 16:50:40]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-06 16:50: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 2016-09-06 22:50 UTC

[mtklein, 2016-09-06 16:52:32]

lgtm

[commit-bot: I haz the power, 2016-09-06 17:16:49]

Description was changed from

==========
check for null-layer-paint after prev fix to savelayer ops

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2314073002
==========

to

==========
check for null-layer-paint after prev fix to savelayer ops

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2314073002

Committed:
https://skia.googlesource.com/skia/+/6669010af4e6bd30bf05e256daae641dab7ac783
==========

[commit-bot: I haz the power, 2016-09-06 17:16:50]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/6669010af4e6bd30bf05e256daae641dab7ac783