Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CSS] Unprefix text-decoration shorthand #23121

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

mdubet
Copy link
Contributor

@mdubet mdubet commented Jan 23, 2024

2cd03bd

[CSS] Unprefix text-decoration shorthand
https://bugs.webkit.org/show_bug.cgi?id=230083
rdar://83182835

 Reviewed by NOBODY (OOPS!).

 Explanation of why this fixes the bug (OOPS!).

* LayoutTests/TestExpectations:
* LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration-expected.txt:
* LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration.html:
* LayoutTests/fast/css/style-enumerate-properties-expected.txt:
* LayoutTests/fast/css/style-enumerate-properties.html:
* LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-expected.txt:
* LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html:
* LayoutTests/fast/events/input-events-paste-rich-datatransfer-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/first-letter-allowed-properties-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/first-line-allowed-properties-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-shorthand-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-valid-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/inserttext_2001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_4001-5000-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_8001-9000-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_9001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/strikethrough_2001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/underline_2001-last-expected.txt:
* Source/WebCore/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle const):
(WebCore::ComputedStyleExtractor::textDecorationShorthandValue const):
* Source/WebCore/css/ComputedStyleExtractor.h:
* Source/WebCore/css/MutableStyleProperties.cpp:
(WebCore::MutableStyleProperties::setProperty):
* Source/WebCore/css/MutableStyleProperties.h:
* Source/WebCore/css/ShorthandSerializer.cpp:
(WebCore::ShorthandSerializer::serialize):
* Source/WebCore/css/StyleProperties.cpp:
(WebCore::canUseShorthandForLonghand):
* Source/WebCore/css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseShorthand):
* Source/WebCore/editing/EditingStyle.cpp:
(WebCore::HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent):
(WebCore::EditingStyle::init):
(WebCore::EditingStyle::styleWithResolvedTextDecorations const):
(WebCore::EditingStyle::collapseTextDecorationProperties):
(WebCore::EditingStyle::conflictsWithInlineStyleOfElement const):
(WebCore::EditingStyle::mergeStyle):
(WebCore::EditingStyle::removeEquivalentProperties):
(WebCore::reconcileTextDecorationProperties):
(WebCore::StyleChange::StyleChange):
(WebCore::setTextDecorationProperty):
(WebCore::StyleChange::extractTextStyles):
(WebCore::diffTextDecorations):
* Source/WebCore/editing/markup.cpp:
(WebCore::serializePreservingVisualAppearanceInternal):

2cd03bd

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  wpe-skia
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ›  gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  tv-sim βœ… πŸ§ͺ mac-wk2-stress βœ… πŸ§ͺ api-gtk
βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@mdubet mdubet self-assigned this Jan 23, 2024
@mdubet mdubet added the CSS Cascading Style Sheets implementation label Jan 23, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 040ff91 to 016917f Compare January 23, 2024 21:57
Copy link
Contributor

@Loirooriol Loirooriol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't looked in detail, but this seems similar to 5425a41, which was reverted in https://bugs.webkit.org/show_bug.cgi?id=237412 for perf reasons.

Are you addressing that in a particular way, or just hoping that it will work this time?

Source/WebCore/editing/markup.cpp Outdated Show resolved Hide resolved
Source/WebCore/editing/EditingStyle.cpp Outdated Show resolved Hide resolved
Source/WebCore/editing/EditingStyle.cpp Outdated Show resolved Hide resolved
@mdubet
Copy link
Contributor Author

mdubet commented Jan 23, 2024

It's a draft, it's not ready for review yet.

For the perf issue, hopefully the early return should mitigate this (here https://github.com/WebKit/WebKit/pull/23121/files#diff-95930edb6b781ea4a9c186c448fbcf9a40b69ff535c822c96c284a67fb81a89aR1524 )

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 24, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Jan 24, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch 2 times, most recently from 5c32c1b to c3033e9 Compare January 24, 2024 22:39
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 25, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Jan 26, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from c3033e9 to 3b84c58 Compare January 26, 2024 01:03
@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for 3b84c58. Live statuses available at the PR page, #23121

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 26, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Jan 26, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 3b84c58 to 024cfc1 Compare January 26, 2024 20:14
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 26, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Jan 30, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 024cfc1 to 8d36b35 Compare January 30, 2024 00:22
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 30, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 13, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 6fbd584 to 06afee1 Compare March 13, 2024 01:49
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 13, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 06afee1 to 7bb6f2e Compare March 13, 2024 16:51
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 13, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 13, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 7bb6f2e to 697eacd Compare March 13, 2024 18:38
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 13, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 14, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 697eacd to 3093d70 Compare March 14, 2024 01:48
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 14, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 14, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 3093d70 to 687d9a2 Compare March 14, 2024 22:41
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 15, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 15, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from 687d9a2 to f2d3912 Compare March 15, 2024 18:33
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 15, 2024
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 25, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from f2d3912 to edf61d5 Compare March 25, 2024 18:32
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 25, 2024
https://bugs.webkit.org/show_bug.cgi?id=230083
rdar://83182835

 Reviewed by NOBODY (OOPS!).

 Explanation of why this fixes the bug (OOPS!).

* LayoutTests/TestExpectations:
* LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration-expected.txt:
* LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration.html:
* LayoutTests/fast/css/style-enumerate-properties-expected.txt:
* LayoutTests/fast/css/style-enumerate-properties.html:
* LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-expected.txt:
* LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html:
* LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html:
* LayoutTests/fast/events/input-events-paste-rich-datatransfer-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/first-letter-allowed-properties-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/first-line-allowed-properties-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-shorthand-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/parsing/text-decoration-valid-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/inserttext_2001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_4001-5000-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_8001-9000-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/multitest_9001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/strikethrough_2001-last-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/underline_2001-last-expected.txt:
* Source/WebCore/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle const):
(WebCore::ComputedStyleExtractor::textDecorationShorthandValue const):
* Source/WebCore/css/ComputedStyleExtractor.h:
* Source/WebCore/css/MutableStyleProperties.cpp:
(WebCore::MutableStyleProperties::setProperty):
* Source/WebCore/css/MutableStyleProperties.h:
* Source/WebCore/css/ShorthandSerializer.cpp:
(WebCore::ShorthandSerializer::serialize):
* Source/WebCore/css/StyleProperties.cpp:
(WebCore::canUseShorthandForLonghand):
* Source/WebCore/css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseShorthand):
* Source/WebCore/editing/EditingStyle.cpp:
(WebCore::HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent):
(WebCore::EditingStyle::init):
(WebCore::EditingStyle::styleWithResolvedTextDecorations const):
(WebCore::EditingStyle::collapseTextDecorationProperties):
(WebCore::EditingStyle::conflictsWithInlineStyleOfElement const):
(WebCore::EditingStyle::mergeStyle):
(WebCore::EditingStyle::removeEquivalentProperties):
(WebCore::reconcileTextDecorationProperties):
(WebCore::StyleChange::StyleChange):
(WebCore::setTextDecorationProperty):
(WebCore::StyleChange::extractTextStyles):
(WebCore::diffTextDecorations):
* Source/WebCore/editing/markup.cpp:
(WebCore::serializePreservingVisualAppearanceInternal):
@mdubet mdubet removed the merging-blocked Applied to prevent a change from being merged label Mar 26, 2024
@mdubet mdubet force-pushed the unprefix-text-decoration-single-commit branch from edf61d5 to 2cd03bd Compare March 26, 2024 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CSS Cascading Style Sheets implementation
Projects
None yet
5 participants