tree ba1331e8a286f020978061f7e48b766078122c44
parent 97f57a6c4f649710a1d9f25a52e5c80ba51eef6a
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1365012039 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1365012039 +0000

re-land r8514 without breaking 32-bit Mac compilers
Review URL: https://codereview.chromium.org/13427004

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