Relanding 7914



git-svn-id: http://skia.googlecode.com/svn/trunk@7940 2bbb7eff-a529-9590-31e7-b0007b416f81
4 files changed