Changeset 175620 in webkit

Timestamp:

Nov 5, 2014 7:07:24 AM (9 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r175601): Assertion failures in SimpleLineLayout
​https://bugs.webkit.org/show_bug.cgi?id=138422

Check for end.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::FlowContentIterator::isNewlineCharacter):
(WebCore::SimpleLineLayout::removeTrailingWhitespace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r175601): Assertion failures in SimpleLineLayout
+        https://bugs.webkit.org/show_bug.cgi?id=138422
+
+        Check for end.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::FlowContentIterator::isNewlineCharacter):
+        (WebCore::SimpleLineLayout::removeTrailingWhitespace):
+
 2014-11-05  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -475 +475 @@
     }
 
+    if (contentIterator.isEndOfContent(lineState.position))
+        return;
     // If we skipped any whitespace and now the line end is a "preserved" newline, skip the newline too as we are wrapping the line here already.
     if (lastPosition != lineState.position && style.preserveNewline && contentIterator.isNewlineCharacter(lineState.position))