[webkit-changes] [WebKit/WebKit] d52687: [Line-clamp] Introduce RenderLayoutState::LineClamp

Alan Baradlay noreply at github.com
Thu Apr 20 09:02:01 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: d52687a88898b7ed942bedca603832ca39cf115d
      https://github.com/WebKit/WebKit/commit/d52687a88898b7ed942bedca603832ca39cf115d
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-04-20 (Thu, 20 Apr 2023)

  Changed paths:
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/page/LocalFrameViewLayoutContext.cpp
    M Source/WebCore/rendering/RenderBlockFlow.cpp
    M Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
    M Source/WebCore/rendering/RenderLayoutState.cpp
    M Source/WebCore/rendering/RenderLayoutState.h

  Log Message:
  -----------
  [Line-clamp] Introduce RenderLayoutState::LineClamp
https://bugs.webkit.org/show_bug.cgi?id=255676

Reviewed by Antti Koivisto.

Remove some code complexity by introducing this simple struct.
This is also in preparation for fixing an IFC regression on line-clamp with vertical margins.

* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::lineClamp):
(WebCore::LayoutIntegration::LineLayout::lastLineIndexForContentHeight const):
* Source/WebCore/page/LocalFrameViewLayoutContext.cpp:
(WebCore::LocalFrameViewLayoutContext::pushLayoutState):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutModernLines):
* Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::applyModernLineClamp):
* Source/WebCore/rendering/RenderLayoutState.cpp:
(WebCore::RenderLayoutState::RenderLayoutState):
* Source/WebCore/rendering/RenderLayoutState.h:
(WebCore::RenderLayoutState::setLineClamp):
(WebCore::RenderLayoutState::lineClamp const):
(WebCore::RenderLayoutState::hasLineClamp const): Deleted.
(WebCore::RenderLayoutState::setMaximumLineCountForLineClamp): Deleted.
(WebCore::RenderLayoutState::maximumLineCountForLineClamp): Deleted.
(WebCore::RenderLayoutState::setVisibleLineCountForLineClamp): Deleted.
(WebCore::RenderLayoutState::visibleLineCountForLineClamp const): Deleted.
(WebCore::RenderLayoutState::resetLineClamp): Deleted.

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




More information about the webkit-changes mailing list