BUG= Review URL: https://codereview.chromium.org/18071007 git-svn-id: http://skia.googlecode.com/svn/trunk@10000 2bbb7eff-a529-9590-31e7-b0007b416f81
git-svn-id: http://skia.googlecode.com/svn/trunk@9986 2bbb7eff-a529-9590-31e7-b0007b416f81