Merge FontPlatformData::setupPaint and setupPaintForFont on Win

Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.h

 /*
  * 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 41 matching lines @@
 
 typedef struct HFONT__ *HFONT;
 
 namespace WebCore {
 
 // Return a typeface associated with the hfont, and return its size and
 // lfQuality from the hfont's LOGFONT.
 PassRefPtr<SkTypeface> CreateTypefaceFromHFont(HFONT, int* size, int* paintTextFlags);
 
 class FontDescription;
+class GraphicsContext;
 
 class FontPlatformData {
 public:
     // Used for deleted values in the font cache's hash tables. The hash table
     // will create us with this structure, and it will compare other values
     // to this "Deleted" one. It expects the Deleted one to be differentiable
     // from the NULL one (created with the empty constructor), so we can't just
     // set everything to NULL.
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
     // This constructor takes ownership of the HFONT
     FontPlatformData(HFONT, float size, FontOrientation);
     FontPlatformData(float size, bool bold, bool oblique);
     FontPlatformData(const FontPlatformData&);
     FontPlatformData(const FontPlatformData&, float textSize);
     FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal);
 
-#if !ENABLE(GDI_FONTS_ON_WINDOWS)
-    void setupPaint(SkPaint*) const;
-#endif
+    void setupPaint(SkPaint*, GraphicsContext* = 0) const;
 
     FontPlatformData& operator=(const FontPlatformData&);
 
     bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
 
     ~FontPlatformData();
 
     bool isFixedPitch() const;
     HFONT hfont() const { return m_font ? m_font->hfont() : 0; }
     float size() const { return m_size; }
@@ skipping 72 matching lines @@
 
     mutable SCRIPT_CACHE m_scriptCache;
     mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties;
 
     bool m_isHashTableDeletedValue;
 };
 
 } // WebCore
 
 #endif // FontPlatformDataChromiumWin_h