Skip to content

[Style] Adopt Style::LengthWrapper for column-gap, row-gap and text-underline-offset properties #47120

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 25, 2025
Merged

[Style] Adopt Style::LengthWrapper for column-gap, row-gap and text-underline-offset properties #47120

merged 1 commit into from
Jun 25, 2025

Conversation

weinig
Copy link
Contributor

@weinig weinig commented Jun 24, 2025 •
edited by webkit-early-warning-system
Loading

c992369

[Style] Adopt Style::LengthWrapper for column-gap, row-gap and text-underline-offset properties
https://bugs.webkit.org/show_bug.cgi?id=294906

Reviewed by Darin Adler.

Migrates the column-gap, row-gap and text-underline-offset properties
to strong style types using the new Style::LengthWrapperBase.

* Source/WebCore/CMakeLists.txt:
* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingUtils.cpp:
* Source/WebCore/page/LocalFrameView.cpp:
* Source/WebCore/rendering/LegacyInlineFlowBox.cpp:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
* Source/WebCore/rendering/RenderGrid.cpp:
* Source/WebCore/rendering/RenderMultiColumnSet.cpp:
* Source/WebCore/rendering/style/GapLength.cpp: Removed.
* Source/WebCore/rendering/style/GapLength.h: Removed.
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
* Source/WebCore/rendering/style/RenderStyleSetters.h:
* Source/WebCore/rendering/style/StyleMultiColData.h:
* Source/WebCore/rendering/style/StyleRareInheritedData.cpp:
* Source/WebCore/rendering/style/StyleRareInheritedData.h:
* Source/WebCore/rendering/style/StyleRareNonInheritedData.h:
* Source/WebCore/rendering/style/TextUnderlineOffset.h: Removed.
* Source/WebCore/style/StyleBuilderConverter.h:
* Source/WebCore/style/StyleBuilderCustom.h:
* Source/WebCore/style/StyleExtractorConverter.h:
* Source/WebCore/style/StyleExtractorSerializer.h:
* Source/WebCore/style/StyleInterpolationFunctions.h:
* Source/WebCore/style/StyleInterpolationWrappers.h:
* Source/WebCore/style/StyleResolveForDocument.cpp:
* Source/WebCore/style/values/align/StyleGapGutter.h: Added.
* Source/WebCore/style/values/text-decoration/StyleTextUnderlineOffset.cpp: Added.
* Source/WebCore/style/values/text-decoration/StyleTextUnderlineOffset.h: Added.

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

151184d

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
  🧪 ios-wk2-wpt ✅ 🧪 mac-wk1   🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision   🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ❌ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@weinig weinig self-assigned this Jun 24, 2025
@weinig weinig added the CSS Cascading Style Sheets implementation label Jun 24, 2025
@webkit-early-warning-system

This comment was marked as outdated.

Sign in to view
@weinig weinig changed the title [Style] [Style] Adopt Style::LengthWrapper for column-gap, row-gap and text-underline-offset properties Jun 24, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025
@weinig weinig removed the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025
@weinig weinig force-pushed the eng/more-adoption-of-length-wrapper-base branch from 70675b0 to 81abcef Compare June 24, 2025 18:24
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jun 24, 2025 •
edited
Loading

EWS run on previous version of this PR (hash 81abcef)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ❌ 🛠 wpe ❌ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ❌ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ❌ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ❌ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ❌ 🛠 gtk
✅ 🛠 vision   🧪 mac-AS-debug-wk2 ❌ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ❌ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ❌ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@weinig weinig marked this pull request as ready for review June 24, 2025 18:24
@weinig weinig requested a review from cdumez as a code owner June 24, 2025 18:24
@weinig weinig requested review from anttijk and darinadler June 24, 2025 18:25
darinadler
darinadler approved these changes Jun 24, 2025
View reviewed changes
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025
@webkit-ews-buildbot
Copy link
Collaborator

Safer C++ Build #41402 (70675b0)

⚠️ Found 1 fixed file! Please update expectations in Source/[Project]/SaferCPPExpectations by running the following command and update your pull request:

  • Tools/Scripts/update-safer-cpp-expectations -p WebCore --NoUncheckedPtrMemberChecker rendering/BidiRun.h

@weinig weinig removed the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025
@weinig weinig force-pushed the eng/more-adoption-of-length-wrapper-base branch from 81abcef to d7ca0f8 Compare June 24, 2025 21:16
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jun 24, 2025 •
edited
Loading

EWS run on previous version of this PR (hash d7ca0f8)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ❌ 🛠 ios ❌ 🛠 mac ❌ 🛠 wpe ❌ 🛠 win
✅ 🧪 bindings ❌ 🛠 ios-sim ❌ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ❌ 🧪 win-tests
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ❌ 🧪 api-mac ❌ 🧪 api-wpe
❌ 🧪 ios-wk2-wpt ❌ 🧪 mac-wk1 ❌ 🛠 wpe-cairo
❌ 🧪 api-ios ❌ 🧪 mac-wk2 ❌ 🛠 gtk
❌ 🛠 vision ❌ 🧪 mac-AS-debug-wk2 ❌ 🧪 gtk-wk2
❌ 🛠 vision-sim ❌ 🧪 mac-wk2-stress ❌ 🧪 api-gtk
⏳ 🧪 vision-wk2 ❌ 🧪 mac-intel-wk2 ❌ 🛠 playstation
❌ 🛠 tv ❌ 🛠 mac-safer-cpp
❌ 🛠 tv-sim
❌ 🛠 watch
❌ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025
@webkit-ews-buildbot
Copy link
Collaborator

Safer C++ Build #41422 (81abcef)

⚠️ Found 1 fixed file! Please update expectations in Source/[Project]/SaferCPPExpectations by running the following command and update your pull request:

  • Tools/Scripts/update-safer-cpp-expectations -p WebCore --NoUncheckedPtrMemberChecker rendering/BidiRun.h

@weinig weinig removed the merging-blocked Applied to prevent a change from being merged label Jun 25, 2025
@weinig weinig force-pushed the eng/more-adoption-of-length-wrapper-base branch from d7ca0f8 to 151184d Compare June 25, 2025 19:04
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jun 25, 2025 •
edited
Loading

EWS run on current version of this PR (hash 151184d)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2   🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
  🧪 ios-wk2-wpt ✅ 🧪 mac-wk1   🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision   🧪 mac-AS-debug-wk2   🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ❌ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@weinig weinig added the merge-queue Applied to send a pull request to merge-queue label Jun 25, 2025
@weinig
[Style] Adopt Style::LengthWrapper for column-gap, row-gap and text-u…
c992369 
…nderline-offset properties

https://bugs.webkit.org/show_bug.cgi?id=294906

Reviewed by Darin Adler.

Migrates the column-gap, row-gap and text-underline-offset properties
to strong style types using the new Style::LengthWrapperBase.

* Source/WebCore/CMakeLists.txt:
* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingUtils.cpp:
* Source/WebCore/page/LocalFrameView.cpp:
* Source/WebCore/rendering/LegacyInlineFlowBox.cpp:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
* Source/WebCore/rendering/RenderFlexibleBox.cpp:
* Source/WebCore/rendering/RenderGrid.cpp:
* Source/WebCore/rendering/RenderMultiColumnSet.cpp:
* Source/WebCore/rendering/style/GapLength.cpp: Removed.
* Source/WebCore/rendering/style/GapLength.h: Removed.
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
* Source/WebCore/rendering/style/RenderStyleSetters.h:
* Source/WebCore/rendering/style/StyleMultiColData.h:
* Source/WebCore/rendering/style/StyleRareInheritedData.cpp:
* Source/WebCore/rendering/style/StyleRareInheritedData.h:
* Source/WebCore/rendering/style/StyleRareNonInheritedData.h:
* Source/WebCore/rendering/style/TextUnderlineOffset.h: Removed.
* Source/WebCore/style/StyleBuilderConverter.h:
* Source/WebCore/style/StyleBuilderCustom.h:
* Source/WebCore/style/StyleExtractorConverter.h:
* Source/WebCore/style/StyleExtractorSerializer.h:
* Source/WebCore/style/StyleInterpolationFunctions.h:
* Source/WebCore/style/StyleInterpolationWrappers.h:
* Source/WebCore/style/StyleResolveForDocument.cpp:
* Source/WebCore/style/values/align/StyleGapGutter.h: Added.
* Source/WebCore/style/values/text-decoration/StyleTextUnderlineOffset.cpp: Added.
* Source/WebCore/style/values/text-decoration/StyleTextUnderlineOffset.h: Added.

Canonical link: https://commits.webkit.org/296630@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/more-adoption-of-length-wrapper-base branch from 151184d to c992369 Compare June 25, 2025 20:15
@webkit-commit-queue
Copy link
Collaborator

Committed 296630@main (c992369): https://commits.webkit.org/296630@main

Reviewed commits have been landed. Closing PR #47120 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit c992369 into WebKit:main Jun 25, 2025
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 25, 2025
@rkirsling
Copy link
Member

This again was landed with PlayStation EWS reporting ❌, though thankfully it's been reverted for other reasons.

@weinig
Copy link
Contributor Author

weinig commented Jun 26, 2025

This again was landed with PlayStation EWS reporting ❌, though thankfully it's been reverted for other reasons.

@rkirsling In this case, it looks like the PlayStation EWS was unable to checkout the branch. Is that an infrastructure issue?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darinadler darinadler darinadler approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

@anttijk anttijk Awaiting requested review from anttijk

Assignees

@weinig weinig

Labels
CSS Cascading Style Sheets implementation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@weinig @webkit-early-warning-system @webkit-ews-buildbot @webkit-commit-queue @rkirsling @darinadler