Cleanup conversion that the new NDK compiler tries to over optimize.

Cleanup conversion that the new NDK compiler tries to over optimize.

This allows us to upgrade to NDK r10c as the dftext gm no longer fails
when compiled with -O2.

Committed: https://skia.googlesource.com/skia/+/058f01eb688dfabf5ebc89348872f4eebb9c173a

[djsollen, 2014-10-30 16:24:53]

djsollen@google.com changed reviewers:
+ jvanverth@google.com, reed@google.com

[jvanverth1, 2014-10-30 16:37:16]

We missed one:

https://codereview.chromium.org/690053002/diff/1/src/gpu/GrDistanceFieldTextC...
File src/gpu/GrDistanceFieldTextContext.cpp (right):

https://codereview.chromium.org/690053002/diff/1/src/gpu/GrDistanceFieldTextC...
src/gpu/GrDistanceFieldTextContext.cpp:345: if
(!this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
There is another call to appendGlyph here.

[djsollen, 2014-10-30 16:52:11]

ok, the second patch set fixes that call site as well.

[jvanverth1, 2014-10-30 17:04:18]

lgtm

[djsollen, 2014-10-30 17:10:11]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-10-30 17:10:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/690053002/20001

[commit-bot: I haz the power, 2014-10-30 18:54:45]

Committed patchset #2 (id:20001) as 058f01eb688dfabf5ebc89348872f4eebb9c173a