cherrypick changes into branch m33_1750 to fix http://crbug.com/329254

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