Use more smart pointers in the HTML parsing code by cdumez · Pull Request #17801 · WebKit/WebKit

cdumez · 2023-09-15T03:24:58Z

`49c1df2`

Use more smart pointers in the HTML parsing code
https://bugs.webkit.org/show_bug.cgi?id=261589

Reviewed by Brent Fulgham.

* Source/WebCore/html/parser/HTMLConstructionSite.cpp:
(WebCore::insert):
(WebCore::executeReparentTask):
(WebCore::executeTakeAllChildrenAndReparentTask):
(WebCore::HTMLConstructionSite::attachLater):
(WebCore::HTMLConstructionSite::HTMLConstructionSite):
(WebCore::HTMLConstructionSite::protectedDocument const):
(WebCore::HTMLConstructionSite::protectedAttachmentRoot const):
(WebCore::HTMLConstructionSite::dispatchDocumentElementAvailableIfNeeded):
(WebCore::HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML):
(WebCore::HTMLConstructionSite::setDefaultCompatibilityMode):
(WebCore::HTMLConstructionSite::setCompatibilityMode):
(WebCore::HTMLConstructionSite::setCompatibilityModeFromDoctype):
(WebCore::HTMLConstructionSite::finishedParsing):
(WebCore::HTMLConstructionSite::insertDoctype):
(WebCore::HTMLConstructionSite::insertComment):
(WebCore::HTMLConstructionSite::insertCommentOnDocument):
(WebCore::HTMLConstructionSite::insertCommentOnHTMLHtmlElement):
(WebCore::HTMLConstructionSite::insertHTMLHeadElement):
(WebCore::HTMLConstructionSite::insertHTMLBodyElement):
(WebCore::HTMLConstructionSite::insertHTMLFormElement):
(WebCore::HTMLConstructionSite::insertHTMLElement):
(WebCore::HTMLConstructionSite::insertHTMLTemplateElement):
(WebCore::HTMLConstructionSite::insertHTMLElementOrFindCustomElementInterface):
(WebCore::HTMLConstructionSite::insertCustomElement):
(WebCore::HTMLConstructionSite::insertSelfClosingHTMLElement):
(WebCore::HTMLConstructionSite::insertScriptElement):
(WebCore::HTMLConstructionSite::insertForeignElement):
(WebCore::HTMLConstructionSite::reconstructTheActiveFormattingElements):
* Source/WebCore/html/parser/HTMLConstructionSite.h:
(WebCore::HTMLConstructionSite::protectedCurrentNode const):
(WebCore::HTMLConstructionSite::isTelephoneNumberParsingEnabled):
* Source/WebCore/html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::pumpTokenizer):
* Source/WebCore/html/parser/HTMLDocumentParserFastPath.cpp:
(WebCore::HTMLFastPathParser::parseCompleteInput):
(WebCore::HTMLFastPathParser::parseChildren):
(WebCore::HTMLFastPathParser::parseElementAfterTagName):
* Source/WebCore/html/parser/HTMLFormattingElementList.cpp:
(WebCore::HTMLFormattingElementList::swapTo):
(WebCore::HTMLFormattingElementList::ensureNoahsArkCondition):
* Source/WebCore/html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
(WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::resourceType const):
* Source/WebCore/html/parser/HTMLResourcePreloader.cpp:
(WebCore::HTMLResourcePreloader::preload):
* Source/WebCore/html/parser/HTMLResourcePreloader.h:
* Source/WebCore/html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::callTheAdoptionAgency):

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

b7fd0f6

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	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-15T03:25:08Z

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

Details

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	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch		✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-09-20T17:04:29Z

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

Details

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	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	⏳ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-20T17:12:07Z

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

Details

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~~	✅ 🛠 gtk
	⏳ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-20T17:34:37Z

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

Details

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~~	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	~~🧪 gtk-wk2~~
	✅ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-20T19:09:41Z

EWS run on current version of this PR (hash b7fd0f6)

Details

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	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

cdumez · 2023-09-21T21:15:31Z

Patch is ready for review.

brentfulgham

Looks great. r=me

brentfulgham · 2023-09-21T22:39:49Z

Source/WebCore/html/parser/HTMLConstructionSite.cpp

Why not document(), like in the version taking the DocumentFragment argument?

Unlike in the other constructor, we have a document argument here that we can leverage. Note that document() wouldn't build since there is a document parameter. You'd have to use this->document(). I think document looks much better than this->document().

brentfulgham · 2023-09-21T22:42:05Z

Source/WebCore/html/parser/HTMLConstructionSite.h

Should these ASSERT that their members are non-null?

Good idea. will update.

Actually, this is not needed because RefPtr's operator*() already ASSERTs this.

T& operator*() const { ASSERT(m_ptr); return *PtrTraits::unwrap(m_ptr); }

https://bugs.webkit.org/show_bug.cgi?id=261589 Reviewed by Brent Fulgham. * Source/WebCore/html/parser/HTMLConstructionSite.cpp: (WebCore::insert): (WebCore::executeReparentTask): (WebCore::executeTakeAllChildrenAndReparentTask): (WebCore::HTMLConstructionSite::attachLater): (WebCore::HTMLConstructionSite::HTMLConstructionSite): (WebCore::HTMLConstructionSite::protectedDocument const): (WebCore::HTMLConstructionSite::protectedAttachmentRoot const): (WebCore::HTMLConstructionSite::dispatchDocumentElementAvailableIfNeeded): (WebCore::HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML): (WebCore::HTMLConstructionSite::setDefaultCompatibilityMode): (WebCore::HTMLConstructionSite::setCompatibilityMode): (WebCore::HTMLConstructionSite::setCompatibilityModeFromDoctype): (WebCore::HTMLConstructionSite::finishedParsing): (WebCore::HTMLConstructionSite::insertDoctype): (WebCore::HTMLConstructionSite::insertComment): (WebCore::HTMLConstructionSite::insertCommentOnDocument): (WebCore::HTMLConstructionSite::insertCommentOnHTMLHtmlElement): (WebCore::HTMLConstructionSite::insertHTMLHeadElement): (WebCore::HTMLConstructionSite::insertHTMLBodyElement): (WebCore::HTMLConstructionSite::insertHTMLFormElement): (WebCore::HTMLConstructionSite::insertHTMLElement): (WebCore::HTMLConstructionSite::insertHTMLTemplateElement): (WebCore::HTMLConstructionSite::insertHTMLElementOrFindCustomElementInterface): (WebCore::HTMLConstructionSite::insertCustomElement): (WebCore::HTMLConstructionSite::insertSelfClosingHTMLElement): (WebCore::HTMLConstructionSite::insertScriptElement): (WebCore::HTMLConstructionSite::insertForeignElement): (WebCore::HTMLConstructionSite::reconstructTheActiveFormattingElements): * Source/WebCore/html/parser/HTMLConstructionSite.h: (WebCore::HTMLConstructionSite::protectedCurrentNode const): (WebCore::HTMLConstructionSite::isTelephoneNumberParsingEnabled): * Source/WebCore/html/parser/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::pumpTokenizer): * Source/WebCore/html/parser/HTMLDocumentParserFastPath.cpp: (WebCore::HTMLFastPathParser::parseCompleteInput): (WebCore::HTMLFastPathParser::parseChildren): (WebCore::HTMLFastPathParser::parseElementAfterTagName): * Source/WebCore/html/parser/HTMLFormattingElementList.cpp: (WebCore::HTMLFormattingElementList::swapTo): (WebCore::HTMLFormattingElementList::ensureNoahsArkCondition): * Source/WebCore/html/parser/HTMLPreloadScanner.cpp: (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes): (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest): (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): (WebCore::TokenPreloadScanner::StartTagScanner::resourceType const): * Source/WebCore/html/parser/HTMLResourcePreloader.cpp: (WebCore::HTMLResourcePreloader::preload): * Source/WebCore/html/parser/HTMLResourcePreloader.h: * Source/WebCore/html/parser/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::callTheAdoptionAgency): Canonical link: https://commits.webkit.org/268278@main

webkit-commit-queue · 2023-09-21T23:08:39Z

Committed 268278@main (49c1df2): https://commits.webkit.org/268278@main

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

cdumez self-assigned this Sep 15, 2023

cdumez added the DOM For bugs specific to XML/HTML DOM elements (including parsing). label Sep 15, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 15, 2023

cdumez removed the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez force-pushed the html_parser_more_smart_pointers branch from e60f770 to e299bf9 Compare September 20, 2023 16:58

cdumez force-pushed the html_parser_more_smart_pointers branch from e299bf9 to c3e3fc4 Compare September 20, 2023 17:11

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez removed the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez force-pushed the html_parser_more_smart_pointers branch from c3e3fc4 to c255095 Compare September 20, 2023 17:30

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez removed the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez force-pushed the html_parser_more_smart_pointers branch from c255095 to b7fd0f6 Compare September 20, 2023 19:08

cdumez marked this pull request as ready for review September 20, 2023 20:54

cdumez requested a review from rniwa as a code owner September 20, 2023 20:54

cdumez requested review from brentfulgham, darinadler and ddkilzer September 20, 2023 20:54

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

cdumez removed the merging-blocked Applied to prevent a change from being merged label Sep 20, 2023

brentfulgham approved these changes Sep 21, 2023

View reviewed changes

cdumez added the merge-queue Applied to send a pull request to merge-queue label Sep 21, 2023

webkit-commit-queue force-pushed the html_parser_more_smart_pointers branch from b7fd0f6 to 49c1df2 Compare September 21, 2023 23:08

webkit-commit-queue merged commit 49c1df2 into WebKit:main Sep 21, 2023

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Sep 21, 2023

Conversation

cdumez commented Sep 15, 2023 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

49c1df2

Uh oh!

webkit-early-warning-system commented Sep 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Sep 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Sep 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Sep 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Sep 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cdumez commented Sep 21, 2023

Uh oh!

brentfulgham left a comment

Choose a reason for hiding this comment

Uh oh!

brentfulgham Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

cdumez Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

brentfulgham Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

cdumez Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

cdumez Sep 21, 2023

Choose a reason for hiding this comment

Uh oh!

webkit-commit-queue commented Sep 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cdumez commented Sep 15, 2023 •

edited by webkit-early-warning-system

Loading

`49c1df2`

webkit-early-warning-system commented Sep 15, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 20, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 20, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 20, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 20, 2023 •

edited

Loading