BUG= R=bsalomon@google.com Review URL: https://codereview.chromium.org/15602003 git-svn-id: http://skia.googlecode.com/svn/trunk@9229 2bbb7eff-a529-9590-31e7-b0007b416f81