Changeset 215124 in webkit

Timestamp:

Apr 7, 2017 3:48:22 PM (7 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
​https://bugs.webkit.org/show_bug.cgi?id=170552

Reviewed by Antti Koivisto.

Source/WebCore:

The compare function passed to std::lower_bound completely misses empty runs.

Test: fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html

• rendering/SimpleLineLayoutFlowContents.cpp:

(WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):

LayoutTests:

• fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt: Added.
• fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt (added)
• LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-07  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
+        https://bugs.webkit.org/show_bug.cgi?id=170552
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt: Added.
+        * fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html: Added.
+
 2017-04-07  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-07  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
+        https://bugs.webkit.org/show_bug.cgi?id=170552
+
+        Reviewed by Antti Koivisto.
+
+        The compare function passed to std::lower_bound completely misses empty runs. 
+
+        Test: fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html
+
+        * rendering/SimpleLineLayoutFlowContents.cpp:
+        (WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):
+
 2017-04-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp

@@ -69 +69 @@
 unsigned FlowContents::segmentIndexForRunSlow(unsigned start, unsigned end) const
 {
-    auto it = std::lower_bound(m_segments.begin(), m_segments.end(), start, [](const Segment& segment, unsigned start) {
-        return segment.end <= start;
+    auto isEmptyRange = start == end;
+    auto it = std::lower_bound(m_segments.begin(), m_segments.end(), start, [isEmptyRange](const Segment& segment, unsigned start) {
+        // FIXME: This always find the first empty run (.vs subsequent <br> elements)
+        return (isEmptyRange && segment.start == segment.end) ? segment.start < start : segment.end <= start;
     });
     ASSERT(it != m_segments.end());
-    ASSERT_UNUSED(end, end <= it->end);
-    auto index = it - m_segments.begin();
-    m_lastSegmentIndex = index;
-    return index;
+    ASSERT(end <= it->end);
+    m_lastSegmentIndex = it - m_segments.begin();
+    return m_lastSegmentIndex;
 }
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -156 +156 @@
         auto lineRect = *it;
         lineRect.moveBy(accumulatedOffset);
+        auto& renderer = const_cast<RenderObject&>(it.renderer());
         if (!locationInContainer.intersects(lineRect))
             continue;
-        auto& renderer = const_cast<RenderObject&>(it.renderer());
         renderer.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
         if (!result.addNodeToRectBasedTestResult(renderer.node(), request, locationInContainer, lineRect))