Changeset 269825 in webkit

Timestamp:

Nov 15, 2020 6:23:23 AM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][Geometry] Add support for horizontal/vertical scrollbar spacing
​https://bugs.webkit.org/show_bug.cgi?id=218950

Reviewed by Antti Koivisto.

Let's make room for visible scrollbars between the border and the padding box.

• layout/integration/LayoutIntegrationLineLayout.cpp:

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

• layout/layouttree/LayoutBoxGeometry.cpp:

(WebCore::Layout::BoxGeometry::BoxGeometry):
(WebCore::Layout::BoxGeometry::paddingBox const):

• layout/layouttree/LayoutBoxGeometry.h:

(WebCore::Layout::BoxGeometry::borderBoxHeight const):
(WebCore::Layout::BoxGeometry::borderBoxWidth const):
(WebCore::Layout::BoxGeometry::verticalScrollbarWidth const):
(WebCore::Layout::BoxGeometry::horizontalScrollbarHeight const):
(WebCore::Layout::BoxGeometry::setVerticalScrollbarWidth):
(WebCore::Layout::BoxGeometry::setHorizontalScrollbarHeight):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)
• layout/layouttree/LayoutBoxGeometry.cpp (modified) (2 diffs)
• layout/layouttree/LayoutBoxGeometry.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-15  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Geometry] Add support for horizontal/vertical scrollbar spacing
+        https://bugs.webkit.org/show_bug.cgi?id=218950
+
+        Reviewed by Antti Koivisto.
+
+        Let's make room for visible scrollbars between the border and the padding box.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateLayoutBoxDimensions):
+        * layout/layouttree/LayoutBoxGeometry.cpp:
+        (WebCore::Layout::BoxGeometry::BoxGeometry):
+        (WebCore::Layout::BoxGeometry::paddingBox const):
+        * layout/layouttree/LayoutBoxGeometry.h:
+        (WebCore::Layout::BoxGeometry::borderBoxHeight const):
+        (WebCore::Layout::BoxGeometry::borderBoxWidth const):
+        (WebCore::Layout::BoxGeometry::verticalScrollbarWidth const):
+        (WebCore::Layout::BoxGeometry::horizontalScrollbarHeight const):
+        (WebCore::Layout::BoxGeometry::setVerticalScrollbarWidth):
+        (WebCore::Layout::BoxGeometry::setHorizontalScrollbarHeight):
+
 2020-11-15  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -128 +128 @@
     replacedBox.setContentSizeForIntegration({ replacedOrInlineBlock.contentWidth(), replacedOrInlineBlock.contentHeight() });
 
+    auto& replacedBoxGeometry = m_layoutState.ensureGeometryForBox(replacedBox);
+    replacedBoxGeometry.setVerticalScrollbarWidth(replacedOrInlineBlock.verticalScrollbarWidth());
+    replacedBoxGeometry.setHorizontalScrollbarHeight(replacedOrInlineBlock.horizontalScrollbarHeight());
+
     auto baseline = replacedOrInlineBlock.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);
     replacedBox.setBaseline(baseline);

trunk/Source/WebCore/layout/layouttree/LayoutBoxGeometry.cpp

@@ -44 +44 @@
     , m_border(other.m_border)
     , m_padding(other.m_padding)
+    , m_verticalScrollbarWidth(other.m_verticalScrollbarWidth)
+    , m_horizontalScrollbarHeight(other.m_horizontalScrollbarHeight)
 #if ASSERT_ENABLED
     , m_hasValidTop(other.m_hasValidTop)
@@ -89 +91 @@
     paddingBox.setTop(borderBox.top() + borderTop());
     paddingBox.setLeft(borderBox.left() + borderLeft());
-    paddingBox.setHeight(borderBox.bottom() - borderTop() - borderBottom());
-    paddingBox.setWidth(borderBox.width() - borderLeft() - borderRight());
+    paddingBox.setHeight(borderBox.bottom() - horizontalScrollbarHeight() - borderBottom() - borderTop());
+    paddingBox.setWidth(borderBox.width() - borderRight() - verticalScrollbarWidth() - borderLeft());
     return paddingBox;
 }

trunk/Source/WebCore/layout/layouttree/LayoutBoxGeometry.h

@@ -92 +92 @@
     LayoutUnit paddingBoxWidth() const { return paddingLeft().valueOr(0) + contentBoxWidth() + paddingRight().valueOr(0); }
 
-    LayoutUnit borderBoxHeight() const { return borderTop() + paddingBoxHeight() + borderBottom(); }
-    LayoutUnit borderBoxWidth() const { return borderLeft() + paddingBoxWidth() + borderRight(); }
+    LayoutUnit borderBoxHeight() const { return borderTop() + paddingBoxHeight() + horizontalScrollbarHeight() + borderBottom(); }
+    LayoutUnit borderBoxWidth() const { return borderLeft() + paddingBoxWidth() + verticalScrollbarWidth() + borderRight(); }
     LayoutUnit marginBoxHeight() const { return marginBefore() + borderBoxHeight() + marginAfter(); }
     LayoutUnit marginBoxWidth() const { return marginStart() + borderBoxWidth() + marginEnd(); }
@@ -99 +99 @@
     LayoutUnit verticalMarginBorderAndPadding() const { return marginBefore() + verticalBorder() + verticalPadding().valueOr(0) + marginAfter(); }
     LayoutUnit horizontalMarginBorderAndPadding() const { return marginStart() + horizontalBorder() + horizontalPadding().valueOr(0) + marginEnd(); }
+
+    LayoutUnit verticalScrollbarWidth() const { return m_verticalScrollbarWidth; }
+    LayoutUnit horizontalScrollbarHeight() const { return m_horizontalScrollbarHeight; }
 
     Rect marginBox() const;
@@ -128 +131 @@
     void setPadding(Optional<Layout::Edges>);
 
+    void setVerticalScrollbarWidth(LayoutUnit width) { m_verticalScrollbarWidth = width; }
+    void setHorizontalScrollbarHeight(LayoutUnit height) { m_horizontalScrollbarHeight = height; }
+
 private:
     LayoutUnit logicalTop() const;
@@ -160 +166 @@
     Layout::Edges m_border;
     Optional<Layout::Edges> m_padding;
+
+    LayoutUnit m_verticalScrollbarWidth;
+    LayoutUnit m_horizontalScrollbarHeight;
 
 #if ASSERT_ENABLED