Index: Source/core/layout/LayoutText.cpp |
diff --git a/Source/core/layout/LayoutText.cpp b/Source/core/layout/LayoutText.cpp |
index 438d88c07c78d4e4f1d2093ff74752d6ba115b99..ed1bb2720d05c38384c5fa95b1b3ac162f787d5b 100644 |
--- a/Source/core/layout/LayoutText.cpp |
+++ b/Source/core/layout/LayoutText.cpp |
@@ -1111,16 +1111,13 @@ void LayoutText::computePreferredLogicalWidths(float leadWidth, HashSet<const Si |
m_lastLineLineMinWidth = currMaxWidth; |
} |
- if (styleToUse.lineBoxContain() & LineBoxContainGlyphs) { |
- // We shouldn't change our mind once we "know". |
- ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts); |
- } else { |
- GlyphOverflow glyphOverflow; |
- glyphOverflow.setFromBounds(glyphBounds, f.fontMetrics().floatAscent(), f.fontMetrics().floatDescent(), m_maxWidth); |
- // We shouldn't change our mind once we "know". |
- ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts || (fallbackFonts.isEmpty() && glyphOverflow.isZero())); |
- m_knownToHaveNoOverflowAndNoFallbackFonts = fallbackFonts.isEmpty() && glyphOverflow.isZero(); |
- } |
+ // TODO(wkorman): Look into potentially removing GlyphOverflow or at least the |
+ // computeBounds field as we no longer use it for line-box-contain implementation. |
+ GlyphOverflow glyphOverflow; |
+ glyphOverflow.setFromBounds(glyphBounds, f.fontMetrics().floatAscent(), f.fontMetrics().floatDescent(), m_maxWidth); |
+ // We shouldn't change our mind once we "know". |
+ ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts || (fallbackFonts.isEmpty() && glyphOverflow.isZero())); |
+ m_knownToHaveNoOverflowAndNoFallbackFonts = fallbackFonts.isEmpty() && glyphOverflow.isZero(); |
clearPreferredLogicalWidthsDirty(); |
} |