Changeset 276135 in webkit

Timestamp:

Apr 16, 2021, 6:35:08 AM (5 years ago)

Author:

Alan Bujtas

Message:

[IFC] Incorrect box height when scrollbar takes padding box space
​https://bugs.webkit.org/show_bug.cgi?id=224546
<rdar://problem/76666402>

Reviewed by Antti Koivisto.

Source/WebCore:

This patch fixes the case when a non-overlay scrollbar can't be accomodated in the padding/content box area (e.g <div style="height: 10px; overflow: scroll">...)
In the legacy render tree the non-overlay scrollbar size is already taken into account when calling RenderBox::contentWidth/Height (paddingBoxHeight/Width), so
we just have to check how much space they actully take (currently maximum of 15px).

Test: fast/inline-block/non-overlay-scrollbar-incorrect-padding.html

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::updateLayoutBoxDimensions):

LayoutTests:

• fast/inline-block/non-overlay-scrollbar-incorrect-padding-expected.txt: Added.
• fast/inline-block/non-overlay-scrollbar-incorrect-padding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline-block/non-overlay-scrollbar-incorrect-padding-expected.txt (added)
• LayoutTests/fast/inline-block/non-overlay-scrollbar-incorrect-padding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-16  Zalan Bujtas  <zalan@apple.com>
+
+        [IFC] Incorrect box height when scrollbar takes padding box space
+        https://bugs.webkit.org/show_bug.cgi?id=224546
+        <rdar://problem/76666402>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline-block/non-overlay-scrollbar-incorrect-padding-expected.txt: Added.
+        * fast/inline-block/non-overlay-scrollbar-incorrect-padding.html: Added.
+
 2021-04-16  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-16  Zalan Bujtas  <zalan@apple.com>
+
+        [IFC] Incorrect box height when scrollbar takes padding box space
+        https://bugs.webkit.org/show_bug.cgi?id=224546
+        <rdar://problem/76666402>
+
+        Reviewed by Antti Koivisto.
+
+        This patch fixes the case when a non-overlay scrollbar can't be accomodated in the padding/content box area (e.g <div style="height: 10px; overflow: scroll">...)
+        In the legacy render tree the non-overlay scrollbar size is already taken into account when calling RenderBox::contentWidth/Height (paddingBoxHeight/Width), so
+        we just have to check how much space they actully take (currently maximum of 15px).
+
+        Test: fast/inline-block/non-overlay-scrollbar-incorrect-padding.html
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateLayoutBoxDimensions):
+
 2021-04-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -146 +146 @@
     // Always use the physical size here for inline level boxes (this is where the logical vs. physical coords flip happens).
     auto& replacedBoxGeometry = m_layoutState.ensureGeometryForBox(replacedBox);
-    // Scrollbars are placed "between" the border and the padding box and they never stretch the border box. They may shrink the padding box though.
-    auto horizontalSpaceReservedForScrollbar = std::min(replacedOrInlineBlock.width() - replacedOrInlineBlock.paddingBoxWidth(), LayoutUnit(replacedOrInlineBlock.verticalScrollbarWidth()));
+
+    // Scrollbars eat into the padding box area. They never stretch the border box but they may shrink the padding box.
+    // In legacy render tree, RenderBox::contentWidth/contentHeight values are adjusted to accomodate the scrollbar width/height.
+    // e.g. <div style="width: 10px; overflow: scroll;">content</div>, RenderBox::contentWidth() won't be returning the value of 10px but instead 0px (10px - 15px).
+    auto horizontalSpaceReservedForScrollbar = replacedOrInlineBlock.paddingBoxRectIncludingScrollbar().width() - replacedOrInlineBlock.paddingBoxWidth();
     replacedBoxGeometry.setHorizontalSpaceForScrollbar(horizontalSpaceReservedForScrollbar);
 
-    auto verticalSpaceReservedForScrollbar = std::min(replacedOrInlineBlock.height() - replacedOrInlineBlock.paddingBoxHeight(), LayoutUnit(replacedOrInlineBlock.horizontalScrollbarHeight()));
+    auto verticalSpaceReservedForScrollbar = replacedOrInlineBlock.paddingBoxRectIncludingScrollbar().height() - replacedOrInlineBlock.paddingBoxHeight();
     replacedBoxGeometry.setVerticalSpaceForScrollbar(verticalSpaceReservedForScrollbar);