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

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

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * 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.
@@ skipping 35 matching lines @@
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StdLibExtras.h"
 
 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);
 
     // Only set painting flags when we're actually painting.
     if (context) {
         int textFlags = paintTextFlags();
         if (!context->couldUseLCDRenderedText()) {
             textFlags &= ~SkPaint::kLCDRenderText_Flag;
             // If we *just* clear our request for LCD, then GDI seems to
@@ skipping 94 matching lines @@
             height = -height;
         *size = height;
     }
     if (paintTextFlags)
         *paintTextFlags = computePaintTextFlags(info);
     return adoptRef(SkCreateTypefaceFromLOGFONT(info));
 }
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
     : m_font(0)
-    , m_size(-1)
+    , m_textSize(-1)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
     , m_scriptCache(0)
     , m_typeface(SkTypeface::RefDefault())
     , m_paintTextFlags(0)
     , m_isHashTableDeletedValue(true)
 {
 }
 
 FontPlatformData::FontPlatformData()
     : m_font(0)
-    , m_size(0)
+    , m_textSize(0)
     , m_fakeBold(false)
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
     , m_scriptCache(0)
     , m_typeface(SkTypeface::RefDefault())
     , m_paintTextFlags(0)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 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)
     , m_scriptCache(0)
     , m_typeface(CreateTypefaceFromHFont(font, 0, &m_paintTextFlags))
     , m_isHashTableDeletedValue(false)
 {
 }
 
 // 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)
     , m_scriptCache(0)
     , m_typeface(SkTypeface::RefDefault())
     , m_paintTextFlags(0)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 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)
     , m_scriptCache(0)
     , m_typeface(data.m_typeface)
     , m_paintTextFlags(data.m_paintTextFlags)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 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)
     , m_scriptCache(0)
     , m_typeface(data.m_typeface)
     , m_paintTextFlags(data.m_paintTextFlags)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 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)
     , m_scriptCache(0)
     , m_typeface(tf)
     , m_isHashTableDeletedValue(false)
 {
     // FIXME: This can be removed together with m_font once the last few
     // uses of hfont() has been eliminated.
     LOGFONT logFont;
     SkLOGFONTFromTypeface(tf, &logFont);
     logFont.lfHeight = -textSize;
     HFONT hFont = CreateFontIndirect(&logFont);
     if (hFont)
         m_font = RefCountedHFONT::create(hFont);
     m_paintTextFlags = computePaintTextFlags(logFont);
 }
 
 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;
         m_typeface = data.m_typeface;
         m_paintTextFlags = data.m_paintTextFlags;
 
         // The following fields will get re-computed if necessary.
         ScriptFreeCache(&m_scriptCache);
         m_scriptCache = 0;
         m_scriptFontProperties.clear();
@@ skipping 90 matching lines @@
 
 bool FontPlatformData::ensureFontLoaded(HFONT font)
 {
     WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport();
     // if there is no sandbox, then we can assume the font
     // was able to be loaded successfully already
     return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true;
 }
 
 }