[webkit-changes] [WebKit/WebKit] 34e6ff: [IFC][Line grid] Implement -webkit-line-snap

Antti Koivisto noreply at github.com
Wed Oct 4 12:18:45 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 34e6ff8e9195fcced456c6da082d86e94f9c255e
      https://github.com/WebKit/WebKit/commit/34e6ff8e9195fcced456c6da082d86e94f9c255e
  Author: Antti Koivisto <antti at apple.com>
  Date:   2023-10-04 (Wed, 04 Oct 2023)

  Changed paths:
    M LayoutTests/platform/ios/fast/line-grid/line-grid-contains-value-expected.txt
    M LayoutTests/platform/ios/fast/line-grid/line-grid-floating-expected.txt
    M LayoutTests/platform/ios/fast/line-grid/line-grid-inside-columns-expected.txt
    M LayoutTests/platform/ios/fast/line-grid/line-grid-into-columns-expected.txt
    M LayoutTests/platform/ios/fast/line-grid/line-grid-into-floats-expected.txt
    M LayoutTests/platform/ios/fast/line-grid/line-grid-positioned-expected.txt
    M LayoutTests/platform/mac/fast/line-grid/line-grid-contains-value-expected.txt
    M LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.txt
    M LayoutTests/platform/wpe/TestExpectations
    M Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h
    M Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineQuirks.h
    M Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.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/integration/inline/LayoutIntegrationLineLayout.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.h

  Log Message:
  -----------
  [IFC][Line grid] Implement -webkit-line-snap
https://bugs.webkit.org/show_bug.cgi?id=262615
<rdar://problem/116460973>

Reviewed by Alan Baradlay.

This legacy property adjust line positions so they snap to a grid.
The patch implements it for IFC by porting some legacy code.

* LayoutTests/platform/mac/fast/line-grid/line-grid-contains-value-expected.txt:
* LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.txt:
* Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h:
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::build):

Apply the line snap adjustment if needed.

(WebCore::Layout::LineBoxBuilder::expandAboveRootInlineBox const):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h:
* Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp:
(WebCore::Layout::InlineQuirks::adjustedRectForLineGridLineAlign const):
(WebCore::Layout::InlineQuirks::adjustmentForLineGridLineSnap const):

Compute the adjustment. This is based on LegacyRootInlineBox::lineSnapAdjustment code.

* Source/WebCore/layout/formattingContexts/inline/InlineQuirks.h:
* Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.cpp:
(WebCore::Layout::TextOnlySimpleLineBuilder::isEligibleForSimplifiedTextOnlyInlineLayout):

Not eglible for the simplified builder.

* Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
(WebCore::LayoutIntegration::canUseForBlockStyle): Deleted.

Enable in IFC.

* Source/WebCore/layout/integration/LayoutIntegrationCoverage.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::lineGrid):

Pass more data in LineGrid struct.

(WebCore::LayoutIntegration::LineLayout::layout):
(WebCore::LayoutIntegration::LineLayout::adjustContent):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp:
(WebCore::LayoutIntegration::computeFirstLineSnapAdjustment):
(WebCore::LayoutIntegration::computeAdjustmentsForPagination):

Deal with snapping the first line that gets paginated to a new page.

* Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.h:

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




More information about the webkit-changes mailing list