Changeset 181682 in webkit

Timestamp:

Mar 17, 2015, 8:40:51 PM (11 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Change FlowContents::segmentForPosition() to segmentForRun().
​https://bugs.webkit.org/show_bug.cgi?id=142785

Reviewed by Antti Koivisto.

This is in transition to support <br>. A particular position could point to multiple
segments when <br> is directly followed by text.

No change in functionality.

• rendering/SimpleLineLayoutFlowContents.cpp:

(WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):
(WebCore::SimpleLineLayout::FlowContents::segmentIndexForPositionSlow): Deleted.

• rendering/SimpleLineLayoutFlowContents.h:

(WebCore::SimpleLineLayout::FlowContents::segmentForRun):
(WebCore::SimpleLineLayout::FlowContents::segmentIndexForPosition): Deleted.
(WebCore::SimpleLineLayout::FlowContents::segmentForPosition): Deleted.

• rendering/SimpleLineLayoutResolver.cpp:

(WebCore::SimpleLineLayout::RunResolver::Run::text):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayoutFlowContents.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFlowContents.h (modified) (3 diffs)
• rendering/SimpleLineLayoutResolver.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-17  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Change FlowContents::segmentForPosition() to segmentForRun().
+        https://bugs.webkit.org/show_bug.cgi?id=142785
+
+        Reviewed by Antti Koivisto.
+
+        This is in transition to support <br>. A particular position could point to multiple
+        segments when <br> is directly followed by text.
+
+        No change in functionality.
+
+        * rendering/SimpleLineLayoutFlowContents.cpp:
+        (WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):
+        (WebCore::SimpleLineLayout::FlowContents::segmentIndexForPositionSlow): Deleted.
+        * rendering/SimpleLineLayoutFlowContents.h:
+        (WebCore::SimpleLineLayout::FlowContents::segmentForRun):
+        (WebCore::SimpleLineLayout::FlowContents::segmentIndexForPosition): Deleted.
+        (WebCore::SimpleLineLayout::FlowContents::segmentForPosition): Deleted.
+        * rendering/SimpleLineLayoutResolver.cpp:
+        (WebCore::SimpleLineLayout::RunResolver::Run::text):
+
 2015-03-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp

@@ -52 +52 @@
 }
 
-unsigned FlowContents::segmentIndexForPositionSlow(unsigned position) const
+unsigned FlowContents::segmentIndexForRunSlow(unsigned start, unsigned end) const
 {
-    auto it = std::lower_bound(m_segments.begin(), m_segments.end(), position, [](const Segment& segment, unsigned position) {
-        return segment.end <= position;
+    auto it = std::lower_bound(m_segments.begin(), m_segments.end(), start, [](const Segment& segment, unsigned start) {
+        return segment.end <= start;
     });
     ASSERT(it != m_segments.end());
+    ASSERT_UNUSED(end, end <= it->end);
     auto index = it - m_segments.begin();
     m_lastSegmentIndex = index;

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h

@@ -44 +44 @@
         const RenderObject& renderer;
     };
-    const Segment& segmentForPosition(unsigned) const;
+    const Segment& segmentForRun(unsigned start, unsigned end) const;
     const Segment& segmentForRenderer(const RenderObject&) const;
 
@@ -70 +70 @@
     Iterator end() const { return Iterator(*this, m_segments.size()); }
 
-    unsigned segmentIndexForPosition(unsigned position) const;
-
 private:
-    unsigned segmentIndexForPositionSlow(unsigned position) const;
+    unsigned segmentIndexForRunSlow(unsigned start, unsigned end) const;
     const Vector<Segment, 8> m_segments;
     mutable unsigned m_lastSegmentIndex;
@@ -112 +110 @@
 }
 
-inline unsigned FlowContents::segmentIndexForPosition(unsigned position) const
+inline const FlowContents::Segment& FlowContents::segmentForRun(unsigned start, unsigned end) const
 {
+    ASSERT(start < end);
     auto& lastSegment = m_segments[m_lastSegmentIndex];
-    if (lastSegment.start <= position && position < lastSegment.end)
-        return m_lastSegmentIndex;
-    return segmentIndexForPositionSlow(position);
-}
-
-inline const FlowContents::Segment& FlowContents::segmentForPosition(unsigned position) const
-{
-    return m_segments[segmentIndexForPosition(position)];
+    if (lastSegment.start <= start && end <= lastSegment.end)
+        return m_segments[m_lastSegmentIndex];
+    return m_segments[segmentIndexForRunSlow(start, end)];
 }
 

trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp

@@ -77 +77 @@
     auto& resolver = m_iterator.resolver();
     auto& run = m_iterator.simpleRun();
-    auto& segment = resolver.m_flowContents.segmentForPosition(run.start);
+    ASSERT(run.start < run.end);
+    auto& segment = resolver.m_flowContents.segmentForRun(run.start, run.end);
     // We currently split runs on segment boundaries (different RenderObject).
     ASSERT(run.end <= segment.end);