Changeset 290672 in webkit

Timestamp:

Mar 1, 2022, 1:28:07 PM (5 years ago)

Author:

Alan Bujtas

Message:

[IFC][Integration] Add InlineIterator::Box::visualRect
​https://bugs.webkit.org/show_bug.cgi?id=237309

Reviewed by Antti Koivisto.

This is the final, flipped version of the box rect.

• layout/integration/InlineIteratorBox.h:

(WebCore::InlineIterator::Box::visualRect const):

• rendering/InlineBoxPainter.cpp:

(WebCore::InlineBoxPainter::paintMask):
(WebCore::InlineBoxPainter::paintDecorations):

• rendering/TextBoxPainter.cpp:

(WebCore::TextBoxPainter::computePaintRect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/InlineIteratorBox.h (modified) (2 diffs)
• rendering/InlineBoxPainter.cpp (modified) (2 diffs)
• rendering/TextBoxPainter.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-01  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Add InlineIterator::Box::visualRect
+        https://bugs.webkit.org/show_bug.cgi?id=237309
+
+        Reviewed by Antti Koivisto.
+
+        This is the final, flipped version of the box rect.
+
+        * layout/integration/InlineIteratorBox.h:
+        (WebCore::InlineIterator::Box::visualRect const):
+        * rendering/InlineBoxPainter.cpp:
+        (WebCore::InlineBoxPainter::paintMask):
+        (WebCore::InlineBoxPainter::paintDecorations):
+        * rendering/TextBoxPainter.cpp:
+        (WebCore::TextBoxPainter::computePaintRect):
+
 2022-03-01  Patrick Angle  <pangle@apple.com>
 

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

@@ -61 +61 @@
     bool isRootInlineBox() const;
 
+    FloatRect visualRect(float formattingRootSizeInBlockDirection) const;
     FloatRect visualRectIgnoringBlockDirection() const;
 
@@ -184 +185 @@
 }
 
+inline FloatRect Box::visualRect(float formattingRootSizeInBlockDirection) const
+{
+    auto visualRect = visualRectIgnoringBlockDirection();
+    if (!style().isFlippedBlocksWritingMode())
+        return visualRect;
+
+    if (style().isHorizontalWritingMode())
+        visualRect.setY(formattingRootSizeInBlockDirection - visualRect.maxY());
+    else
+        visualRect.setX(formattingRootSizeInBlockDirection - visualRect.maxX());
+    return visualRect;
+}
+
 inline FloatRect Box::visualRectIgnoringBlockDirection() const
 {

trunk/Source/WebCore/rendering/InlineBoxPainter.cpp

@@ -142 +142 @@
 
     // Move x/y to our coordinates.
-    LayoutRect localRect(m_inlineBox.visualRectIgnoringBlockDirection());
-    m_inlineBox.line()->containingBlock().flipForWritingMode(localRect);
+    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.line()->containingBlock().logicalHeight()) };
     LayoutPoint adjustedPaintOffset = m_paintOffset + localRect.location();
 
@@ -219 +218 @@
 
     // Move x/y to our coordinates.
-    LayoutRect localRect(m_inlineBox.visualRectIgnoringBlockDirection());
-    m_inlineBox.line()->containingBlock().flipForWritingMode(localRect);
-
+    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.line()->containingBlock().logicalHeight()) };
     LayoutPoint adjustedPaintoffset = m_paintOffset + localRect.location();
     GraphicsContext& context = m_paintInfo.context();

trunk/Source/WebCore/rendering/TextBoxPainter.cpp

@@ -573 +573 @@
     localPaintOffset.move(0, m_style.isHorizontalWritingMode() ? 0 : -textBox().logicalHeight());
 
-    auto locationIncludingFlipping = [&]() -> FloatPoint {
-        auto rect = textBox().visualRectIgnoringBlockDirection();
-        if (!m_style.isFlippedBlocksWritingMode())
-            return rect.location();
-        auto& block = textBox().line()->containingBlock();
-        if (block.style().isHorizontalWritingMode())
-            return { rect.x(), block.height() - rect.height() - rect.y() };
-        return { block.width() - rect.width() - rect.x(), rect.y() };
-    };
-
-    FloatPoint boxOrigin = locationIncludingFlipping();
+    auto boxOrigin = textBox().visualRect(textBox().line()->containingBlock().logicalHeight()).location();
     boxOrigin.moveBy(localPaintOffset);
     return { boxOrigin, FloatSize(textBox().logicalWidth(), textBox().logicalHeight()) };