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.

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

Fix DUMP_NODE_STATISTICS #9566

Merged
merged 1 commit into from Feb 3, 2023
Merged

Fix DUMP_NODE_STATISTICS #9566

merged 1 commit into from Feb 3, 2023

Conversation

heycam
Copy link
Contributor

@heycam heycam commented Feb 3, 2023 •
edited by webkit-early-warning-system

4599514

Fix DUMP_NODE_STATISTICS
https://bugs.webkit.org/show_bug.cgi?id=251646
<rdar://problem/104981983>

Reviewed by Ryosuke Niwa.

- Add a missing UseType
- Reorder UseTypes to match field order
- Fix rareDataSingleUseTypeCounts key type to be big enough
- Disable assertion in ContainerNode::removeAllChildrenWithScriptAssertion, which is not valid when all nodes created get a weak pointer

* Source/WebCore/dom/ContainerNode.cpp:
(WebCore::ContainerNode::removeAllChildrenWithScriptAssertion):
* Source/WebCore/dom/ElementRareData.h:
(WebCore::ElementRareData::useTypes const):
* Source/WebCore/dom/Node.cpp:
(WebCore::stringForRareDataUseType):
(WebCore::Node::dumpStatistics):
(WebCore::Node::Node):
* Source/WebCore/dom/NodeRareData.h:
(WebCore::NodeRareData::useTypes const):

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

138021f

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
⏳ 🛠 🧪 jsc ⏳ 🛠 tv ⏳ 🧪 mac-wk2
  🛠 tv-sim ⏳ 🧪 mac-AS-debug-wk2
⏳ 🛠 watch ⏳ 🧪 mac-wk2-stress
⏳ 🛠 watch-sim

@heycam heycam self-assigned this Feb 3, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 6a33f0b)

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
⏳ 🛠 🧪 jsc ✅ 🛠 tv   🧪 mac-wk2
✅ 🛠 tv-sim ⏳ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
  🛠 🧪 merge ⏳ 🛠 watch-sim

@heycam heycam added merge-queue Applied to send a pull request to merge-queue and removed merge-queue Applied to send a pull request to merge-queue labels Feb 3, 2023
@heycam heycam changed the title Fix DUMP_NODE_STATISTICS Avoid storing effective language on elements when it overrides but is equal to the document element's Feb 3, 2023
@heycam heycam added the DOM For bugs specific to XML/HTML DOM elements (including parsing). label Feb 3, 2023
@heycam
Copy link
Contributor Author

heycam commented Feb 3, 2023

Oops, uploaded a different bug to this PR accidentally. :/

@heycam heycam changed the title Avoid storing effective language on elements when it overrides but is equal to the document element's Fix DUMP_NODE_STATISTICS Feb 3, 2023
@heycam heycam added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 3, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 138021f)

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
⏳ 🛠 🧪 jsc ⏳ 🛠 tv ⏳ 🧪 mac-wk2
  🛠 tv-sim ⏳ 🧪 mac-AS-debug-wk2
⏳ 🛠 watch ⏳ 🧪 mac-wk2-stress
⏳ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 1d4e1ee)

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

@heycam
Fix DUMP_NODE_STATISTICS
4599514 
https://bugs.webkit.org/show_bug.cgi?id=251646
<rdar://problem/104981983>

Reviewed by Ryosuke Niwa.

- Add a missing UseType
- Reorder UseTypes to match field order
- Fix rareDataSingleUseTypeCounts key type to be big enough
- Disable assertion in ContainerNode::removeAllChildrenWithScriptAssertion, which is not valid when all nodes created get a weak pointer

* Source/WebCore/dom/ContainerNode.cpp:
(WebCore::ContainerNode::removeAllChildrenWithScriptAssertion):
* Source/WebCore/dom/ElementRareData.h:
(WebCore::ElementRareData::useTypes const):
* Source/WebCore/dom/Node.cpp:
(WebCore::stringForRareDataUseType):
(WebCore::Node::dumpStatistics):
(WebCore::Node::Node):
* Source/WebCore/dom/NodeRareData.h:
(WebCore::NodeRareData::useTypes const):

Canonical link: https://commits.webkit.org/259796@main
@webkit-early-warning-system webkit-early-warning-system merged commit 4599514 into WebKit:main Feb 3, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 259796@main (4599514): https://commits.webkit.org/259796@main

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

@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 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rniwa rniwa rniwa approved these changes

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

Assignees

@heycam heycam

Labels
DOM For bugs specific to XML/HTML DOM elements (including parsing).
Projects
None yet
Milestone
No milestone
4 participants
@heycam @webkit-early-warning-system @webkit-commit-queue @rniwa