Changeset 205374 in webkit

Timestamp:

Sep 2, 2016 2:50:13 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
​https://bugs.webkit.org/show_bug.cgi?id=149462
<rdar://problem/27710841>

Reviewed by David Hyatt.

Source/WebCore:

In certain cases (multiple spans on the same line with negativ marings), the LineWidth::m_committedWidth > 0
check is not sufficient to decide if some content has already been committed to the current line.
This patch adds a flag to indicate if we ever committed to the current line.

Test: fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html

• rendering/line/BreakingContext.h:

(WebCore::BreakingContext::handleText):

• rendering/line/LineWidth.h:

(WebCore::LineWidth::hasCommitted):

LayoutTests:

• fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt: Added.
• fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt (added)
• LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/line/BreakingContext.h (modified) (2 diffs)
• Source/WebCore/rendering/line/LineWidth.cpp (modified) (2 diffs)
• Source/WebCore/rendering/line/LineWidth.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-02  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
+        https://bugs.webkit.org/show_bug.cgi?id=149462
+        <rdar://problem/27710841>
+
+        Reviewed by David Hyatt.
+
+        * fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt: Added.
+        * fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html: Added.
+
 2016-09-02  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-02  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
+        https://bugs.webkit.org/show_bug.cgi?id=149462
+        <rdar://problem/27710841>
+
+        Reviewed by David Hyatt.
+
+        In certain cases (multiple spans on the same line with negativ marings), the LineWidth::m_committedWidth > 0
+        check is not sufficient to decide if some content has already been committed to the current line.
+        This patch adds a flag to indicate if we ever committed to the current line. 
+
+        Test: fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html
+
+        * rendering/line/BreakingContext.h:
+        (WebCore::BreakingContext::handleText):
+        * rendering/line/LineWidth.h:
+        (WebCore::LineWidth::hasCommitted):
+
 2016-09-02  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/line/BreakingContext.h

@@ -582 +582 @@
         }
         if (downcast<RenderListMarker>(*m_current.renderer()).isInside())
-            m_width.addUncommittedReplacedWidth(replacedLogicalWidth);
+            m_width.addUncommittedWidth(replacedLogicalWidth);
     } else
-        m_width.addUncommittedReplacedWidth(replacedLogicalWidth);
+        m_width.addUncommittedWidth(replacedLogicalWidth);
     if (is<RenderRubyRun>(*m_current.renderer())) {
         m_width.applyOverhang(downcast<RenderRubyRun>(m_current.renderer()), m_lastObject, m_nextObject);
@@ -801 +801 @@
     bool breakNBSP = m_autoWrap && m_currentStyle->nbspMode() == SPACE;
     // Auto-wrapping text should wrap in the middle of a word only if it could not wrap before the word,
-    // which is only possible if the word is the first thing on the line, that is, if |w| is zero.
+    // which is only possible if the word is the first thing on the line.
     bool breakWords = m_currentStyle->breakWords() && ((m_autoWrap && !m_width.hasCommitted()) || m_currWS == PRE);
     bool midWordBreak = false;

trunk/Source/WebCore/rendering/line/LineWidth.cpp

@@ -38 +38 @@
 LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot shouldIndentText)
     : m_block(block)
-    , m_uncommittedWidth(0)
-    , m_committedWidth(0)
-    , m_overhangWidth(0)
-    , m_trailingWhitespaceWidth(0)
-    , m_trailingCollapsedWhitespaceWidth(0)
-    , m_left(0)
-    , m_right(0)
-    , m_availableWidth(0)
     , m_isFirstLine(isFirstLine)
     , m_shouldIndentText(shouldIndentText)
@@ -137 +129 @@
     m_committedWidth += m_uncommittedWidth;
     m_uncommittedWidth = 0;
-    if (m_hasUncommittedReplaced) {
-        m_hasCommittedReplaced = true;
-        m_hasUncommittedReplaced = false;
-    }
+    m_hasCommitted = true;
 }
 

trunk/Source/WebCore/rendering/line/LineWidth.h

@@ -60 +60 @@
     float logicalLeftOffset() const { return m_left; }
     
-    bool hasCommitted() const { return m_committedWidth > 0 || m_hasCommittedReplaced; }
+    bool hasCommitted() const { return m_hasCommitted; }
 
     void updateAvailableWidth(LayoutUnit minimumHeight = 0);
@@ -67 +67 @@
     {
         m_uncommittedWidth += delta;
-    }
-    void addUncommittedReplacedWidth(float delta)
-    {
-        addUncommittedWidth(delta);
-        m_hasUncommittedReplaced = true;
     }
     void commit();
@@ -90 +85 @@
 
     RenderBlockFlow& m_block;
-    float m_uncommittedWidth;
-    float m_committedWidth;
-    float m_overhangWidth; // The amount by which |m_availableWidth| has been inflated to account for possible contraction due to ruby overhang.
-    float m_trailingWhitespaceWidth;
-    float m_trailingCollapsedWhitespaceWidth;
-    float m_left;
-    float m_right;
-    float m_availableWidth;
-    bool m_isFirstLine;
-    bool m_hasUncommittedReplaced { false };
-    bool m_hasCommittedReplaced { false };
+    float m_uncommittedWidth { 0 };
+    float m_committedWidth { 0 };
+    float m_overhangWidth { 0 }; // The amount by which |m_availableWidth| has been inflated to account for possible contraction due to ruby overhang.
+    float m_trailingWhitespaceWidth { 0 };
+    float m_trailingCollapsedWhitespaceWidth { 0 };
+    float m_left { 0 };
+    float m_right { 0 };
+    float m_availableWidth { 0 };
+    bool m_isFirstLine { true };
+    bool m_hasCommitted { false };
     IndentTextOrNot m_shouldIndentText;
 };