Clean up SkFontHost_mac_coretext.

Clean up SkFontHost_mac_coretext.

Depends on https://codereview.appspot.com/6850075/ .

[bungeman, 2012-12-04 20:44:49]

Now that most of what was in Patch Set 1 has been split out into reviews
6855113, 6849117, and 6844105, this is the remaining whitespace / formatting
change. I considered 'the' prepending variable names to be whitespace. There are
also a few places where a variables type is changed to CFIndex or CGFloat to
prevent a few warnings when compiling for 64bit.

[caryclark1, 2012-12-04 21:17:40]

It isn't clear to me that these are strictly formatting changes. For example,
changing float to CGFloat makes what was formerly float double some of the time.

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
File src/ports/SkFontHost_mac_coretext.cpp (right):

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:316: gSupportsLCD = ((r != g) || (r !=
b));
why the extra parentheses? Why any parentheses?

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:1231: CGFloat scaleY = 1;
Since these are passed to SkFloatToScalar, they shouldn't be CGFloat. My guess
is "float" is the best choice.

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:1275: m.setScale(SkFloatToScalar(1 /
scaleX), SkFloatToScalar(1 / scaleY));
Or, these calls should be CGToScalar

[bungeman, 2012-12-04 22:00:18]

This should make the non-formatting parts of this change cleaner.

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
File src/ports/SkFontHost_mac_coretext.cpp (right):

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:316: gSupportsLCD = ((r != g) || (r !=
b));
On 2012/12/04 21:17:40, caryclark1 wrote:
> why the extra parentheses? Why any parentheses?

Because three precedence levels are involved and my eye always gets stuck to the
left of the ||. I suppose this might be too many parentheses, I really just
wanted the outer set so that it would scan easier and got carried away.

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:1231: CGFloat scaleY = 1;
On 2012/12/04 21:17:40, caryclark1 wrote:
> Since these are passed to SkFloatToScalar, they shouldn't be CGFloat. My guess
> is "float" is the best choice.

Making them 'float' seems odd because we're using them with CGFloats (in
MatrixToCGAffineTransform) and with SkScalars. If we're willing to change
MatrixToCGAffineTransform to do the multiply before the conversion to CGFloat
(easier now that we don't support fixed point) then they're always being treated
as SkScalar. Will make this change.

https://codereview.appspot.com/6843087/diff/7001/src/ports/SkFontHost_mac_cor...
src/ports/SkFontHost_mac_coretext.cpp:1275: m.setScale(SkFloatToScalar(1 /
scaleX), SkFloatToScalar(1 / scaleY));
On 2012/12/04 21:17:40, caryclark1 wrote:
> Or, these calls should be CGToScalar

Changed to SkScalar and used SkScalarInvert.

[caryclark1, 2012-12-05 12:44:24]

lgtm

[bungeman, 2012-12-05 19:29:48]

Committed revision 6676.