226530 2021-06-02 03:41:23 -0700 Style::Scope should use CheckedPtr 2021-06-02 23:55:49 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226369 InRadar P2 Normal --- 1 koivisto webkit-unassigned annulen benjamin cdumez cmarcelo ews-watchlist fujii gyuyoung.kim rniwa ryuan.choi sam sergio webkit-bug-importer oldest_to_newest 1765929 0 koivisto 2021-06-02 03:41:23 -0700 Instead of WeakPtr. 1765930 1 430332 koivisto 2021-06-02 03:45:12 -0700 Created attachment 430332 patch 1765932 2 430333 koivisto 2021-06-02 04:00:16 -0700 Created attachment 430333 patch 1766024 3 ews-feeder 2021-06-02 09:21:23 -0700 Committed r278355 (238387@main): <https://commits.webkit.org/238387@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430333. 1766025 4 webkit-bug-importer 2021-06-02 09:22:19 -0700 <rdar://problem/78767262> 1766153 5 430333 fujii 2021-06-02 14:12:15 -0700 Comment on attachment 430333 patch View in context: https://bugs.webkit.org/attachment.cgi?id=430333&action=review > Source/WebCore/style/StyleScope.cpp:671 > + resolverScopes.add(makeRef(*resolver), Vector<CheckedPtr<Scope>> { }).iterator->value.append(&scope); You add an empty vector, and append a single Scope. Does this vector always have only a single Scope? If so, why is ResolverScopes's ValueType using Vector<CheckedPtr<Scope>>? 1766158 6 430333 cdumez 2021-06-02 14:18:25 -0700 Comment on attachment 430333 patch View in context: https://bugs.webkit.org/attachment.cgi?id=430333&action=review >> Source/WebCore/style/StyleScope.cpp:671 >> + resolverScopes.add(makeRef(*resolver), Vector<CheckedPtr<Scope>> { }).iterator->value.append(&scope); > > You add an empty vector, and append a single Scope. > Does this vector always have only a single Scope? > If so, why is ResolverScopes's ValueType using Vector<CheckedPtr<Scope>>? We're in a loop so we may add more scope than one to the Vector. (Note that add() is a no-op if the key already exists) 1766287 7 koivisto 2021-06-02 23:35:33 -0700 It would be nice to have a single-argument version of add (or ensure) where the value is default constructed. 1766289 8 rniwa 2021-06-02 23:55:49 -0700 (In reply to Antti Koivisto from comment #7) > It would be nice to have a single-argument version of add (or ensure) where > the value is default constructed. Maybe we can just add the default argument value to it... 430332 2021-06-02 03:45:12 -0700 2021-06-02 04:00:26 -0700 patch style-scope-checked-ptr.patch text/plain 2859 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMjAxNjU5ZTg4NDguLjFkNzFlZmFiNTRlYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIxLTA2LTAyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBTdHlsZTo6U2NvcGUgc2hvdWxkIHVzZSBDaGVja2VkUHRyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY1MzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIFdlYWtQ dHIuCisKKyAgICAgICAgKiBzdHlsZS9TdHlsZVNjb3BlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpTY29wZTo6Y29sbGVjdFJlc29sdmVyU2NvcGVzKToKKyAgICAgICAgKiBzdHlsZS9T dHlsZVNjb3BlLmg6CisKIDIwMjEtMDYtMDIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI3Njg4Mik6IFN0eWxlIG5vdCBpbnZhbGlkYXRl ZCBjb3JyZWN0bHkgZm9yIG1lZGlhIHF1ZXJpZXMgaW4gc2hhZG93IHRyZWVzIHRoYXQgc2hhcmUg c3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5jcHAKaW5kZXggMjYwZDk4YjJlYTM3Li4z YzgzODQwNTBkYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCkBAIC02NjEsMTQg KzY2MSwxNCBAQCBhdXRvIFNjb3BlOjpjb2xsZWN0UmVzb2x2ZXJTY29wZXMoKSAtPiBSZXNvbHZl clNjb3BlcwogCiAgICAgUmVzb2x2ZXJTY29wZXMgcmVzb2x2ZXJTY29wZXM7CiAKLSAgICByZXNv bHZlclNjb3Blcy5hZGQobWFrZVJlZigqcmVzb2x2ZXJJZkV4aXN0cygpKSwgVmVjdG9yPFdlYWtQ dHI8U2NvcGU+PiB7IG1ha2VXZWFrUHRyKCp0aGlzKSB9KTsKKyAgICByZXNvbHZlclNjb3Blcy5h ZGQobWFrZVJlZigqcmVzb2x2ZXJJZkV4aXN0cygpKSwgVmVjdG9yPENoZWNrZWRQdHI8U2NvcGU+ PiB7IHRoaXMgfSk7CiAKICAgICBmb3IgKGF1dG8qIHNoYWRvd1Jvb3QgOiBtX2RvY3VtZW50Lmlu RG9jdW1lbnRTaGFkb3dSb290cygpKSB7CiAgICAgICAgIGF1dG8mIHNjb3BlID0gc2hhZG93Um9v dC0+c3R5bGVTY29wZSgpOwogICAgICAgICBhdXRvKiByZXNvbHZlciA9IHNjb3BlLnJlc29sdmVy SWZFeGlzdHMoKTsKICAgICAgICAgaWYgKCFyZXNvbHZlcikKICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICByZXNvbHZlclNjb3Blcy5hZGQobWFrZVJlZigqcmVzb2x2ZXIpLCBWZWN0b3I8 V2Vha1B0cjxTY29wZT4+IHsgfSkuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChtYWtlV2Vha1B0cihz Y29wZSkpOworICAgICAgICByZXNvbHZlclNjb3Blcy5hZGQobWFrZVJlZigqcmVzb2x2ZXIpLCBW ZWN0b3I8Q2hlY2tlZFB0cjxTY29wZT4+IHsgfSkuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZCgmc2Nv cGUpOwogICAgIH0KICAgICByZXR1cm4gcmVzb2x2ZXJTY29wZXM7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZVNjb3BlLmgKaW5kZXggNjM3NTEwOTk5ZjIyLi5hOGRkNjlhNTY0ZTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVNjb3BlLmgKQEAgLTI5LDEzICsyOSwxMyBAQAogCiAjaW5jbHVkZSAiU3R5bGVT Y29wZU9yZGluYWwuaCIKICNpbmNsdWRlIDxtZW1vcnk+CisjaW5jbHVkZSA8d3RmL0NoZWNrZWRQ dHIuaD4KICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFw Lmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQu aD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgotI2lu Y2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU1LDcgKzU1LDcgQEAgbmFtZXNwYWNlIFN0eWxlIHsK IAogY2xhc3MgUmVzb2x2ZXI7CiAKLWNsYXNzIFNjb3BlIDogcHVibGljIENhbk1ha2VXZWFrUHRy PFNjb3BlPiB7CitjbGFzcyBTY29wZSA6IHB1YmxpYyBDYW5NYWtlQ2hlY2tlZFB0ciB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgU2NvcGUoRG9j dW1lbnQmKTsKQEAgLTEzNCw3ICsxMzQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlQWN0 aXZlU3R5bGVTaGVldHMoVXBkYXRlVHlwZSk7CiAgICAgdm9pZCBzY2hlZHVsZVVwZGF0ZShVcGRh dGVUeXBlKTsKIAotICAgIHVzaW5nIFJlc29sdmVyU2NvcGVzID0gSGFzaE1hcDxSZWY8UmVzb2x2 ZXI+LCBWZWN0b3I8V2Vha1B0cjxTY29wZT4+PjsKKyAgICB1c2luZyBSZXNvbHZlclNjb3BlcyA9 IEhhc2hNYXA8UmVmPFJlc29sdmVyPiwgVmVjdG9yPENoZWNrZWRQdHI8U2NvcGU+Pj47CiAgICAg UmVzb2x2ZXJTY29wZXMgY29sbGVjdFJlc29sdmVyU2NvcGVzKCk7CiAgICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFRlc3RGdW5jdGlvbj4gdm9pZCBldmFsdWF0ZU1lZGlhUXVlcmllcyhUZXN0RnVuY3Rp b24mJik7CiAK 430333 2021-06-02 04:00:16 -0700 2021-06-02 09:21:25 -0700 patch style-scope-checked-ptr-2.patch text/plain 3705 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggOGZlZjFmNWMwOTMyLi40YjJmMDNlMGUyOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MjEtMDYtMDIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFN0 eWxlOjpTY29wZSBzaG91bGQgdXNlIENoZWNrZWRQdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjUzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0NNYWtlTGlzdHMudHh0OgorCiAyMDIxLTA1 LTIzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBDaGVj a2VkUHRyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9DTWFrZUxpc3RzLnR4dCBiL1NvdXJj ZS9XVEYvd3RmL0NNYWtlTGlzdHMudHh0CmluZGV4IGRkMGU4NjgyYjlhYy4uOGNmN2Y5OWIyNDE3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9DTWFrZUxpc3RzLnR4dApAQCAtMjgsNiArMjgsNyBAQCBzZXQoV1RGX1BVQkxJQ19I RUFERVJTCiAgICAgQ2FsbGJhY2tBZ2dyZWdhdG9yLmgKICAgICBDaGVja2VkQXJpdGhtZXRpYy5o CiAgICAgQ2hlY2tlZEJvb2xlYW4uaAorICAgIENoZWNrZWRQdHIuaAogICAgIENsb2NrVHlwZS5o CiAgICAgQ29tbWFQcmludGVyLmgKICAgICBDb21wYWN0UG9pbnRlclR1cGxlLmgKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCAwMjAxNjU5ZTg4NDguLjFkNzFlZmFiNTRlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA2LTAyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAg ICAgICBTdHlsZTo6U2NvcGUgc2hvdWxkIHVzZSBDaGVja2VkUHRyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY1MzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIFdlYWtQdHIuCisKKyAg ICAgICAgKiBzdHlsZS9TdHlsZVNjb3BlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpT Y29wZTo6Y29sbGVjdFJlc29sdmVyU2NvcGVzKToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVNjb3Bl Lmg6CisKIDIwMjEtMDYtMDIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjI3Njg4Mik6IFN0eWxlIG5vdCBpbnZhbGlkYXRlZCBjb3JyZWN0 bHkgZm9yIG1lZGlhIHF1ZXJpZXMgaW4gc2hhZG93IHRyZWVzIHRoYXQgc2hhcmUgc3R5bGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZS5jcHAKaW5kZXggMjYwZDk4YjJlYTM3Li4zYzgzODQwNTBk YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCkBAIC02NjEsMTQgKzY2MSwxNCBA QCBhdXRvIFNjb3BlOjpjb2xsZWN0UmVzb2x2ZXJTY29wZXMoKSAtPiBSZXNvbHZlclNjb3Blcwog CiAgICAgUmVzb2x2ZXJTY29wZXMgcmVzb2x2ZXJTY29wZXM7CiAKLSAgICByZXNvbHZlclNjb3Bl cy5hZGQobWFrZVJlZigqcmVzb2x2ZXJJZkV4aXN0cygpKSwgVmVjdG9yPFdlYWtQdHI8U2NvcGU+ PiB7IG1ha2VXZWFrUHRyKCp0aGlzKSB9KTsKKyAgICByZXNvbHZlclNjb3Blcy5hZGQobWFrZVJl ZigqcmVzb2x2ZXJJZkV4aXN0cygpKSwgVmVjdG9yPENoZWNrZWRQdHI8U2NvcGU+PiB7IHRoaXMg fSk7CiAKICAgICBmb3IgKGF1dG8qIHNoYWRvd1Jvb3QgOiBtX2RvY3VtZW50LmluRG9jdW1lbnRT aGFkb3dSb290cygpKSB7CiAgICAgICAgIGF1dG8mIHNjb3BlID0gc2hhZG93Um9vdC0+c3R5bGVT Y29wZSgpOwogICAgICAgICBhdXRvKiByZXNvbHZlciA9IHNjb3BlLnJlc29sdmVySWZFeGlzdHMo KTsKICAgICAgICAgaWYgKCFyZXNvbHZlcikKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICByZXNvbHZlclNjb3Blcy5hZGQobWFrZVJlZigqcmVzb2x2ZXIpLCBWZWN0b3I8V2Vha1B0cjxT Y29wZT4+IHsgfSkuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChtYWtlV2Vha1B0cihzY29wZSkpOwor ICAgICAgICByZXNvbHZlclNjb3Blcy5hZGQobWFrZVJlZigqcmVzb2x2ZXIpLCBWZWN0b3I8Q2hl Y2tlZFB0cjxTY29wZT4+IHsgfSkuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZCgmc2NvcGUpOwogICAg IH0KICAgICByZXR1cm4gcmVzb2x2ZXJTY29wZXM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVNjb3BlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3Bl LmgKaW5kZXggNjM3NTEwOTk5ZjIyLi5hOGRkNjlhNTY0ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHls ZVNjb3BlLmgKQEAgLTI5LDEzICsyOSwxMyBAQAogCiAjaW5jbHVkZSAiU3R5bGVTY29wZU9yZGlu YWwuaCIKICNpbmNsdWRlIDxtZW1vcnk+CisjaW5jbHVkZSA8d3RmL0NoZWNrZWRQdHIuaD4KICNp bmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5j bHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KICNpbmNs dWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgotI2luY2x1ZGUgPHd0 Zi9XZWFrUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKQEAgLTU1LDcgKzU1LDcgQEAgbmFtZXNwYWNlIFN0eWxlIHsKIAogY2xhc3Mg UmVzb2x2ZXI7CiAKLWNsYXNzIFNjb3BlIDogcHVibGljIENhbk1ha2VXZWFrUHRyPFNjb3BlPiB7 CitjbGFzcyBTY29wZSA6IHB1YmxpYyBDYW5NYWtlQ2hlY2tlZFB0ciB7CiAgICAgV1RGX01BS0Vf RkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgU2NvcGUoRG9jdW1lbnQmKTsK QEAgLTEzNCw3ICsxMzQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlQWN0aXZlU3R5bGVT aGVldHMoVXBkYXRlVHlwZSk7CiAgICAgdm9pZCBzY2hlZHVsZVVwZGF0ZShVcGRhdGVUeXBlKTsK IAotICAgIHVzaW5nIFJlc29sdmVyU2NvcGVzID0gSGFzaE1hcDxSZWY8UmVzb2x2ZXI+LCBWZWN0 b3I8V2Vha1B0cjxTY29wZT4+PjsKKyAgICB1c2luZyBSZXNvbHZlclNjb3BlcyA9IEhhc2hNYXA8 UmVmPFJlc29sdmVyPiwgVmVjdG9yPENoZWNrZWRQdHI8U2NvcGU+Pj47CiAgICAgUmVzb2x2ZXJT Y29wZXMgY29sbGVjdFJlc29sdmVyU2NvcGVzKCk7CiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFRl c3RGdW5jdGlvbj4gdm9pZCBldmFsdWF0ZU1lZGlhUXVlcmllcyhUZXN0RnVuY3Rpb24mJik7CiAK