Changeset 247153 in webkit

Timestamp:

Jul 5, 2019 7:24:23 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Inline runs should be relative to the line's top/left initially
​https://bugs.webkit.org/show_bug.cgi?id=199157
<rdar://problem/52053415>

Reviewed by Antti Koivisto.

Let's construct the runs relative to the line's top/left and convert them relative to the formatting root's border box top/left
when the line is being closed. When the line moves (floats etc) we don't have to move each runs individually.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::close):
(WebCore::Layout::Line::moveLogicalLeft):
(WebCore::Layout::Line::appendInlineContainerStart):
(WebCore::Layout::Line::appendTextContent):
(WebCore::Layout::Line::appendNonReplacedInlineBox):
(WebCore::Layout::Line::appendHardLineBreak):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-05  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Inline runs should be relative to the line's top/left initially
+        https://bugs.webkit.org/show_bug.cgi?id=199157
+        <rdar://problem/52053415>
+
+        Reviewed by Antti Koivisto.
+
+        Let's construct the runs relative to the line's top/left and convert them relative to the formatting root's border box top/left
+        when the line is being closed. When the line moves (floats etc) we don't have to move each runs individually.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::close):
+        (WebCore::Layout::Line::moveLogicalLeft):
+        (WebCore::Layout::Line::appendInlineContainerStart):
+        (WebCore::Layout::Line::appendTextContent):
+        (WebCore::Layout::Line::appendNonReplacedInlineBox):
+        (WebCore::Layout::Line::appendHardLineBreak):
+
 2019-07-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp

@@ -141 +141 @@
             }
             run->logicalRect.setTop(logicalTop);
+            // Convert runs from relative to the line top/left to the formatting root's border box top/left.
+            run->logicalRect.moveVertically(this->logicalTop());
+            run->logicalRect.moveHorizontally(this->logicalLeft());
         }
     }
@@ -168 +171 @@
     m_logicalTopLeft.move(delta, 0);
     m_lineLogicalWidth -= delta;
-    for (auto& run : m_content->runs())
-        run->logicalRect.moveHorizontally(delta);
 }
 
@@ -212 +213 @@
 {
     auto logicalRect = Display::Rect { };
-    logicalRect.setLeft(contentLogicalRight());
+    logicalRect.setLeft(contentLogicalWidth());
     logicalRect.setWidth(logicalWidth);
 
@@ -265 +266 @@
     
     auto logicalRect = Display::Rect { };
-    logicalRect.setLeft(contentLogicalRight());
+    logicalRect.setLeft(contentLogicalWidth());
     logicalRect.setWidth(logicalWidth);
     if (!m_skipVerticalAligment) {
@@ -288 +289 @@
     auto logicalRect = Display::Rect { };
 
-    logicalRect.setLeft(contentLogicalRight() + horizontalMargin.start);
+    logicalRect.setLeft(contentLogicalWidth() + horizontalMargin.start);
     logicalRect.setWidth(logicalWidth);
     if (!m_skipVerticalAligment) {
@@ -309 +310 @@
 {
     auto logicalRect = Display::Rect { };
-    logicalRect.setLeft(contentLogicalRight());
+    logicalRect.setLeft(contentLogicalWidth());
     logicalRect.setWidth({ });
     if (!m_skipVerticalAligment) {