Remove unsafe getFontMetrics methods

third_party/WebKit/Source/core/style/ComputedStyle.cpp

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index dbacac5b12c7f790255a4a1c7157b368bc8bec37..860ae322c8a5ebbdad10cdc4f9b2e4d0a159ca23 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1648,9 +1648,6 @@ CSSTransitionData& ComputedStyle::accessTransitions() {
 const Font& ComputedStyle::font() const {
   return m_styleInheritedData->font;
 }
-const FontMetrics& ComputedStyle::getFontMetrics() const {
-  return m_styleInheritedData->font.getFontMetrics();
-}
 const FontDescription& ComputedStyle::getFontDescription() const {
   return m_styleInheritedData->font.getFontDescription();
 }
@@ -1838,7 +1835,7 @@ int ComputedStyle::computedLineHeight() const {
   // Negative value means the line height is not set. Use the font's built-in
   // spacing, if avalible.
   if (lh.isNegative() && font().primaryFont())
-    return getFontMetrics().lineSpacing();
+    return font().primaryFont()->getFontMetrics().lineSpacing();
 
   if (lh.isPercentOrCalc())
     return minimumValueForLength(lh, LayoutUnit(computedFontSize())).toInt();