Rename enums/functions that collide in chromium style in platform/

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 2fb85efddb92399ce8a154c0298198cf53c484b0..38c5155dda763d6b8bb33928323b2d685ded2b1a 100644
--- a/third_party/WebKit/Source/platform/fonts/FontDescription.h
+++ b/third_party/WebKit/Source/platform/fonts/FontDescription.h
@@ -135,9 +135,9 @@ public:
     };
 
     const FontFamily& family() const { return m_familyList; }
-    FamilyDescription familyDescription() const { return FamilyDescription(genericFamily(), family()); }
+    FamilyDescription getFamilyDescription() const { return FamilyDescription(genericFamily(), family()); }
     FontFamily& firstFamily() { return m_familyList; }
-    Size size() const { return Size(keywordSize(), specifiedSize(), isAbsoluteSize()); }
+    Size getSize() const { return Size(keywordSize(), specifiedSize(), isAbsoluteSize()); }
     float specifiedSize() const { return m_specifiedSize; }
     float computedSize() const { return m_computedSize; }
     float adjustedSize() const { return m_adjustedSize; }
@@ -160,7 +160,7 @@ public:
     {
         return genericFamily() == MonospaceFamily && !family().next() && family().family() == FontFamilyNames::webkit_monospace;
     }
-    Kerning kerning() const { return static_cast<Kerning>(m_fields.m_kerning); }
+    Kerning getKerning() const { return static_cast<Kerning>(m_fields.m_kerning); }
     VariantLigatures variantLigatures() const;

[jbroman, 2016/02/29 22:40:20]

drive-by: won't VariantLigatures have the same issue?

[danakj, 2016/02/29 22:42:06]

You would think so, my regex didn't find it. Hm. Guess I'll have to make another
pass.. (this patch is probably big enough for now though)

     LigaturesState commonLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_commonLigaturesState); }
     LigaturesState discretionaryLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_discretionaryLigaturesState); }
@@ -219,7 +219,7 @@ public:
     void setWordSpacing(float s) { m_wordSpacing = s; }
     void setLetterSpacing(float s) { m_letterSpacing = s; updateTypesettingFeatures(); }
 
-    TypesettingFeatures typesettingFeatures() const { return static_cast<TypesettingFeatures>(m_fields.m_typesettingFeatures); }
+    TypesettingFeatures getTypesettingFeatures() const { return static_cast<TypesettingFeatures>(m_fields.m_typesettingFeatures); }
 
     static void setSubpixelPositioning(bool b) { s_useSubpixelTextPositioning = b; }
     static bool subpixelPositioning() { return s_useSubpixelTextPositioning; }