Merge 181492 "[DirectWrite] Disable subpixel font positioning fo..."

Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
     : m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
     , m_isHashTableDeletedValue(true)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_minSizeForAntiAlias(0)
+    , m_minSizeForSubpixel(0)
     , m_useSubpixelPositioning(false)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData()
     : m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_minSizeForAntiAlias(0)
+    , m_minSizeForSubpixel(0)
     , m_useSubpixelPositioning(false)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(float textSize, bool syntheticBold, bool syntheticItalic)
     : m_textSize(textSize)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(Horizontal)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_minSizeForAntiAlias(0)
+    , m_minSizeForSubpixel(0)
     , m_useSubpixelPositioning(false)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& src)
     : m_typeface(src.m_typeface)
 #if !OS(WIN)
     , m_family(src.m_family)
 #endif
     , m_textSize(src.m_textSize)
     , m_syntheticBold(src.m_syntheticBold)
     , m_syntheticItalic(src.m_syntheticItalic)
     , m_orientation(src.m_orientation)
     , m_style(src.m_style)
     , m_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(src.m_paintTextFlags)
     , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+    , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
     , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
 #endif
 {
 }
 
 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_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_minSizeForAntiAlias(0)
+    , m_minSizeForSubpixel(0)
     , m_useSubpixelPositioning(subpixelTextPosition)
 #endif
 {
     querySystemForRenderStyle(subpixelTextPosition);
 }
 
 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)
     , m_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(src.m_paintTextFlags)
     , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+    , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
     , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
 #endif
 {
     querySystemForRenderStyle(FontDescription::subpixelPositioning());
 }
 
 FontPlatformData::~FontPlatformData()
 {
 }
 
 FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)
 {
     m_typeface = src.m_typeface;
 #if !OS(WIN)
     m_family = src.m_family;
 #endif
     m_textSize = src.m_textSize;
     m_syntheticBold = src.m_syntheticBold;
     m_syntheticItalic = src.m_syntheticItalic;
     m_harfBuzzFace = nullptr;
     m_orientation = src.m_orientation;
     m_style = src.m_style;
 #if OS(WIN)
     m_paintTextFlags = 0;
     m_minSizeForAntiAlias = src.m_minSizeForAntiAlias;
+    m_minSizeForSubpixel = src.m_minSizeForSubpixel;
     m_useSubpixelPositioning = src.m_useSubpixelPositioning;
 #endif
 
     return *this;
 }
 
 #ifndef NDEBUG
 String FontPlatformData::description() const
 {
     return String();
@@ skipping 43 matching lines @@
 
 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
 {
     if (!m_harfBuzzFace)
         m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
 
     return m_harfBuzzFace.get();
 }
 
 } // namespace WebCore