Changeset 270128 in webkit

Timestamp:

Nov 20, 2020 12:54:25 PM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Rename LineIteratorLegacy::logicalLeft/right to contentLeft/right
​https://bugs.webkit.org/show_bug.cgi?id=219215

Reviewed by Antti Koivisto.

These functions are supposed to return the position where the content starts/ends inside the line box (see text-alignment as an example
where the line's logical left edge is not where content starts).

(WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):

• layout/integration/LayoutIntegrationLineIterator.h:

(WebCore::LayoutIntegration::PathLine::selectionRect const):
(WebCore::LayoutIntegration::PathLine::contentLogicalLeft const):
(WebCore::LayoutIntegration::PathLine::contentLogicalRight const):
(WebCore::LayoutIntegration::PathLine::logicalLeft const): Deleted.
(WebCore::LayoutIntegration::PathLine::logicalRight const): Deleted.

• layout/integration/LayoutIntegrationLineIteratorLegacyPath.h:

(WebCore::LayoutIntegration::LineIteratorLegacyPath::contentLogicalLeft const):
(WebCore::LayoutIntegration::LineIteratorLegacyPath::contentLogicalRight const):
(WebCore::LayoutIntegration::LineIteratorLegacyPath::logicalLeft const): Deleted.
(WebCore::LayoutIntegration::LineIteratorLegacyPath::logicalRight const): Deleted.

• layout/integration/LayoutIntegrationLineIteratorModernPath.h:

(WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalLeft const):
(WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalRight const):
(WebCore::LayoutIntegration::LineIteratorModernPath::logicalLeft const): Deleted.
(WebCore::LayoutIntegration::LineIteratorModernPath::logicalRight const): Deleted.

• rendering/RenderLineBreak.cpp:

(WebCore::RenderLineBreak::localCaretRect const):
(WebCore::RenderLineBreak::collectSelectionRects):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/VisiblePosition.cpp (modified) (1 diff)
• layout/integration/LayoutIntegrationLineIterator.h (modified) (3 diffs)
• layout/integration/LayoutIntegrationLineIteratorLegacyPath.h (modified) (1 diff)
• layout/integration/LayoutIntegrationLineIteratorModernPath.h (modified) (1 diff)
• rendering/RenderLineBreak.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-20  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Rename LineIteratorLegacy::logicalLeft/right to contentLeft/right
+        https://bugs.webkit.org/show_bug.cgi?id=219215
+
+        Reviewed by Antti Koivisto.
+
+        These functions are supposed to return the position where the content starts/ends inside the line box (see text-alignment as an example
+        where the line's logical left edge is not where content starts).
+
+        (WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):
+        * layout/integration/LayoutIntegrationLineIterator.h:
+        (WebCore::LayoutIntegration::PathLine::selectionRect const):
+        (WebCore::LayoutIntegration::PathLine::contentLogicalLeft const):
+        (WebCore::LayoutIntegration::PathLine::contentLogicalRight const):
+        (WebCore::LayoutIntegration::PathLine::logicalLeft const): Deleted.
+        (WebCore::LayoutIntegration::PathLine::logicalRight const): Deleted.
+        * layout/integration/LayoutIntegrationLineIteratorLegacyPath.h:
+        (WebCore::LayoutIntegration::LineIteratorLegacyPath::contentLogicalLeft const):
+        (WebCore::LayoutIntegration::LineIteratorLegacyPath::contentLogicalRight const):
+        (WebCore::LayoutIntegration::LineIteratorLegacyPath::logicalLeft const): Deleted.
+        (WebCore::LayoutIntegration::LineIteratorLegacyPath::logicalRight const): Deleted.
+        * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+        (WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalLeft const):
+        (WebCore::LayoutIntegration::LineIteratorModernPath::contentLogicalRight const):
+        (WebCore::LayoutIntegration::LineIteratorModernPath::logicalLeft const): Deleted.
+        (WebCore::LayoutIntegration::LineIteratorModernPath::logicalRight const): Deleted.
+        * rendering/RenderLineBreak.cpp:
+        (WebCore::RenderLineBreak::localCaretRect const):
+        (WebCore::RenderLineBreak::collectSelectionRects):
+
 2020-11-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -661 +661 @@
 
     auto line = run.line();
-    auto localRect = FloatRect { FloatPoint { line->logicalLeft(), line->selectionTop() }, FloatPoint { line->logicalRight(), line->selectionBottom() } };
+    auto localRect = FloatRect { FloatPoint { line->contentLogicalLeft(), line->selectionTop() }, FloatPoint { line->contentLogicalRight(), line->selectionBottom() } };
     if (!line->isHorizontal())
         localRect = localRect.transposedRect();

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIterator.h

@@ -62 +62 @@
 
     float y() const;
-    float logicalLeft() const;
-    float logicalRight() const;
+    float contentLogicalLeft() const;
+    float contentLogicalRight() const;
     float logicalHeight() const;
 
@@ -181 +181 @@
 inline LayoutRect PathLine::selectionRect() const
 {
-    return { LayoutPoint { logicalLeft(), selectionTop() }, LayoutPoint { logicalRight(), selectionBottom() } };
+    return { LayoutPoint { contentLogicalLeft(), selectionTop() }, LayoutPoint { contentLogicalRight(), selectionBottom() } };
 }
 
@@ -191 +191 @@
 }
 
-inline float PathLine::logicalLeft() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.logicalLeft();
-    });
-}
-
-inline float PathLine::logicalRight() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.logicalRight();
+inline float PathLine::contentLogicalLeft() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.contentLogicalLeft();
+    });
+}
+
+inline float PathLine::contentLogicalRight() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.contentLogicalRight();
     });
 }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorLegacyPath.h

@@ -54 +54 @@
 
     float y() const { return m_rootInlineBox->y(); }
-    float logicalLeft() const { return m_rootInlineBox->logicalLeft(); }
-    float logicalRight() const { return m_rootInlineBox->logicalRight(); }
+    float contentLogicalLeft() const { return m_rootInlineBox->logicalLeft(); }
+    float contentLogicalRight() const { return m_rootInlineBox->logicalRight(); }
     float logicalHeight() const { return m_rootInlineBox->logicalHeight(); }
     bool isHorizontal() const { return m_rootInlineBox->isHorizontal(); }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h

@@ -60 +60 @@
     LayoutUnit selectionBottom() const { return bottom(); }
 
-    float logicalLeft() const { return line().rect().x() + line().horizontalAlignmentOffset(); }
-    float logicalRight() const { return logicalLeft() + line().lineBoxWidth(); }
+    float contentLogicalLeft() const { return line().rect().x() + line().horizontalAlignmentOffset(); }
+    float contentLogicalRight() const { return contentLogicalLeft() + line().rect().width(); }
     float y() const { return lineBoxTop(); }
     float logicalHeight() const { return line().rect().height(); }

trunk/Source/WebCore/rendering/RenderLineBreak.cpp

@@ -168 +168 @@
 
     auto line = runAndOffset.run.line();
-    return line->containingBlock().computeCaretRect(line->selectionRect(), line->logicalLeft(), caretWidth, caretRectMode);
+    return line->containingBlock().computeCaretRect(line->selectionRect(), line->contentLogicalLeft(), caretWidth, caretRectMode);
 }
 
@@ -215 +215 @@
 
     auto line = LayoutIntegration::LineIterator(&rootBox);
-    LayoutRect rect = rootBox.blockFlow().computeCaretRect(line->selectionRect(), line->logicalLeft(), 0);
+    LayoutRect rect = rootBox.blockFlow().computeCaretRect(line->selectionRect(), line->contentLogicalLeft(), 0);
 
     if (rootBox.isFirstAfterPageBreak()) {