Remove FontPlatformData::m_widthVariant.

Source/platform/fonts/FontPlatformData.cpp

 /*
  * Copyright (C) 2011 Brent Fulgham
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 31 matching lines @@
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
-#endif
-    , m_widthVariant(RegularWidth)
-#if OS(MACOSX)
     , m_font(nullptr)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(true)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData()
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
-#endif
-    , m_widthVariant(RegularWidth)
-#if OS(MACOSX)
     , m_font(nullptr)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
-FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation)
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
-#endif
-    , m_widthVariant(widthVariant)
-#if OS(MACOSX)
     , m_font(nullptr)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& source)
     : m_typeface(source.m_typeface)
 #if !OS(WIN)
     , m_family(source.m_family)
 #endif
     , m_textSize(source.m_textSize)
     , m_syntheticBold(source.m_syntheticBold)
     , m_syntheticItalic(source.m_syntheticItalic)
     , m_orientation(source.m_orientation)
 #if OS(MACOSX)
     , m_isColorBitmapFont(source.m_isColorBitmapFont)
     , m_isCompositeFontReference(source.m_isCompositeFontReference)
 #endif
-    , m_widthVariant(source.m_widthVariant)
 #if !OS(MACOSX)
     , m_style(source.m_style)
 #endif
     , m_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(source.m_paintTextFlags)
     , m_useSubpixelPositioning(source.m_useSubpixelPositioning)
     , m_minSizeForAntiAlias(source.m_minSizeForAntiAlias)
     , m_minSizeForSubpixel(source.m_minSizeForSubpixel)
@@ skipping 10 matching lines @@
     , m_family(src.m_family)
 #endif
     , m_textSize(textSize)
     , m_syntheticBold(src.m_syntheticBold)
     , m_syntheticItalic(src.m_syntheticItalic)
     , m_orientation(src.m_orientation)
 #if OS(MACOSX)
     , m_isColorBitmapFont(src.m_isColorBitmapFont)
     , m_isCompositeFontReference(src.m_isCompositeFontReference)
 #endif
-    , m_widthVariant(RegularWidth)
 #if !OS(MACOSX)
     , m_style(src.m_style)
 #endif
     , m_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(src.m_paintTextFlags)
     , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
     , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
     , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
 #endif
 {
 #if OS(MACOSX)
     platformDataInit(src);
 #else
     querySystemForRenderStyle(FontDescription::subpixelPositioning());
 #endif
 }
 
 #if OS(MACOSX)
-FontPlatformData::FontPlatformData(CGFontRef cgFont, PassRefPtr<SkTypeface> tf, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(CGFontRef cgFont, PassRefPtr<SkTypeface> tf, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation)
     : m_typeface(tf)
     , m_family(CString())
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
-    , m_widthVariant(widthVariant)
     , m_font(nullptr)
     , m_cgFont(cgFont)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 #else
 
 FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, bool subpixelTextPosition)
     : m_typeface(tf)
 #if !OS(WIN)
     , m_family(family)
 #endif
     , m_textSize(textSize)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
-    , m_widthVariant(RegularWidth)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(subpixelTextPosition)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
     querySystemForRenderStyle(subpixelTextPosition);
 }
@@ skipping 16 matching lines @@
 
     m_typeface = other.m_typeface;
 #if !OS(WIN)
     m_family = other.m_family;
 #endif
     m_textSize = other.m_textSize;
     m_syntheticBold = other.m_syntheticBold;
     m_syntheticItalic = other.m_syntheticItalic;
     m_harfBuzzFace = nullptr;
     m_orientation = other.m_orientation;
-    m_widthVariant = other.m_widthVariant;
 #if OS(MACOSX)
     m_isColorBitmapFont = other.m_isColorBitmapFont;
     m_isCompositeFontReference = other.m_isCompositeFontReference;
 #else
     m_style = other.m_style;
 #endif
-    m_widthVariant = other.m_widthVariant;
 
 #if OS(WIN)
     m_paintTextFlags = 0;
     m_minSizeForAntiAlias = other.m_minSizeForAntiAlias;
     m_minSizeForSubpixel = other.m_minSizeForSubpixel;
     m_useSubpixelPositioning = other.m_useSubpixelPositioning;
 #endif
 
 #if OS(MACOSX)
     return platformDataAssign(other);
@@ skipping 19 matching lines @@
         typefacesEqual = m_cgFont == a.m_cgFont;
 #endif
 
     return typefacesEqual
         && m_textSize == a.m_textSize
         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
         && m_syntheticBold == a.m_syntheticBold
         && m_syntheticItalic == a.m_syntheticItalic
         && m_orientation == a.m_orientation
 #if !OS(MACOSX)
         && m_style == a.m_style

[Dominik Röttsches, 2014/11/13 13:42:22]

I'd put semicolons here and...

[bungeman-chromium, 2014/11/13 17:49:43]

Done.

 #else
         && m_isColorBitmapFont == a.m_isColorBitmapFont
         && m_isCompositeFontReference == a.m_isCompositeFontReference

[Dominik Röttsches, 2014/11/13 13:42:22]

here.

[bungeman-chromium, 2014/11/13 17:49:43]

Done.

 #endif
-        && m_widthVariant == a.m_widthVariant;
+        && true;

[Dominik Röttsches, 2014/11/13 13:42:22]

instead of this tail end.

[bungeman-chromium, 2014/11/13 17:49:43]

Done.

 }
 
 SkFontID FontPlatformData::uniqueID() const
 {
     return typeface()->uniqueID();
 }
 
 String FontPlatformData::fontFamilyName() const
 {
     ASSERT(this->typeface());
@@ skipping 70 matching lines @@
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 #endif
 
 } // namespace blink