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

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 69 matching lines @@
     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; }
+    float size() const { return m_textSize; }
     SkTypeface* typeface() const { return m_typeface.get(); }
     int paintTextFlags() const { return m_paintTextFlags; }
 
     String fontFamilyName() const;
 
     FontOrientation orientation() const { return m_orientation; }
     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
 
+#if ENABLE(GDI_FONTS_ON_WINDOWS)
     unsigned hash() const
     {
         return m_font ? m_font->hash() : NULL;
     }
+#else
+    unsigned hash() const;
+#endif
 
     bool operator==(const FontPlatformData& other) const
     {
-        return m_font == other.m_font && m_size == other.m_size && m_fakeBold == other.m_fakeBold && m_fakeItalic == other.m_fakeItalic && m_orientation == other.m_orientation;
+        return m_font == other.m_font && m_textSize == other.m_textSize && m_fakeBold == other.m_fakeBold && m_fakeItalic == other.m_fakeItalic && m_orientation == other.m_orientation;
     }
 
 #if ENABLE(OPENTYPE_VERTICAL)
     PassRefPtr<OpenTypeVerticalData> verticalData() const;
     PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
 #endif
 
 #ifndef NDEBUG
     String description() const;
 #endif
@@ skipping 31 matching lines @@
         // The create() function assumes there is already a refcount of one
         // so it can do adoptRef.
         RefCountedHFONT(HFONT hfont) : m_hfont(hfont)
         {
         }
 
         HFONT m_hfont;
     };
 
     RefPtr<RefCountedHFONT> m_font;
-    float m_size;  // Point size of the font in pixels.
+    float m_textSize; // Point size of the font in pixels.
     FontOrientation m_orientation;
     bool m_fakeBold;
     bool m_fakeItalic;
 
     RefPtr<SkTypeface> m_typeface; // cached from m_font
     int m_paintTextFlags; // cached from m_font
 
     mutable SCRIPT_CACHE m_scriptCache;
     mutable OwnPtr<SCRIPT_FONTPROPERTIES> m_scriptFontProperties;
 
     bool m_isHashTableDeletedValue;
 };
 
 } // WebCore
 
 #endif // FontPlatformDataChromiumWin_h