BUG=skia:3735 Review URL: https://codereview.chromium.org/1097433002
BUG=chromium:473156 Review URL: https://codereview.chromium.org/1089063002