Fixing superscript and subscript baseline for tiny fonts in SVG

third_party/WebKit/Source/platform/fonts/FontDescription.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIother.m_  If not, write to
+ * along with this library; see the file COPYING.LIB. If not, write to

[eae, 2016/10/17 20:14:23]

?

[zakerinasab, 2016/10/18 15:51:16]

It seems to has been replaced by someone by mistake previously.

  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef FontDescription_h
 #define FontDescription_h
 
 #include "SkFontStyle.h"
 #include "platform/FontFamilyNames.h"
@@ skipping 378 matching lines @@
     BitFields m_fields;
     FieldsAsUnsignedType m_fieldsAsUnsigned;
   };
 
   static TypesettingFeatures s_defaultTypesettingFeatures;
 
   static bool s_useSubpixelTextPositioning;
 };
 
 inline bool FontDescription::operator==(const FontDescription& other) const {
-  return m_familyList == other.m_familyList && m_locale == other.m_locale &&
-         m_specifiedSize == other.m_specifiedSize &&
-         m_computedSize == other.m_computedSize &&
-         m_adjustedSize == other.m_adjustedSize &&
-         m_sizeAdjust == other.m_sizeAdjust &&
-         m_letterSpacing == other.m_letterSpacing &&
-         m_wordSpacing == other.m_wordSpacing &&
-         m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0] &&
-         m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1] &&
-         (m_featureSettings == other.m_featureSettings ||
-          (m_featureSettings && other.m_featureSettings &&
-           *m_featureSettings == *other.m_featureSettings));
+  FontDescription other2 = other;
+  other2.setSubpixelAscentDescent(m_fields.m_subpixelAscentDescent);

[eae, 2016/10/17 20:14:23]

This shouldn't be needed, the fields are compared by comparing the
fieldsAsUnsigned masks. The fields should also be included in the hash
(styleHashWithoutFamilyList) as it uses the full width of the bit fields.

[zakerinasab, 2016/10/18 15:51:16]

Acknowledged.

+  return m_familyList == other2.m_familyList && m_locale == other2.m_locale &&
+         m_specifiedSize == other2.m_specifiedSize &&
+         m_computedSize == other2.m_computedSize &&
+         m_adjustedSize == other2.m_adjustedSize &&
+         m_sizeAdjust == other2.m_sizeAdjust &&
+         m_letterSpacing == other2.m_letterSpacing &&
+         m_wordSpacing == other2.m_wordSpacing &&
+         m_fieldsAsUnsigned.parts[0] == other2.m_fieldsAsUnsigned.parts[0] &&
+         m_fieldsAsUnsigned.parts[1] == other2.m_fieldsAsUnsigned.parts[1] &&
+         (m_featureSettings == other2.m_featureSettings ||
+          (m_featureSettings && other2.m_featureSettings &&
+           *m_featureSettings == *other2.m_featureSettings));
 }
 
 }  // namespace blink
 
 #endif