Merge FontPlatformData::setupPaint and setupPaintForFont on Win

Merge FontPlatformData::setupPaint and setupPaintForFont on Win

We currently have two different setupPaint methods for the font
graphics code on windows, one used for drawing (setupPaintForFont)
and one used for metrics for the non-gdi code path (setupPaint).

This is silly and error prone, merge the two into
FontPlatformData::setupPaint.

BUG=249099
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=158352

[eae, 2013-09-25 16:26:31]

Never mind the linux_arm bot. Toggled the wrong one by mistake and this code is
windows-only.

[bungeman-chromium, 2013-09-25 17:01:03]

Mostly lgtm, with a question about adding another call to ensureFontLoaded.

https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
File Source/core/platform/graphics/skia/SkiaFontWin.cpp (right):

https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
Source/core/platform/graphics/skia/SkiaFontWin.cpp:170:
FontPlatformData::ensureFontLoaded(hfont);
Is there a reason for this? We don't need the font data loaded in order to
create the typeface.

[eae, 2013-09-25 17:05:27]

On 2013/09/25 17:01:03, bungeman2 wrote:
> Mostly lgtm, with a question about adding another call to ensureFontLoaded.
> 
>
https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
> File Source/core/platform/graphics/skia/SkiaFontWin.cpp (right):
> 
>
https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
> Source/core/platform/graphics/skia/SkiaFontWin.cpp:170:
> FontPlatformData::ensureFontLoaded(hfont);
> Is there a reason for this? We don't need the font data loaded in order to
> create the typeface.

Moved it from the HFONT version of the drawText method, the comment suggests it
might be needed for printing and I thought I'd be best to be conservative.

[bungeman-chromium, 2013-09-25 17:29:09]

On 2013/09/25 17:05:27, eae wrote:
> On 2013/09/25 17:01:03, bungeman2 wrote:
> > Mostly lgtm, with a question about adding another call to ensureFontLoaded.
> > 
> >
>
https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
> > File Source/core/platform/graphics/skia/SkiaFontWin.cpp (right):
> > 
> >
>
https://codereview.chromium.org/24422003/diff/11001/Source/core/platform/grap...
> > Source/core/platform/graphics/skia/SkiaFontWin.cpp:170:
> > FontPlatformData::ensureFontLoaded(hfont);
> > Is there a reason for this? We don't need the font data loaded in order to
> > create the typeface.
> 
> Moved it from the HFONT version of the drawText method, the comment suggests
it
> might be needed for printing and I thought I'd be best to be conservative.

Ah, now I see. Might as well leave it then I suppose. Still lgtm

[eae, 2013-09-25 17:53:12]

Thanks. Investigating the test failures now, looks like I might have broken
something in the GDI case.

[eae, 2013-09-25 18:24:52]

Need LGTM from full blink committer.

[Stephen White, 2013-09-25 20:39:38]

LGTM

[commit-bot: I haz the power, 2013-09-25 23:01:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eae@chromium.org/24422003/21001

[commit-bot: I haz the power, 2013-09-25 23:31:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eae@chromium.org/24422003/21001

[commit-bot: I haz the power, 2013-09-26 05:58:33]

Change committed as 158352