relands https://codereview.chromium.org/310093003 with modifications. BUG=skia:2641 R=jcgregorio@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/313343003
This reverts commit f4666045f3. BUG=skia:2641 NOTREECHECKS=True NOTRY=True R=jcgregorio@google.com TBR=jcgregorio Author: epoger@google.com Review URL: https://codereview.chromium.org/317783004
f4666045f3
BUG=skia:553 R=borenet@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/310093003