Integrated: 8326734: text-decoration applied to <span> lost when mixed with <u> or <s>

Alexey Ivanov aivanov at openjdk.org
Fri May 24 16:33:10 UTC 2024


On Fri, 29 Mar 2024 15:32:12 GMT, Alexey Ivanov <aivanov at openjdk.org> wrote:

> The value of the [`text-decoration`](https://www.w3.org/TR/REC-CSS1/#text-decoration) CSS property is not inherited correctly in Swing. If the `<span>` element is mixed with `<u>` or `<s>`, only the value from the `style` attribute of `<span>` is applied.
> 
> The fix to this issue is not as simple as that for the previous one in PR #17659, [JDK-8323801](https://bugs.openjdk.org/browse/JDK-8323801). Even in the seemingly simple case where `<u>` is followed by `<span style='text-decoration: line-through'>`, the situation is more complex because the styles are stored in `MuxingAttributeSet` in different elements of the array.
> 
> To resolve this problem, `CSS.Attribute.TEXT_DECORATION` is treated as a special case. Indeed, it is a special case: the values set to a single `text-decoration` property should be combined across the entire tree of nested HTML elements and their styles.
> 
> So, `MuxingAttributeSet` looks for `text-decoration` in the entire array and combines all the values.
> 
> The same way, `StyleSheet` also goes up the inheritance chain by combining the current value of `text-decoration` with that from `getResolveParent`.
> 
> The `ConvertSpanAction` combines the value of `text-decoration` of adjacent `<span>` elements.
> 
> Finally, `ConvertAction` and `CharacterAction` are refactored. The `ConvertAction` class duplicated the code from `CharacterAction`. Now `ConvertAction` extends `CharacterAction` and overrides a method to provide additional handling.
> 
> Thus, [JDK-8325620](https://bugs.openjdk.org/browse/JDK-8325620) is also resolved by this PR, the action used for `<b>`, `<i>`, `<u>` is `CharacterAction` as specified.

This pull request has now been integrated.

Changeset: cd3e4c03
Author:    Alexey Ivanov <aivanov at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/cd3e4c03661f770ebeefcd3637d56589243ac0a9
Stats:     595 lines in 8 files changed: 539 ins; 32 del; 24 mod

8326734: text-decoration applied to <span> lost when mixed with <u> or <s>
8325620: HTMLReader uses ConvertAction instead of specified CharacterAction for <b>, <i>, <u>

Reviewed-by: honkar, prr

-------------

PR: https://git.openjdk.org/jdk/pull/18550


More information about the client-libs-dev mailing list