Remove unsafe getFontMetrics methods

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * 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.
@@ skipping 1630 matching lines @@
 CSSTransitionData& ComputedStyle::accessTransitions() {
   if (!m_rareNonInheritedData.access()->m_transitions)
     m_rareNonInheritedData.access()->m_transitions =
         CSSTransitionData::create();
   return *m_rareNonInheritedData->m_transitions;
 }
 
 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();
 }
 float ComputedStyle::specifiedFontSize() const {
   return getFontDescription().specifiedSize();
 }
 float ComputedStyle::computedFontSize() const {
   return getFontDescription().computedSize();
 }
 int ComputedStyle::fontSize() const {
@@ skipping 167 matching lines @@
 void ComputedStyle::setLineHeight(const Length& specifiedLineHeight) {
   SET_VAR(m_styleInheritedData, line_height, specifiedLineHeight);
 }
 
 int ComputedStyle::computedLineHeight() const {
   const Length& lh = lineHeight();
 
   // 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();
 
   return std::min(lh.value(), LayoutUnit::max().toFloat());
 }
 
 void ComputedStyle::setWordSpacing(float wordSpacing) {
   FontSelector* currentFontSelector = font().getFontSelector();
   FontDescription desc(getFontDescription());
@@ skipping 518 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink