Remove font subpixel positioning flag

third_party/WebKit/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 36 matching lines @@
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(FontOrientation::Horizontal)
 #if !OS(MACOSX)
     , 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(FontOrientation::Horizontal)
 #if !OS(MACOSX)
     , 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)
     : 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_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_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)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
     : m_typeface(src.m_typeface)
 #if !OS(WIN)
     , 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_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)
-    querySystemForRenderStyle(FontDescription::subpixelPositioning());
+    querySystemForRenderStyle();
 #endif
 }
 
-FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, bool subpixelTextPosition)
+FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf,
+    const char* family, float textSize, bool syntheticBold,
+    bool syntheticItalic, FontOrientation orientation)
     : m_typeface(tf)
 #if !OS(WIN)
     , m_family(family)
 #endif
     , m_textSize(textSize)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
-    , m_useSubpixelPositioning(subpixelTextPosition)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 #if !OS(MACOSX)
-    querySystemForRenderStyle(subpixelTextPosition);
+    querySystemForRenderStyle();
 #endif
 }
 
 FontPlatformData::~FontPlatformData()
 {
 }
 
 #if OS(MACOSX)
 CTFontRef FontPlatformData::ctFont() const
 {
@@ skipping 22 matching lines @@
     m_harfBuzzFace = nullptr;
     m_orientation = other.m_orientation;
 #if !OS(MACOSX)
     m_style = other.m_style;
 #endif
 
 #if OS(WIN)
     m_paintTextFlags = 0;
     m_minSizeForAntiAlias = other.m_minSizeForAntiAlias;
     m_minSizeForSubpixel = other.m_minSizeForSubpixel;
-    m_useSubpixelPositioning = other.m_useSubpixelPositioning;
 #endif
 
     return *this;
 }
 
 bool FontPlatformData::operator==(const FontPlatformData& a) const
 {
     // If either of the typeface pointers are null then we test for pointer
     // equality. Otherwise, we call SkTypeface::Equal on the valid pointers.
     bool typefacesEqual = false;
@@ skipping 131 matching lines @@
     const size_t tableSize = m_typeface->getTableSize(tag);
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 
 } // namespace blink