Cherrypick r12846 into m33_1750 for http://crbug.com/330293

git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/src@12963 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed