Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: d9d710f8884420dee907e8117e1dcdedeb8b06fc
      
https://github.com/WebKit/WebKit/commit/d9d710f8884420dee907e8117e1dcdedeb8b06fc
  Author: Alan Baradlay <[email protected]>
  Date:   2024-10-20 (Sun, 20 Oct 2024)

  Changed paths:
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002-expected.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002-ref.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003-expected.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003-ref.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004-expected.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004-ref.html
    A 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004.html
    M Source/WebCore/rendering/TextBoxTrimmer.cpp
    M Source/WebCore/rendering/TextBoxTrimmer.h

  Log Message:
  -----------
  [text-box-trim] Do not override propagated text-box-trim values
https://bugs.webkit.org/show_bug.cgi?id=281773
<rdar://problem/138207115>

Reviewed by Antti Koivisto.

As text-box-trim values are getting trickled down to descendant block 
containers,
such descendant containers should not overwrite propagated values but merge 
them with their own.

e.g.
<block container outer 'text-box-trim: trim-start'>
  <block container middle 'text-box-trim: trim-none'>
    <block container inner 'text-box-trim: trim-end'>
      first and last formatted line

'first and last formatted line' gets trimmed on both sides as 'start' side is 
trimmed by
'outer' while the 'end' side is trimmed by 'inner'
(as opposed to overwriting the used value of 'text-box-trim' with 'trim-end' at 
'inner')

Take the existing text-box-trim value into account (merge) when setting the 
current 'text-box-trim' value on layout state.

* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002-expected.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002-ref.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-002.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003-expected.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003-ref.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-003.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004-expected.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004-ref.html:
 Added.
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-accumulation-004.html:
 Added.
* Source/WebCore/rendering/TextBoxTrimmer.cpp:
(WebCore::TextBoxTrimmer::adjustTextBoxTrimStatusBeforeLayout):
(WebCore::TextBoxTrimmer::handleTextBoxTrimNoneBeforeLayout):
(WebCore::TextBoxTrimmer::handlePropagatedTextBoxTrimBeforeLayout): Deleted.
* Source/WebCore/rendering/TextBoxTrimmer.h:

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



To unsubscribe from these emails, change your notification settings at 
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to