Revert the revert of 11247, 11250, 11251 and 11279 (Chrome already relies on changes in r11247)



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