Remove unsafe getFontMetrics methods

third_party/WebKit/Source/platform/exported/WebFont.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "public/platform/WebFont.h"
 
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/graphics/GraphicsContext.h"
@@ skipping 27 matching lines @@
 WebFont::WebFont(const WebFontDescription& description)
     : m_private(new Impl(description)) {}
 
 WebFont::~WebFont() {}
 
 WebFontDescription WebFont::getFontDescription() const {
   return WebFontDescription(m_private->getFont().getFontDescription());
 }
 
 int WebFont::ascent() const {
-  return m_private->getFont().getFontMetrics().ascent();
+  const SimpleFontData* fontData = m_private->getFont().primaryFont();
+  DCHECK(fontData);
+  return fontData ? fontData->getFontMetrics().ascent() : 0;

[wkorman, 2016/10/13 22:54:31]

Could be worth a helper method to use here and in variants below just for
maintenance purposes.

[eae, 2016/10/13 23:09:58]

Good idea.

 }
 
 int WebFont::descent() const {
-  return m_private->getFont().getFontMetrics().descent();
+  const SimpleFontData* fontData = m_private->getFont().primaryFont();
+  DCHECK(fontData);
+  return fontData ? fontData->getFontMetrics().descent() : 0;
 }
 
 int WebFont::height() const {
-  return m_private->getFont().getFontMetrics().height();
+  const SimpleFontData* fontData = m_private->getFont().primaryFont();
+  DCHECK(fontData);
+  return fontData ? fontData->getFontMetrics().height() : 0;
 }
 
 int WebFont::lineSpacing() const {
-  return m_private->getFont().getFontMetrics().lineSpacing();
+  const SimpleFontData* fontData = m_private->getFont().primaryFont();
+  DCHECK(fontData);
+  return fontData ? fontData->getFontMetrics().lineSpacing() : 0;
 }
 
 float WebFont::xHeight() const {
-  return m_private->getFont().getFontMetrics().xHeight();
+  const SimpleFontData* fontData = m_private->getFont().primaryFont();
+  DCHECK(fontData);
+  return fontData ? fontData->getFontMetrics().xHeight() : 0;
 }
 
 void WebFont::drawText(WebCanvas* canvas,
                        const WebTextRun& run,
                        const WebFloatPoint& leftBaseline,
                        WebColor color,
                        const WebRect& clip) const {
   FontCachePurgePreventer fontCachePurgePreventer;
   FloatRect textClipRect(clip);
   TextRun textRun(run);
@@ skipping 28 matching lines @@
 WebFloatRect WebFont::selectionRectForText(const WebTextRun& run,
                                            const WebFloatPoint& leftBaseline,
                                            int height,
                                            int from,
                                            int to) const {
   return m_private->getFont().selectionRectForText(run, leftBaseline, height,
                                                    from, to);
 }
 
 }  // namespace blink