Re-land r8269, fixing build errors/warnings

Re-land r8269, fixing build errors/warnings
Committed: https://code.google.com/p/skia/source/detail?r=8290

[epoger, 2013-03-20 21:18:41]

first set of trybots:
tools/submit_try pdf --bot Skia_Linux_NoGPU_Debug_32 Skia_Mac_Float_Debug_32 -r
8273

if those succeed:
tools/submit_try pdf --bot Skia_ChromeOS_Alex_Debug_32
Skia_MacMiniLion_Float_Release_32 Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64
Skia_Shuttle_Win7_Intel_Float_Debug_32 -r 8273

[epoger, 2013-03-20 21:20:45]

On 2013/03/20 21:18:41, epoger wrote:
> first set of trybots:
> tools/submit_try pdf --bot Skia_Linux_NoGPU_Debug_32 Skia_Mac_Float_Debug_32
-r
> 8273
> 
> if those succeed:
> tools/submit_try pdf --bot Skia_ChromeOS_Alex_Debug_32
> Skia_MacMiniLion_Float_Release_32 Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64
> Skia_Shuttle_Win7_Intel_Float_Debug_32 -r 8273

Oops, I had the wrong changelist name in those command lines.  Should have read:

first set of trybots:
tools/submit_try reland --bot Skia_Linux_NoGPU_Debug_32 Skia_Mac_Float_Debug_32
-r 8273

if those succeed:
tools/submit_try reland --bot Skia_ChromeOS_Alex_Debug_32
Skia_MacMiniLion_Float_Release_32 Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64
Skia_Shuttle_Win7_Intel_Float_Debug_32 -r 8273

[epoger, 2013-03-20 21:37:27]

So far, 2 of the trybots have made it through the BuildGM step ok... so I think
this is ready for review.

I suggest you just look at the changes in patchset 2--patchset 1 was just a raw
reland of r8269 (didn't change anything at all)

[scroggo, 2013-03-20 21:44:07]

lgtm

[epoger, 2013-03-21 13:50:02]

Committed patchset #3 manually as r8290 (presubmit successful).