Index: Source/platform/fonts/win/SkiaFontWin.cpp |
diff --git a/Source/platform/fonts/win/SkiaFontWin.cpp b/Source/platform/fonts/win/SkiaFontWin.cpp |
index faae245fc949c86281e1fcf2d020e2da9af95228..9b0f48aa6abd68e00ebd7bdd2d0293e0b165b649 100644 |
--- a/Source/platform/fonts/win/SkiaFontWin.cpp |
+++ b/Source/platform/fonts/win/SkiaFontWin.cpp |
@@ -83,9 +83,8 @@ static void skiaDrawText(GraphicsContext* context, |
} |
} |
-static void paintSkiaText(GraphicsContext* context, |
+void paintSkiaText(GraphicsContext* context, |
const FontPlatformData& data, |
- SkTypeface* face, float size, uint32_t textFlags, |
unsigned numGlyphs, |
const WORD* glyphs, |
const int* advances, |
@@ -101,11 +100,6 @@ static void paintSkiaText(GraphicsContext* context, |
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 HFONT code path is removed. |
- paint.setTypeface(face); |
- |
bool didFill = false; |
if ((textMode & TextModeFill) && (SkColorGetA(paint.getColor()) || paint.getLooper())) { |
@@ -122,7 +116,6 @@ static void paintSkiaText(GraphicsContext* context, |
context->setupPaintForStroking(&paint); |
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); |
data.setupPaint(&paint, context); |
- paint.setTypeface(face); |
if (didFill) { |
// If there is a shadow and we filled above, there will already be |
@@ -141,19 +134,4 @@ static void paintSkiaText(GraphicsContext* context, |
} |
} |
-/////////////////////////////////////////////////////////////////////////////////////////// |
- |
-void paintSkiaText(GraphicsContext* context, |
- const FontPlatformData& data, |
- unsigned numGlyphs, |
- const WORD* glyphs, |
- const int* advances, |
- const GOFFSET* offsets, |
- const SkPoint& origin, |
- const SkRect& textRect) |
-{ |
- paintSkiaText(context, data, data.typeface(), data.size(), data.paintTextFlags(), |
- numGlyphs, glyphs, advances, offsets, origin, textRect); |
-} |
- |
} // namespace WebCore |