Merge FontPlatformData::setupPaint and setupPaintForFont on Win

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

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 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.
@@ skipping 159 matching lines @@
     // If the text is RTL, left will actually be after right.
     if (left < right)
         return FloatRect(left, point.y(),
                        right - left, static_cast<float>(h));
 
     return FloatRect(right, point.y(),
                      left - right, static_cast<float>(h));
 }
 
 void Font::drawComplexText(GraphicsContext* graphicsContext,
-                           const TextRunPaintInfo& runInfo,
-                           const FloatPoint& point) const
+    const TextRunPaintInfo& runInfo,
+    const FloatPoint& point) const
 {
     UniscribeHelperTextRun state(runInfo.run, *this);
 
     SkColor color = graphicsContext->effectiveFillColor();
     unsigned char alpha = SkColorGetA(color);
     // Skip 100% transparent text; no need to draw anything.
     if (!alpha && graphicsContext->strokeStyle() == NoStroke)
         return;
 
     HDC hdc = 0;
     // Uniscribe counts the coordinates from the upper left, while WebKit uses
     // the baseline, so we have to subtract off the ascent.
-    state.draw(graphicsContext, hdc, lroundf(point.x()), lroundf(point.y() - fontMetrics().ascent()), runInfo.bounds, runInfo.from, runInfo.to);
+    state.draw(graphicsContext, primaryFont()->platformData(), hdc, lroundf(point.x()), lroundf(point.y() - fontMetrics().ascent()), runInfo.bounds, runInfo.from, runInfo.to);
 }
 
 void Font::drawEmphasisMarksForComplexText(GraphicsContext* /* context */, const TextRunPaintInfo& /* runInfo */, const AtomicString& /* mark */, const FloatPoint& /* point */) const
 {
     notImplemented();
 }
 
 float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>* /* fallbackFonts */, GlyphOverflow* /* glyphOverflow */) const
 {
     UniscribeHelperTextRun state(run, *this);
@@ skipping 13 matching lines @@
     int charIndex = state.xToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (charIndex < 0)
         charIndex = 0;
     return charIndex;
 }
 
 } // namespace WebCore