Skip to content

Rename RenderStyle effectiveUserModify() to usedUserModify() & effectiveUserSelect() to usedUserSelect()#25626

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
annevk:eng/Rename-RenderStyle-effectiveUserModify-to-usedUserModify--effectiveUserSelect-to-usedUserSelect
Mar 8, 2024
Merged

Rename RenderStyle effectiveUserModify() to usedUserModify() & effectiveUserSelect() to usedUserSelect()#25626
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
annevk:eng/Rename-RenderStyle-effectiveUserModify-to-usedUserModify--effectiveUserSelect-to-usedUserSelect

Conversation

@annevk
Copy link
Contributor

@annevk annevk commented Mar 8, 2024

2169972

Rename RenderStyle effectiveUserModify() to usedUserModify() & effectiveUserSelect() to usedUserSelect()
https://bugs.webkit.org/show_bug.cgi?id=270695

Reviewed by Aditya Keerthi.

This aligns it with terminology used in CSS standards.

* Source/WebCore/dom/Node.cpp:
(WebCore::computeEditabilityFromComputedStyle):
(WebCore::Node::canStartSelection const):
* Source/WebCore/dom/Position.cpp:
(WebCore::Position::nodeIsUserSelectNone):
(WebCore::Position::nodeIsUserSelectAll):
* Source/WebCore/editing/ApplyBlockElementCommand.cpp:
(WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
* Source/WebCore/editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::doApply):
* Source/WebCore/editing/TextIterator.cpp:
(WebCore::isRendererVisible):
* Source/WebCore/page/EventHandler.cpp:
(WebCore::EventHandler::canMouseDownStartSelect):
(WebCore::EventHandler::selectCursor):
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::rangeForPoint):
* Source/WebCore/page/TextIndicator.cpp:
(WebCore::TextIndicator::createWithRange):
* Source/WebCore/rendering/EventRegion.cpp:
(WebCore::EventRegion::unite):
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::selectionColor const):
(WebCore::RenderElement::selectionBackgroundColor const):
* Source/WebCore/rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects const):
* Source/WebCore/rendering/RenderObject.cpp:
(WebCore::RenderObject::collectSelectionGeometriesInternal):
* Source/WebCore/rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::usedUserSelect const):
(WebCore::RenderStyle::effectiveUserSelect const): Deleted.
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
(WebCore::RenderStyle::usedUserModify const):
(WebCore::RenderStyle::effectiveUserModify const): Deleted.
* Source/WebCore/style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::resolveElement):
* Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::InjectedBundleNodeHandle::isSelectableTextNode const):
* Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::selectionPositionInformation):

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

f83bd5f

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 ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@annevk annevk requested review from cdumez and rniwa as code owners March 8, 2024 13:37
@annevk annevk self-assigned this Mar 8, 2024
@annevk annevk added the CSS Cascading Style Sheets implementation label Mar 8, 2024
@annevk annevk added the merge-queue Applied to send a pull request to merge-queue label Mar 8, 2024
…iveUserSelect() to usedUserSelect()

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

Reviewed by Aditya Keerthi.

This aligns it with terminology used in CSS standards.

* Source/WebCore/dom/Node.cpp:
(WebCore::computeEditabilityFromComputedStyle):
(WebCore::Node::canStartSelection const):
* Source/WebCore/dom/Position.cpp:
(WebCore::Position::nodeIsUserSelectNone):
(WebCore::Position::nodeIsUserSelectAll):
* Source/WebCore/editing/ApplyBlockElementCommand.cpp:
(WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
* Source/WebCore/editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::doApply):
* Source/WebCore/editing/TextIterator.cpp:
(WebCore::isRendererVisible):
* Source/WebCore/page/EventHandler.cpp:
(WebCore::EventHandler::canMouseDownStartSelect):
(WebCore::EventHandler::selectCursor):
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::rangeForPoint):
* Source/WebCore/page/TextIndicator.cpp:
(WebCore::TextIndicator::createWithRange):
* Source/WebCore/rendering/EventRegion.cpp:
(WebCore::EventRegion::unite):
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::selectionColor const):
(WebCore::RenderElement::selectionBackgroundColor const):
* Source/WebCore/rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects const):
* Source/WebCore/rendering/RenderObject.cpp:
(WebCore::RenderObject::collectSelectionGeometriesInternal):
* Source/WebCore/rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::usedUserSelect const):
(WebCore::RenderStyle::effectiveUserSelect const): Deleted.
* Source/WebCore/rendering/style/RenderStyle.h:
* Source/WebCore/rendering/style/RenderStyleInlines.h:
(WebCore::RenderStyle::usedUserModify const):
(WebCore::RenderStyle::effectiveUserModify const): Deleted.
* Source/WebCore/style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::resolveElement):
* Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::InjectedBundleNodeHandle::isSelectableTextNode const):
* Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::selectionPositionInformation):

Canonical link: https://commits.webkit.org/275844@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Rename-RenderStyle-effectiveUserModify-to-usedUserModify--effectiveUserSelect-to-usedUserSelect branch from f83bd5f to 2169972 Compare March 8, 2024 18:19
@webkit-commit-queue
Copy link
Collaborator

Committed 275844@main (2169972): https://commits.webkit.org/275844@main

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

@webkit-commit-queue webkit-commit-queue merged commit 2169972 into WebKit:main Mar 8, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 8, 2024
@annevk annevk deleted the eng/Rename-RenderStyle-effectiveUserModify-to-usedUserModify--effectiveUserSelect-to-usedUserSelect branch March 9, 2024 07:41
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

Development

Successfully merging this pull request may close these issues.

4 participants