Roll src/third_party/skia/ 5d04fda87..c4ed68426 (2 commits).

Roll src/third_party/skia/ 5d04fda87..c4ed68426 (2 commits).

https://chromium.googlesource.com/skia.git/+log/5d04fda87747..c4ed68426649

$ git log 5d04fda87..c4ed68426 --date=short --no-merges --format='%ad %ae %s'
2016-05-24 robertphillips Don't store resources with a unique key in GrResourceCache's fScratchMap
2016-05-24 bsalomon Make Sk32ToBool inline again to silence compiler warning. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2007753003

BUG=603969
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=kjlubick@google.com

Committed: https://crrev.com/1ccc328e95809a94e7c065e9427cd5d475ec541d
Cr-Commit-Position: refs/heads/master@{#395778}

[skia-deps-roller, 2016-05-25 00:11:33]

The CQ bit was checked by skia-deps-roller@chromium.org

[commit-bot: I haz the power, 2016-05-25 00:11:58]

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

[commit-bot: I haz the power, 2016-05-25 02:08:51]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-05-25 02:10:24]

Description was changed from

==========
Roll src/third_party/skia/ 5d04fda87..c4ed68426 (2 commits).

https://chromium.googlesource.com/skia.git/+log/5d04fda87747..c4ed68426649

$ git log 5d04fda87..c4ed68426 --date=short --no-merges --format='%ad %ae %s'
2016-05-24 robertphillips Don't store resources with a unique key in
GrResourceCache's fScratchMap
2016-05-24 bsalomon Make Sk32ToBool inline again to silence compiler warning.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2007753003

BUG=603969


CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=kjlubick@google.com
==========

to

==========
Roll src/third_party/skia/ 5d04fda87..c4ed68426 (2 commits).

https://chromium.googlesource.com/skia.git/+log/5d04fda87747..c4ed68426649

$ git log 5d04fda87..c4ed68426 --date=short --no-merges --format='%ad %ae %s'
2016-05-24 robertphillips Don't store resources with a unique key in
GrResourceCache's fScratchMap
2016-05-24 bsalomon Make Sk32ToBool inline again to silence compiler warning.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2007753003

BUG=603969

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=kjlubick@google.com

Committed: https://crrev.com/1ccc328e95809a94e7c065e9427cd5d475ec541d
Cr-Commit-Position: refs/heads/master@{#395778}
==========

[commit-bot: I haz the power, 2016-05-25 02:10:24]

Patchset 1 (id:??) landed as
https://crrev.com/1ccc328e95809a94e7c065e9427cd5d475ec541d
Cr-Commit-Position: refs/heads/master@{#395778}