Review URL: https://codereview.chromium.org/1271023002
BUG=skia: TBR= Review URL: https://codereview.chromium.org/818153002