BUG=skia: Review URL: https://codereview.chromium.org/894083003
BUG=skia: Review URL: https://codereview.chromium.org/888283002
BUG=skia: TBR= Review URL: https://codereview.chromium.org/888663002