reland 5926 w/ fix in middle loop (thank you asserts)



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