Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 70721ef6b43605891aa194ed00db0a1437050848
https://github.com/WebKit/WebKit/commit/70721ef6b43605891aa194ed00db0a1437050848
Author: Alan Baradlay <[email protected]>
Date: 2022-11-20 (Sun, 20 Nov 2022)
Changed paths:
M Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
M Source/WebCore/rendering/RenderBlockFlow.cpp
M Source/WebCore/rendering/RenderLayoutState.h
Log Message:
-----------
[IFC][Integration][Line clamp] Add line clamp state to RenderLayoutState
https://bugs.webkit.org/show_bug.cgi?id=248130
Reviewed by Antti Koivisto.
Use RenderLayoutState to pass the current clamp state over to IFCs across
nested RenderBlockFlow renderers (while line-clamp is set on -webkit-box, it is
applied across the descendant block boxes).
* Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h:
(WebCore::Layout::BlockLayoutState::floatingState):
(WebCore::Layout::BlockLayoutState::BlockLayoutState):
(WebCore::Layout::BlockLayoutState::setLineClamp): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::lineClamp):
(WebCore::LayoutIntegration::LineLayout::layout):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutModernLines):
* Source/WebCore/rendering/RenderLayoutState.h:
(WebCore::RenderLayoutState::hasLineClamp const):
(WebCore::RenderLayoutState::setMaximumLineCountForLineClamp):
(WebCore::RenderLayoutState::maximumLineCountForLineClamp):
(WebCore::RenderLayoutState::setVisibleLineCountForLineClamp):
(WebCore::RenderLayoutState::visibleLineCountForLineClamp const):
Canonical link: https://commits.webkit.org/256898@main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
