revert 8731, restoring 8700 and 8701... further investigation concluded that the
original changes were correct. The failures in DRT will be rebaselined.



git-svn-id: http://skia.googlecode.com/svn/trunk@8742 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed