[webkit-changes] [WebKit/WebKit] 9d09db: [LFC][IFC] Add support for "line-box-contain: inli...

Alan Baradlay noreply at github.com
Sun Oct 30 21:30:44 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9d09db431467a12f691533fd8b8f965d36414d46
      https://github.com/WebKit/WebKit/commit/9d09db431467a12f691533fd8b8f965d36414d46
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2022-10-30 (Sun, 30 Oct 2022)

  Changed paths:
    M LayoutTests/fast/block/lineboxcontain/inline-box.html
    M LayoutTests/platform/ios/fast/block/lineboxcontain/inline-box-expected.txt
    M LayoutTests/platform/ios/fast/block/lineboxcontain/inline-box-replaced-expected.txt
    M LayoutTests/platform/ios/fast/block/lineboxcontain/inline-box-vertical-expected.txt
    M LayoutTests/platform/mac/fast/block/lineboxcontain/inline-box-expected.txt
    M LayoutTests/platform/mac/fast/block/lineboxcontain/inline-box-vertical-expected.txt
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationCoverage.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/layout/layouttree/LayoutBoxGeometry.h

  Log Message:
  -----------
  [LFC][IFC] Add support for "line-box-contain: inline-box"
https://bugs.webkit.org/show_bug.cgi?id=247108

Reviewed by Antti Koivisto.

"line-box-contain: inline-box" makes the inline boxes contribute their vertical margin/border/padding to the line box height (normally they produce vertical overflow -except vertical margin which is completely ignored).

* Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h:
(WebCore::Layout::InlineLevelBox::lineBoxContain const):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::adjustInlineBoxHeightsForLineBoxContainIfApplicable):
* Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::printReason):
(WebCore::LayoutIntegration::canUseForStyle):
* Source/WebCore/layout/integration/LayoutIntegrationCoverage.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::updateInlineBoxDimensions):
* Source/WebCore/layout/layouttree/LayoutBoxGeometry.h:
(WebCore::Layout::BoxGeometry::marginBorderAndPaddingBefore const):
(WebCore::Layout::BoxGeometry::marginBorderAndPaddingAfter const):

LayoutTests/fast/block/lineboxcontain/inline-box.html: the inline-block box is incorrectly treated as replaced.

Canonical link: https://commits.webkit.org/256147@main




More information about the webkit-changes mailing list