Changeset 208170 in webkit

Timestamp:

Oct 31, 2016 1:16:37 PM (7 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !m_trailingWhitespaceWidth in WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace
​https://bugs.webkit.org/show_bug.cgi?id=164076

Reviewed by Antti Koivisto.

Source/WebCore:

FontCascade's text measure methods return NaN for zero sized fonts. We could actually early return and not
measure text with zero font size at all.

Test: fast/text/simple-line-layout-with-zero-sized-font.html

• rendering/SimpleLineLayoutTextFragmentIterator.cpp:

(WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):
(WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):

LayoutTests:

• fast/text/simple-line-layout-with-zero-sized-font-expected.txt: Added.
• fast/text/simple-line-layout-with-zero-sized-font.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-with-zero-sized-font-expected.txt (added)
• LayoutTests/fast/text/simple-line-layout-with-zero-sized-font.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-31  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !m_trailingWhitespaceWidth in WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace
+        https://bugs.webkit.org/show_bug.cgi?id=164076
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/simple-line-layout-with-zero-sized-font-expected.txt: Added.
+        * fast/text/simple-line-layout-with-zero-sized-font.html: Added.
+
 2016-10-31  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-31  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !m_trailingWhitespaceWidth in WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace
+        https://bugs.webkit.org/show_bug.cgi?id=164076
+
+        Reviewed by Antti Koivisto.
+
+        FontCascade's text measure methods return NaN for zero sized fonts. We could actually early return and not
+        measure text with zero font size at all.
+
+        Test: fast/text/simple-line-layout-with-zero-sized-font.html
+
+        * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+        (WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):
+        (WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):
+
 2016-10-31  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp

@@ -150 +150 @@
     ASSERT(segment.start <= from && from <= segment.end && segment.start <= to && to <= segment.end);
     ASSERT(is<RenderText>(segment.renderer));
+    if (!m_style.font.size())
+        return 0;
     if (m_style.font.isFixedPitch() || (from == segment.start && to == segment.end))
         return downcast<RenderText>(segment.renderer).width(from - segment.start, to - from, m_style.font, xPosition, nullptr, nullptr);
@@ -197 +199 @@
 float TextFragmentIterator::runWidth(const FlowContents::Segment& segment, unsigned startPosition, unsigned endPosition, float xPosition) const
 {
+    ASSERT(m_style.font.size());
     ASSERT(startPosition <= endPosition);
     if (startPosition == endPosition)