Fixing superscript and subscript baseline for tiny fonts in SVG

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

Index: third_party/WebKit/Source/platform/fonts/FontDescription.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontDescription.h b/third_party/WebKit/Source/platform/fonts/FontDescription.h
index e9fb8c7458a963866798c370159be13006684855..72c0434097fcc3dbb7f5880a69cd876f75724589 100644
--- a/third_party/WebKit/Source/platform/fonts/FontDescription.h
+++ b/third_party/WebKit/Source/platform/fonts/FontDescription.h
@@ -17,7 +17,7 @@
  * 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.
  *
@@ -416,18 +416,20 @@ class PLATFORM_EXPORT FontDescription {
 };
 
 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