BUG=skia:2889 Review URL: https://codereview.chromium.org/815833004
TBR=robertphillips@google.com Review URL: https://codereview.chromium.org/718493002
R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/510053003