Reverting r12427

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