Partial re-delivery of Linux compiler complaint changes. Was originally delivered as r3428 but was backed out due to pixel diffs on Mac mini.
Partial re-delivery of Linux compiler complaint changes.
Was originally delivered as r3428 but was backed out due to pixel diffs on Mac mini.

http://codereview.appspot.com/5845068/



git-svn-id: e8541e15acce502a64c929015570ad1648e548cd@3447 2bbb7eff-a529-9590-31e7-b0007b416f81

Cue/skia,mrobinson/skia,metajack/skia,mrobinson/skia,mrobinson/skia,Cue/skia,metajack/skia,mrobinson/skia,Cue/skia,metajack/skia,mrobinson/skia,metajack/skia,Cue/skia