Changeset 295715 in webkit

Timestamp:

Jun 21, 2022, 7:41:14 PM (3 years ago)

Author:

Alan Bujtas

Message:

RenderBox::hasHorizontalLayoutOverflow/hasVerticalLayoutOverflow use incorrect coordinate space
​https://bugs.webkit.org/show_bug.cgi?id=241796

Reviewed by Simon Fraser.

RenderBox::x() and y() are in the coordinate space of the containing block while layoutOverflowRect is relative to the box's border box. These functions would compute overflow true if the box happens to have some offset (through margin or positioning) even without actual overflow.

• LayoutTests/fast/overflow/horizontal-overflow-with-offset-expected.txt: Added.
• LayoutTests/fast/overflow/horizontal-overflow-with-offset.html: Added.
• LayoutTests/fast/overflow/vertical-overflow-with-offset-expected.txt: Added.
• LayoutTests/fast/overflow/vertical-overflow-with-offset.html: Added.
• Source/WebCore/rendering/RenderBox.h:

(WebCore::RenderBox::hasHorizontalLayoutOverflow const):
(WebCore::RenderBox::hasVerticalLayoutOverflow const):

Canonical link: ​https://commits.webkit.org/251720@main

Location:

trunk

Files:

• LayoutTests/fast/overflow/horizontal-overflow-with-offset-expected.txt (added)
• LayoutTests/fast/overflow/horizontal-overflow-with-offset.html (added)
• LayoutTests/fast/overflow/vertical-overflow-with-offset-expected.txt (added)
• LayoutTests/fast/overflow/vertical-overflow-with-offset.html (added)
• Source/WebCore/rendering/RenderBox.h (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderBox.h

@@ -626 +626 @@
             return false;
 
-        LayoutRect layoutOverflowRect = m_overflow->layoutOverflowRect();
-        flipForWritingMode(layoutOverflowRect);
-        return layoutOverflowRect.x() < x() || layoutOverflowRect.maxX() > x() + logicalWidth();
+        auto layoutOverflowRect = m_overflow->layoutOverflowRect();
+        auto paddingBoxRect = flippedClientBoxRect();
+        return layoutOverflowRect.x() < paddingBoxRect.x() || layoutOverflowRect.maxX() > paddingBoxRect.maxX();
     }
 
@@ -636 +636 @@
             return false;
 
-        LayoutRect layoutOverflowRect = m_overflow->layoutOverflowRect();
-        flipForWritingMode(layoutOverflowRect);
-        return layoutOverflowRect.y() < y() || layoutOverflowRect.maxY() > y() + logicalHeight();
+        auto layoutOverflowRect = m_overflow->layoutOverflowRect();
+        auto paddingBoxRect = flippedClientBoxRect();
+        return layoutOverflowRect.y() < paddingBoxRect.y() || layoutOverflowRect.maxY() > paddingBoxRect.maxY();
     }