Merge FontPlatformData::setupPaint and setupPaintForFont on Win

Source/core/platform/graphics/chromium/UniscribeHelper.cpp

Index: Source/core/platform/graphics/chromium/UniscribeHelper.cpp
diff --git a/Source/core/platform/graphics/chromium/UniscribeHelper.cpp b/Source/core/platform/graphics/chromium/UniscribeHelper.cpp
index 1794a02a62d16047a06d7c98359c537bca51529a..8522d2b5e44b91f8ef15ba744e3f424ab0489503 100644
--- a/Source/core/platform/graphics/chromium/UniscribeHelper.cpp
+++ b/Source/core/platform/graphics/chromium/UniscribeHelper.cpp
@@ -324,10 +324,9 @@ int UniscribeHelper::xToCharacter(int x) const
     return 0;
 }
 
-void UniscribeHelper::draw(GraphicsContext* graphicsContext, HDC dc,
-                           int x, int y,
-                           const FloatRect& textRect,
-                           int from, int to)
+void UniscribeHelper::draw(GraphicsContext* graphicsContext,
+    const FontPlatformData& fontPlatformData, HDC dc, int x, int y,
+    const FloatRect& textRect, int from, int to)
 {
     HGDIOBJ oldFont = 0;
     int curX = x;
@@ -423,13 +422,14 @@ void UniscribeHelper::draw(GraphicsContext* graphicsContext, HDC dc,
                 origin.fX = curX + + innerOffset;
                 origin.fY = y + m_ascent;
                 paintSkiaText(graphicsContext,
-                              shaping.m_hfont,
-                              glyphCount,
-                              &shaping.m_glyphs[fromGlyph],
-                              advances,
-                              &shaping.m_offsets[fromGlyph],
-                              origin,
-                              textRect);
+                    fontPlatformData,
+                    shaping.m_hfont,
+                    glyphCount,
+                    &shaping.m_glyphs[fromGlyph],
+                    advances,
+                    &shaping.m_offsets[fromGlyph],
+                    origin,
+                    textRect);
                 textOutOk = true;
 
                 if (!textOutOk && 0 == executions) {