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

Use CheckedPtr in CounterNode #9397

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

rniwa
Copy link
Member

@rniwa rniwa commented Jan 31, 2023

c5914bd

Use CheckedPtr in CounterNode
https://bugs.webkit.org/show_bug.cgi?id=251447

Reviewed by Alan Baradlay.

Deployed CheckedPtr in CounterNode in place of raw pointers.

* Source/WebCore/rendering/CounterNode.cpp:
(WebCore::CounterNode::CounterNode):
(WebCore::CounterNode::~CounterNode):
(WebCore::CounterNode::nextInPreOrderAfterChildren const):
(WebCore::CounterNode::nextInPreOrder const):
(WebCore::CounterNode::lastDescendant const):
(WebCore::CounterNode::previousInPreOrder const):
(WebCore::CounterNode::resetThisAndDescendantsRenderers):
(WebCore::CounterNode::recount):
(WebCore::CounterNode::insertAfter):
(WebCore::CounterNode::removeChild):
* Source/WebCore/rendering/CounterNode.h:
(WebCore::CounterNode::parent const):
(WebCore::CounterNode::previousSibling const):
(WebCore::CounterNode::nextSibling const):
(WebCore::CounterNode::firstChild const):
(WebCore::CounterNode::lastChild const):
* Source/WebCore/rendering/RenderCounter.cpp:
(WebCore::makeCounterNode):
(WebCore::RenderCounter::originalText const):
(WebCore::destroyCounterNodeWithoutMapRemoval):
(WebCore::RenderCounter::destroyCounterNodes):
(WebCore::RenderCounter::destroyCounterNode):
(WebCore::updateCounters):
(showCounterRendererTree):
* Source/WebCore/rendering/RenderCounter.h:

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

d5a7ea2

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

@rniwa rniwa self-assigned this Jan 31, 2023
@rniwa rniwa added the Layout and Rendering For bugs with layout and rendering of Web pages. label Jan 31, 2023
Copy link
Contributor

@alanbaradlay alanbaradlay left a comment

Choose a reason for hiding this comment

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

rs=me

@rniwa rniwa added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 1, 2023
https://bugs.webkit.org/show_bug.cgi?id=251447

Reviewed by Alan Baradlay.

Deployed CheckedPtr in CounterNode in place of raw pointers.

* Source/WebCore/rendering/CounterNode.cpp:
(WebCore::CounterNode::CounterNode):
(WebCore::CounterNode::~CounterNode):
(WebCore::CounterNode::nextInPreOrderAfterChildren const):
(WebCore::CounterNode::nextInPreOrder const):
(WebCore::CounterNode::lastDescendant const):
(WebCore::CounterNode::previousInPreOrder const):
(WebCore::CounterNode::resetThisAndDescendantsRenderers):
(WebCore::CounterNode::recount):
(WebCore::CounterNode::insertAfter):
(WebCore::CounterNode::removeChild):
* Source/WebCore/rendering/CounterNode.h:
(WebCore::CounterNode::parent const):
(WebCore::CounterNode::previousSibling const):
(WebCore::CounterNode::nextSibling const):
(WebCore::CounterNode::firstChild const):
(WebCore::CounterNode::lastChild const):
* Source/WebCore/rendering/RenderCounter.cpp:
(WebCore::makeCounterNode):
(WebCore::RenderCounter::originalText const):
(WebCore::destroyCounterNodeWithoutMapRemoval):
(WebCore::RenderCounter::destroyCounterNodes):
(WebCore::RenderCounter::destroyCounterNode):
(WebCore::updateCounters):
(showCounterRendererTree):
* Source/WebCore/rendering/RenderCounter.h:

Canonical link: https://commits.webkit.org/259659@main
@webkit-commit-queue
Copy link
Collaborator

Committed 259659@main (c5914bd): https://commits.webkit.org/259659@main

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

@webkit-early-warning-system webkit-early-warning-system merged commit c5914bd into WebKit:main Feb 1, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 1, 2023
@rniwa rniwa deleted the fix251447 branch February 1, 2023 03:14
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
4 participants