Merge FontPlatformData::setupPaint and setupPaintForFont on Win

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

 /*
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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 306 matching lines @@
 
         // The offset is beyond this item, account for its length and move on.
         x -= itemAdvance;
     }
 
     // Error condition, we don't know what to do if we don't have that X
     // position in any of our items.
     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;
     bool firstRun = true;
 
     for (size_t screenIndex = 0; screenIndex < m_runs.size(); screenIndex++) {
         int itemIndex = m_screenOrder[screenIndex];
         const SCRIPT_ITEM& item = m_runs[itemIndex];
         const Shaping& shaping = m_shapes[itemIndex];
 
@@ skipping 75 matching lines @@
 
             // Fonts with different ascents can be used to render different
             // runs.  'Across-runs' y-coordinate correction needs to be
             // adjusted for each font.
             bool textOutOk = false;
             for (int executions = 0; executions < 2; ++executions) {
                 SkPoint origin;
                 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) {
                     // If TextOut is called from the renderer it might fail
                     // because the sandbox is preventing it from opening the
                     // font files.  If we are running in the renderer,
                     // TryToPreloadFont is overridden to ask the browser to
                     // preload the font for us so we can access it.
                     tryToPreloadFont(shaping.m_hfont);
                     continue;
@@ skipping 618 matching lines @@
     m_featureRecords.resize(featureSettings->size());
     for (unsigned i = 0; i < featureSettings->size(); ++i) {
         m_featureRecords[i].lParameter = featureSettings->at(i).value();
         m_featureRecords[i].tagFeature = convertFeatureTag(featureSettings->at(i).tag());
     }
     m_rangeProperties.potfRecords = &m_featureRecords[0];
     m_rangeProperties.cotfRecords = m_featureRecords.size();
 }
 
 }  // namespace WebCore