cherrypick rev 11013 into branch m30_1599 to fix http://crbug.com/286073

git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/include@11195 2bbb7eff-a529-9590-31e7-b0007b416f81
2 files changed