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/



csulmone/skia,csulmone/skia,csulmone/skia,csulmone/skia