Changeset 270049 in webkit

Timestamp:

Nov 19, 2020 1:37:08 PM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Do not stretch the border box with the scrollbars
​https://bugs.webkit.org/show_bug.cgi?id=219174

Reviewed by Antti Koivisto.

Scrollbars are placed "between" the border and the padding box and they never stretch the border box. They may shrink the padding box though.

• layout/integration/LayoutIntegrationLineLayout.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Do not stretch the border box with the scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=219174
+
+        Reviewed by Antti Koivisto.
+
+        Scrollbars are placed "between" the border and the padding box and they never stretch the border box. They may shrink the padding box though.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateLayoutBoxDimensions):
+
 2020-11-19  Chris Dumez  <cdumez@apple.com>
 

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

@@ -129 +129 @@
 
     auto& replacedBoxGeometry = m_layoutState.ensureGeometryForBox(replacedBox);
-    replacedBoxGeometry.setVerticalScrollbarWidth(replacedOrInlineBlock.verticalScrollbarWidth());
-    replacedBoxGeometry.setHorizontalScrollbarHeight(replacedOrInlineBlock.horizontalScrollbarHeight());
+    // 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()));
+    replacedBoxGeometry.setVerticalScrollbarWidth(horizontalSpaceReservedForScrollbar);
+
+    auto verticalSpaceReservedForScrollbar = std::min(replacedOrInlineBlock.height() - replacedOrInlineBlock.paddingBoxHeight(), LayoutUnit(replacedOrInlineBlock.horizontalScrollbarHeight()));
+    replacedBoxGeometry.setHorizontalScrollbarHeight(verticalSpaceReservedForScrollbar);
 
     auto baseline = replacedOrInlineBlock.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);