Changeset 167580 in webkit

Timestamp:

Apr 20, 2014, 9:40:11 PM (12 years ago)

Author:

Darin Adler

Message:

Simple layout can get confused by coordinate overflow
​https://bugs.webkit.org/show_bug.cgi?id=131890
rdar://problem/15558510

Reviewed by Andreas Kling.

Source/WebCore:
Test: fast/css/simple-layout-overflow.html

• rendering/SimpleLineLayoutResolver.h:

(WebCore::SimpleLineLayout::RunResolver::rangeForRect):
If lastLine is smaller than firstList, just ignore it.

LayoutTests:

• fast/css/simple-layout-overflow-expected.txt: Added.
• fast/css/simple-layout-overflow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/simple-layout-overflow-expected.txt (added)
• LayoutTests/fast/css/simple-layout-overflow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutResolver.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-19  Darin Adler  <darin@apple.com>
+
+        Simple layout can get confused by coordinate overflow
+        https://bugs.webkit.org/show_bug.cgi?id=131890
+        rdar://problem/15558510
+
+        Reviewed by Andreas Kling.
+
+        * fast/css/simple-layout-overflow-expected.txt: Added.
+        * fast/css/simple-layout-overflow.html: Added.
+
 2014-04-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-19  Darin Adler  <darin@apple.com>
+
+        Simple layout can get confused by coordinate overflow
+        https://bugs.webkit.org/show_bug.cgi?id=131890
+        rdar://problem/15558510
+
+        Reviewed by Andreas Kling.
+
+        Test: fast/css/simple-layout-overflow.html
+
+        * rendering/SimpleLineLayoutResolver.h:
+        (WebCore::SimpleLineLayout::RunResolver::rangeForRect):
+        If lastLine is smaller than firstList, just ignore it.
+
 2014-04-20  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h

@@ -284 +284 @@
 
     unsigned firstLine = lineIndexForHeight(rect.y());
-    unsigned lastLine = lineIndexForHeight(rect.maxY());
+    unsigned lastLine = std::max(firstLine, lineIndexForHeight(rect.maxY()));
 
     auto rangeBegin = begin().advanceLines(firstLine);
@@ -290 +290 @@
         return Range<Iterator>(end(), end());
     auto rangeEnd = rangeBegin;
+    ASSERT(lastLine >= firstLine);
     rangeEnd.advanceLines(lastLine - firstLine + 1);
     return Range<Iterator>(rangeBegin, rangeEnd);