Remove unsafe getFontMetrics methods

third_party/WebKit/Source/core/layout/LayoutInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               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 600 matching lines @@
     for (; curr; curr = curr->nextLineBox())
       yield(LayoutRect(curr->topLeft(), curr->size()));
   }
 }
 
 static inline void computeItemTopHeight(const LayoutInline* container,
                                         const RootInlineBox& rootBox,
                                         LayoutUnit* top,
                                         LayoutUnit* height) {
   bool firstLine = rootBox.isFirstLineStyle();
-  auto metrics = rootBox.getLineLayoutItem().style(firstLine)->getFontMetrics();
-  auto containerMetrics = container->style(firstLine)->getFontMetrics();
+  const SimpleFontData* fontData =
+      rootBox.getLineLayoutItem().style(firstLine)->font().primaryFont();
+  const SimpleFontData* containerFontData =
+      container->style(firstLine)->font().primaryFont();
+  DCHECK(fontData && containerFontData);
+  if (!fontData || !containerFontData) {
+    *top = LayoutUnit();
+    *height = LayoutUnit();
+    return;
+  }
+  auto metrics = fontData->getFontMetrics();
+  auto containerMetrics = containerFontData->getFontMetrics();
   *top = rootBox.logicalTop() + (metrics.ascent() - containerMetrics.ascent());
   *height = LayoutUnit(containerMetrics.height());
 }
 
 template <typename GeneratorContext>
 void LayoutInline::generateCulledLineBoxRects(
     GeneratorContext& yield,
     const LayoutInline* container) const {
   if (!culledInlineFirstLineBox())
     return;
@@ skipping 700 matching lines @@
   }
 
   return LayoutUnit(style()->computedLineHeight());
 }
 
 int LayoutInline::baselinePosition(FontBaseline baselineType,
                                    bool firstLine,
                                    LineDirectionMode direction,
                                    LinePositionMode linePositionMode) const {
   ASSERT(linePositionMode == PositionOnContainingLine);
-  const FontMetrics& fontMetrics = style(firstLine)->getFontMetrics();
+  const SimpleFontData* fontData = style(firstLine)->font().primaryFont();
+  DCHECK(fontData);
+  if (!fontData)
+    return 0;

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

But then here 0 is the right value?

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

Changed to -1, good catch.

+  const FontMetrics& fontMetrics = fontData->getFontMetrics();
   return (fontMetrics.ascent(baselineType) +
           (lineHeight(firstLine, direction, linePositionMode) -
            fontMetrics.height()) /
               2)
       .toInt();
 }
 
 LayoutSize LayoutInline::offsetForInFlowPositionedInline(
     const LayoutBox& child) const {
   // FIXME: This function isn't right with mixed writing modes.
@@ skipping 152 matching lines @@
     paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
 }
 
 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
 LayoutRect LayoutInline::debugRect() const {
   IntRect linesBox = enclosingIntRect(linesBoundingBox());
   return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
 }
 
 }  // namespace blink