Skip to content

[::marker] Factor list item marker contents into a struct#37170

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
nt1m:eng/marker-Factor-list-item-marker-contents-into-a-struct
Nov 27, 2024
Merged

[::marker] Factor list item marker contents into a struct#37170
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
nt1m:eng/marker-Factor-list-item-marker-contents-into-a-struct

Conversation

@nt1m
Copy link
Copy Markdown
Member

@nt1m nt1m commented Nov 26, 2024

4881552

[::marker] Factor list item marker contents into a struct
https://bugs.webkit.org/show_bug.cgi?id=283730
rdar://140595246

Reviewed by Dan Glastonbury.

Factor them into a struct to make it easier to move out painting/content code from RenderListMarker.

Also store the suffix + textWithoutSuffix, instead of generating substrings in various places.

* Source/WebCore/accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::stringValue const):
* Source/WebCore/rendering/RenderListItem.cpp:
(WebCore::RenderListItem::markerTextWithoutSuffix const):
(WebCore::RenderListItem::markerTextWithSuffix const):
* Source/WebCore/rendering/RenderListItem.h:
* Source/WebCore/rendering/RenderListMarker.cpp:
(WebCore::textRunForContent):
(WebCore::RenderListMarker::paint):
(WebCore::RenderListMarker::updateContent):
(WebCore::RenderListMarker::computePreferredLogicalWidths):
(WebCore::RenderListMarker::updateMargins):
(WebCore::RenderListMarker::relativeMarkerRect):
(WebCore::RenderListMarker::TextRunWithUnderlyingString::operator const TextRun& const): Deleted.
(WebCore::RenderListMarker::textRun const): Deleted.
(WebCore::RenderListMarker::textWithoutSuffix const): Deleted.
* Source/WebCore/rendering/RenderListMarker.h:
(WebCore::ListMarkerTextContent::isEmpty const):
(WebCore::ListMarkerTextContent::textWithSuffix const):
* Source/WebCore/rendering/RenderTreeAsText.cpp:
(WebCore::RenderTreeAsText::writeRenderObject):
(WebCore::markerTextForListItem):

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

0c63f98

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
✅ 🛠 tv ❌ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@nt1m nt1m self-assigned this Nov 26, 2024
@nt1m nt1m added the Layout and Rendering For bugs with layout and rendering of Web pages. label Nov 26, 2024
@nt1m nt1m requested a review from alanbaradlay November 26, 2024 22:16
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from f49d75c to b6af753 Compare November 26, 2024 22:22
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from b6af753 to d7c863e Compare November 26, 2024 23:26
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from d7c863e to f7f0ce4 Compare November 26, 2024 23:29
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from f7f0ce4 to 9c2eceb Compare November 26, 2024 23:34
Copy link
Copy Markdown
Member

@darinadler darinadler left a comment

Choose a reason for hiding this comment

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

Storing the text as two separate strings causes a problem.

@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from 9c2eceb to eff1790 Compare November 26, 2024 23:38
@nt1m nt1m requested a review from darinadler November 26, 2024 23:47
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from eff1790 to e349a63 Compare November 26, 2024 23:48
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from e349a63 to 6e39997 Compare November 26, 2024 23:56
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from 6e39997 to 53eae61 Compare November 27, 2024 00:00
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from 53eae61 to a8c64f7 Compare November 27, 2024 00:01
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from a8c64f7 to 811de65 Compare November 27, 2024 00:15
@nt1m nt1m force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from 811de65 to 0c63f98 Compare November 27, 2024 00:17
Copy link
Copy Markdown
Contributor

@djg djg left a comment

Choose a reason for hiding this comment

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

:shipit:

@nt1m nt1m added merge-queue Applied to send a pull request to merge-queue safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed merge-queue Applied to send a pull request to merge-queue safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Nov 27, 2024
@webkit-ews-buildbot webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Nov 27, 2024
@nt1m nt1m added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Nov 27, 2024
https://bugs.webkit.org/show_bug.cgi?id=283730
rdar://140595246

Reviewed by Dan Glastonbury.

Factor them into a struct to make it easier to move out painting/content code from RenderListMarker.

Also store the suffix + textWithoutSuffix, instead of generating substrings in various places.

* Source/WebCore/accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::stringValue const):
* Source/WebCore/rendering/RenderListItem.cpp:
(WebCore::RenderListItem::markerTextWithoutSuffix const):
(WebCore::RenderListItem::markerTextWithSuffix const):
* Source/WebCore/rendering/RenderListItem.h:
* Source/WebCore/rendering/RenderListMarker.cpp:
(WebCore::textRunForContent):
(WebCore::RenderListMarker::paint):
(WebCore::RenderListMarker::updateContent):
(WebCore::RenderListMarker::computePreferredLogicalWidths):
(WebCore::RenderListMarker::updateMargins):
(WebCore::RenderListMarker::relativeMarkerRect):
(WebCore::RenderListMarker::TextRunWithUnderlyingString::operator const TextRun& const): Deleted.
(WebCore::RenderListMarker::textRun const): Deleted.
(WebCore::RenderListMarker::textWithoutSuffix const): Deleted.
* Source/WebCore/rendering/RenderListMarker.h:
(WebCore::ListMarkerTextContent::isEmpty const):
(WebCore::ListMarkerTextContent::textWithSuffix const):
* Source/WebCore/rendering/RenderTreeAsText.cpp:
(WebCore::RenderTreeAsText::writeRenderObject):
(WebCore::markerTextForListItem):

Canonical link: https://commits.webkit.org/287107@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/marker-Factor-list-item-marker-contents-into-a-struct branch from 0c63f98 to 4881552 Compare November 27, 2024 01:37
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 287107@main (4881552): https://commits.webkit.org/287107@main

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

@webkit-commit-queue webkit-commit-queue merged commit 4881552 into WebKit:main Nov 27, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 27, 2024
@nt1m nt1m deleted the eng/marker-Factor-list-item-marker-contents-into-a-struct branch November 27, 2024 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Layout and Rendering For bugs with layout and rendering of Web pages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants