tree aeef8aa338e315c71e75d7e45f0dc970ef1111ed
parent cb3f50468dcd6e838628b425828b8f4386a48109
author mtklein <mtklein@chromium.org> 1422930363 -0800
committer Commit bot <commit-bot@chromium.org> 1422930363 -0800

patch from issue 886233004 at patchset 40001 (http://crrev.com/886233004#ps40001)

... with changes proposed in the review.

BUG=skia:

Review URL: https://codereview.chromium.org/894013002