Update SkiaFontWin::paintSkiaText to override typeface for HFONT

Source/core/platform/graphics/skia/SkiaFontWin.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 87 matching lines @@
     TextDrawingModeFlags textMode = context->textDrawingMode();
 
     // Filling (if necessary). This is the common case.
     SkPaint paint;
     context->setupPaintForFilling(&paint);
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     data.setupPaint(&paint, context);
 
     // FIXME: Only needed to support the HFONT based paintSkiaText
     // version where a new typeface is created from the HFONT.
-    // As such it can go away once the direct-GDI code path is removed.
-#if ENABLE(GDI_FONTS_ON_WINDOWS)
+    // As such it can go away once the HFONT code path is removed.
     paint.setTypeface(face);
-#endif
 
     bool didFill = false;
 
     if ((textMode & TextModeFill) && (SkColorGetA(paint.getColor()) || paint.getLooper())) {
         skiaDrawText(context, origin, textRect, &paint, &glyphs[0], &advances[0], &offsets[0], numGlyphs);
         didFill = true;
     }
 
     // Stroking on top (if necessary).
     if ((textMode & TextModeStroke)
         && context->strokeStyle() != NoStroke
         && context->strokeThickness() > 0) {
 
         paint.reset();
         context->setupPaintForStroking(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
         data.setupPaint(&paint, context);
-#if ENABLE(GDI_FONTS_ON_WINDOWS)
         paint.setTypeface(face);
-#endif
 
         if (didFill) {
             // If there is a shadow and we filled above, there will already be
             // a shadow. We don't want to draw it again or it will be too dark
             // and it will go on top of the fill.
             //
             // Note that this isn't strictly correct, since the stroke could be
             // very thick and the shadow wouldn't account for this. The "right"
             // thing would be to draw to a new layer and then draw that layer
             // with a shadow. But this is a lot of extra work for something
@@ skipping 35 matching lines @@
 
     // Ensure font load for printing, because PDF device needs it.
     if (context->isPrintingDevice())
         FontPlatformData::ensureFontLoaded(hfont);
 
     RefPtr<SkTypeface> face = CreateTypefaceFromHFont(hfont, &size, &paintTextFlags);
     paintSkiaText(context, data, face.get(), size, paintTextFlags, numGlyphs, glyphs, advances, offsets, origin, textRect);
 }
 
 }  // namespace WebCore