Have all skia platforms share FontPlatformData::hash() implementation

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

Index: Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
diff --git a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
index 58524d85ad1aa6b7e46d659d5651478706c5c720..edb934f6fd42983277a8874ea30f77b4b73f11b8 100644
--- a/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
+++ b/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
@@ -53,8 +53,8 @@ namespace WebCore {
 
 void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context) const
 {
-    const float ts = m_size >= 0 ? m_size : 12;
-    paint->setTextSize(SkFloatToScalar(m_size));
+    const float ts = m_textSize >= 0 ? m_textSize : 12;
+    paint->setTextSize(SkFloatToScalar(m_textSize));
     paint->setTypeface(typeface());
     paint->setFakeBoldText(m_fakeBold);
     paint->setTextSkewX(m_fakeItalic ? -SK_Scalar1 / 4 : 0);
@@ -169,7 +169,7 @@ PassRefPtr<SkTypeface> CreateTypefaceFromHFont(HFONT hfont, int* size, int* pain
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
     : m_font(0)
-    , m_size(-1)
+    , m_textSize(-1)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
@@ -182,7 +182,7 @@ FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
 
 FontPlatformData::FontPlatformData()
     : m_font(0)
-    , m_size(0)
+    , m_textSize(0)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
@@ -195,7 +195,7 @@ FontPlatformData::FontPlatformData()
 
 FontPlatformData::FontPlatformData(HFONT font, float size, FontOrientation orientation)
     : m_font(RefCountedHFONT::create(font))
-    , m_size(size)
+    , m_textSize(size)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(orientation)
@@ -208,7 +208,7 @@ FontPlatformData::FontPlatformData(HFONT font, float size, FontOrientation orien
 // FIXME: this constructor is needed for SVG fonts but doesn't seem to do much
 FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
     : m_font(0)
-    , m_size(size)
+    , m_textSize(size)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
@@ -221,7 +221,7 @@ FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
 
 FontPlatformData::FontPlatformData(const FontPlatformData& data)
     : m_font(data.m_font)
-    , m_size(data.m_size)
+    , m_textSize(data.m_textSize)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(data.m_orientation)
@@ -234,7 +234,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& data)
 
 FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
     : m_font(data.m_font)
-    , m_size(textSize)
+    , m_textSize(textSize)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(data.m_orientation)
@@ -247,7 +247,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
 
 FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
     : m_font(0)
-    , m_size(textSize)
+    , m_textSize(textSize)
     , m_fakeBold(fakeBold)
     , m_fakeItalic(fakeItalic)
     , m_orientation(orientation)
@@ -270,7 +270,7 @@ FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
 {
     if (this != &data) {
         m_font = data.m_font;
-        m_size = data.m_size;
+        m_textSize = data.m_textSize;
         m_fakeBold = data.m_fakeBold;
         m_fakeItalic = data.m_fakeItalic;
         m_orientation = data.m_orientation;