237236 2022-02-26 08:10:44 -0800 Fix typo in StyleSharingResolver 2022-03-01 03:27:18 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ntim ntim darin koivisto webkit-bug-importer oldest_to_newest 1846301 0 ntim 2022-02-26 08:10:44 -0800 https://webkit-search.igalia.com/webkit/rev/d9fb961816b603d071c05f5fbc2754c061adabaa/Source/WebCore/style/StyleSharingResolver.cpp#300-301 ``` if (element.matchesInvalidPseudoClass() != element.matchesValidPseudoClass()) return false; ``` This essentially is `if (true) return false` in most cases. This typo was introduced in bug 153768, before that it was: ``` if (element->matchesInvalidPseudoClass() != state.element()->matchesValidPseudoClass()) return false; ``` That version was introduced in bug 138769, which I also doubt is correct, since it says if both elements are invalid, then do not share. I think the version that we want is: ``` if (candidateElement.matchesInvalidPseudoClass() != element.matchesInvalidPseudoClass()) return false; ``` which is sort of redundant with `if (candidateElement.matchesValidPseudoClass() != element.matchesValidPseudoClass())` above, so maybe this should just be an ASSERT checking that valid is the exact opposite of invalid. 1846559 1 453372 ntim 2022-02-28 00:46:56 -0800 Created attachment 453372 Patch 1846597 2 453372 koivisto 2022-02-28 04:14:16 -0800 Comment on attachment 453372 Patch test would be nice 1846598 3 453372 koivisto 2022-02-28 04:16:03 -0800 Comment on attachment 453372 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453372&action=review > Source/WebCore/ChangeLog:9 > + The typo was introduced in bug 153768 and bug 138769. This essentially disables > + style sharing completely for many elements which isn't great. I think it only really affected form controls. 1846600 4 koivisto 2022-02-28 04:22:16 -0800 Another option would be to disable it more robustly as it is probably not a super valuable optimization. I'd like to eliminate style sharing completely at some point as it doesn't work well with things like :has() and container queries. 1846612 5 453386 ntim 2022-02-28 05:37:33 -0800 Created attachment 453386 Patch 1846716 6 453412 ntim 2022-02-28 11:45:11 -0800 Created attachment 453412 Patch 1846731 7 453416 ntim 2022-02-28 12:53:32 -0800 Created attachment 453416 Patch 1846754 8 453416 darin 2022-02-28 13:51:26 -0800 Comment on attachment 453416 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453416&action=review > Source/WebCore/ChangeLog:3 > + Explicitely disable style sharing for form controls Spelling error here "Explicitly". > Source/WebCore/ChangeLog:6 > + Reviewed by Antti Koivisto. If this is already reviewed, then I guess I won’t. Antti does seem like the best reviewer for a style sharing change. 1846803 9 453438 ntim 2022-02-28 15:11:13 -0800 Created attachment 453438 Patch 1846807 10 453441 ntim 2022-02-28 15:16:53 -0800 Created attachment 453441 [fast-cq] Patch 1846979 11 ews-feeder 2022-03-01 03:26:10 -0800 Committed r290640 (247913@main): <https://commits.webkit.org/247913@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453441. 1846981 12 webkit-bug-importer 2022-03-01 03:27:18 -0800 <rdar://problem/89611152> 453372 2022-02-28 00:46:56 -0800 2022-02-28 04:14:16 -0800 Patch bug-237236-20220228094654.patch text/plain 1703 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5NDE5Yjc4ODI3MzQx OTE5MTlhZGU2MjgyZWI4MTliNGYwMTBmZi4uOTJkNDJjMDk5MTMzMDE0Mjg3MjMwMDE4YmExZTdk MjQ4NTM3YWQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHR5cG8gaW4gU3R5bGVTaGFy aW5nUmVzb2x2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoZSB0eXBvIHdhcyBpbnRyb2R1Y2VkIGluIGJ1ZyAxNTM3NjggYW5kIGJ1ZyAxMzg3Njku IFRoaXMgZXNzZW50aWFsbHkgZGlzYWJsZXMKKyAgICAgICAgc3R5bGUgc2hhcmluZyBjb21wbGV0 ZWx5IGZvciBtYW55IGVsZW1lbnRzIHdoaWNoIGlzbid0IGdyZWF0LgorCisgICAgICAgICogc3R5 bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNo YXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50IGNvbnN0KToKKwogMjAyMi0w Mi0yNyAgTWF0dCBXb29kcm93ICA8bWF0dHdvb2Ryb3dAYXBwbGUuY29tPgogCiAgICAgICAgIEhh bmRsZSByZXZlcnNlIGZsb3cgZGlyZWN0aW9uIHdoZW4gY29udmVydGluZyBpdGVyYXRvciBjb29y ZHMgZm9yIGEgc3ViZ3JpZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVT aGFyaW5nUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVz b2x2ZXIuY3BwCmluZGV4IDBhMmU0YWQxNTFhMjlhODNkYjliYjE3ZTM1MmE2NDY3ZGU3ZWRmMzgu Ljk5MjlmYTJkODQ2OTZkOGQwZTY3ZWM4YWI4YzJkNDVmZmQ4MjA4MzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKQEAgLTMwMCw3ICszMDAsNyBA QCBib29sIFNoYXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNvbnN0IENv bnRleHQmIGNvbnRleHQsIGNvbnN0IFN0eQogICAgIGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNo ZXNWYWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoZWxlbWVudC5tYXRjaGVzSW52YWxp ZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygpKQorICAg IGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNJbnZhbGlkUHNldWRvQ2xhc3MoKSAhPSBlbGVt ZW50Lm1hdGNoZXNJbnZhbGlkUHNldWRvQ2xhc3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFz cygpICE9IGVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFzcygpKQo= 453386 2022-02-28 05:37:33 -0800 2022-02-28 11:46:35 -0800 Patch bug-237236-20220228143731.patch text/plain 1716 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYyOWExMDM3YzhiNzRm ZDRiZWI1NTA3NjUwODZiNjAzMTNmODZkOS4uMmY4OWI5YzIxMGUyMmJmYzc3ZDQ4ZjAzMGE2NjIy ZmU1ZTRkYTgyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHR5cG8gaW4gU3R5bGVTaGFy aW5nUmVzb2x2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIFRoZSB0eXBvIHdhcyBpbnRyb2R1Y2VkIGluIGJ1ZyAxNTM3NjggYW5kIGJ1ZyAxMzg3Njku IFRoaXMgZXNzZW50aWFsbHkgZGlzYWJsZXMKKyAgICAgICAgc3R5bGUgc2hhcmluZyBjb21wbGV0 ZWx5IGZvciBmb3JtIGNvbnRyb2xzIHdoaWNoIGlzbid0IGdyZWF0LgorCisgICAgICAgICogc3R5 bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNo YXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50IGNvbnN0KToKKwogMjAyMi0w Mi0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJl IFJlbW90ZU1lZGlhUGxheWVyUHJveHkgc2V0cyBpdHMgcmVzb3VyY2Ugb3duZXIgdG8gcGl4ZWwg YnVmZmVycyBjcmVhdGVkIGJ5IGl0cyBwbGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlU2hhcmluZ1Jlc29sdmVyLmNwcAppbmRleCAwYTJlNGFkMTUxYTI5YTgzZGI5YmIxN2UzNTJh NjQ2N2RlN2VkZjM4Li45OTI5ZmEyZDg0Njk2ZDhkMGU2N2VjOGFiOGMyZDQ1ZmZkODIwODM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwCkBAIC0z MDAsNyArMzAwLDcgQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5bGVXaXRoRWxl bWVudChjb25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkKICAgICBpZiAoY2FuZGlkYXRl RWxlbWVudC5tYXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlk UHNldWRvQ2xhc3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKGVsZW1lbnQu bWF0Y2hlc0ludmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRv Q2xhc3MoKSkKKyAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5tYXRjaGVzSW52YWxpZFBzZXVkb0Ns YXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzSW52YWxpZFBzZXVkb0NsYXNzKCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNJbmRldGVybWlu YXRlUHNldWRvQ2xhc3MoKSAhPSBlbGVtZW50Lm1hdGNoZXNJbmRldGVybWluYXRlUHNldWRvQ2xh c3MoKSkK 453412 2022-02-28 11:45:11 -0800 2022-02-28 15:10:13 -0800 Patch bug-237236-20220228204510.patch text/plain 4056 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYyOWExMDM3YzhiNzRm ZDRiZWI1NTA3NjUwODZiNjAzMTNmODZkOS4uYmYzNzYzYzAyMjFiZGVmNzhiZDI1NTk5ZTg5N2Y0 MmU0MDJkMDBjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHR5cG8gaW4gU3R5bGVTaGFy aW5nUmVzb2x2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIFRoZSB0eXBvIHdhcyBpbnRyb2R1Y2VkIGluIGJ1ZyAxNTM3NjggYW5kIGJ1ZyAxMzg3Njku IFRoaXMgZXNzZW50aWFsbHkgZGlzYWJsZXMKKyAgICAgICAgc3R5bGUgc2hhcmluZyBjb21wbGV0 ZWx5IGZvciBmb3JtIGNvbnRyb2xzIHdoaWNoIGlzbid0IGdyZWF0LiBMZXQncyBtYWtlIHRoYXQg ZXhwbGljaXQuCisKKyAgICAgICAgKiBzdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2hhcmluZ1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0 aENvbnRyb2wpOiBSZW1vdmVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNoYXJpbmdSZXNv bHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50IGNvbnN0KToKKwogMjAyMi0wMi0yOCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJlIFJlbW90ZU1l ZGlhUGxheWVyUHJveHkgc2V0cyBpdHMgcmVzb3VyY2Ugb3duZXIgdG8gcGl4ZWwgYnVmZmVycyBj cmVhdGVkIGJ5IGl0cyBwbGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlU2hhcmluZ1Jlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2hhcmlu Z1Jlc29sdmVyLmNwcAppbmRleCAwYTJlNGFkMTUxYTI5YTgzZGI5YmIxN2UzNTJhNjQ2N2RlN2Vk ZjM4Li5kYzJmZTRmMjc3YzY1YjEwMDI0NTg4MzZkNTQ3MGMzOTJjZmU1ZjQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwCkBAIC0xNzksMzMgKzE3 OSw2IEBAIE5vZGUqIFNoYXJpbmdSZXNvbHZlcjo6bG9jYXRlQ291c2luTGlzdChjb25zdCBFbGVt ZW50KiBwYXJlbnQpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLXN0YXRpYyBib29s IGNhblNoYXJlU3R5bGVXaXRoQ29udHJvbChjb25zdCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50JiBl bGVtZW50LCBjb25zdCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50JiBmb3JtRWxlbWVudCkKLXsKLSAg ICBpZiAoIWlzPEhUTUxJbnB1dEVsZW1lbnQ+KGZvcm1FbGVtZW50KSB8fCAhaXM8SFRNTElucHV0 RWxlbWVudD4oZWxlbWVudCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGF1dG8mIHRo aXNJbnB1dEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MSW5wdXRFbGVtZW50Pihmb3JtRWxlbWVudCk7 Ci0gICAgYXV0byYgb3RoZXJJbnB1dEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MSW5wdXRFbGVtZW50 PihlbGVtZW50KTsKLQotICAgIGlmICh0aGlzSW5wdXRFbGVtZW50LmlzQXV0b0ZpbGxlZCgpICE9 IG90aGVySW5wdXRFbGVtZW50LmlzQXV0b0ZpbGxlZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuc2hvdWxkQXBwZWFyQ2hlY2tlZCgpICE9IG90aGVy SW5wdXRFbGVtZW50LnNob3VsZEFwcGVhckNoZWNrZWQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIGlmICh0aGlzSW5wdXRFbGVtZW50LmlzUmVxdWlyZWQoKSAhPSBvdGhlcklucHV0RWxl bWVudC5pc1JlcXVpcmVkKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmIChmb3Jt RWxlbWVudC5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSAhPSBlbGVtZW50LmlzRGlzYWJsZWRGb3Jt Q29udHJvbCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoZm9ybUVsZW1lbnQu aXNJblJhbmdlKCkgIT0gZWxlbWVudC5pc0luUmFuZ2UoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgaWYgKGZvcm1FbGVtZW50LmlzT3V0T2ZSYW5nZSgpICE9IGVsZW1lbnQuaXNPdXRP ZlJhbmdlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVlOwotfQot CiBib29sIFNoYXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNvbnN0IENv bnRleHQmIGNvbnRleHQsIGNvbnN0IFN0eWxlZEVsZW1lbnQmIGNhbmRpZGF0ZUVsZW1lbnQpIGNv bnN0CiB7CiAgICAgYXV0byYgZWxlbWVudCA9IGNvbnRleHQuZWxlbWVudDsKQEAgLTI1NSwxMiAr MjI4LDcgQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5bGVXaXRoRWxlbWVudChj b25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkKICAgICBpZiAoIWNhbmRpZGF0ZUVsZW1l bnRJZC5pc051bGwoKSAmJiBtX3J1bGVTZXRzLmZlYXR1cmVzKCkuaWRzSW5SdWxlcy5jb250YWlu cyhjYW5kaWRhdGVFbGVtZW50SWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBib29s IGlzQ29udHJvbCA9IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0ZUVsZW1lbnQp OwotCi0gICAgaWYgKGlzQ29udHJvbCAhPSBpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihlbGVt ZW50KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKGlzQ29udHJvbCAmJiAhY2Fu U2hhcmVTdHlsZVdpdGhDb250cm9sKGRvd25jYXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGVs ZW1lbnQpLCBkb3duY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVFbGVtZW50 KSkpCisgICAgaWYgKGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0ZUVsZW1lbnQp IHx8IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGVsZW1lbnQpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5oYXNLZXlmcmFtZUVmZmVjdHMoUHNl dWRvSWQ6Ok5vbmUpKQpAQCAtMjk3LDE4ICsyNjUsNiBAQCBib29sIFNoYXJpbmdSZXNvbHZlcjo6 Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNvbnN0IENvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0 eQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGlmIChjYW5kaWRhdGVF bGVtZW50Lm1hdGNoZXNWYWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzVmFsaWRQ c2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoZWxlbWVudC5t YXRjaGVzSW52YWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzVmFsaWRQc2V1ZG9D bGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoY2FuZGlkYXRlRWxlbWVu dC5tYXRjaGVzSW5kZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzSW5k ZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlm IChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xhc3MoKSAhPSBlbGVtZW50 Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xhc3MoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAg ICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuc2hhZG93Um9vdCgpICYmICFjYW5kaWRhdGVFbGVtZW50 LnNoYWRvd1Jvb3QoKS0+c3R5bGVTY29wZSgpLnJlc29sdmVyKCkucnVsZVNldHMoKS5hdXRob3JT dHlsZSgpLmhvc3RQc2V1ZG9DbGFzc1J1bGVzKCkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAK 453416 2022-02-28 12:53:32 -0800 2022-02-28 15:10:26 -0800 Patch bug-237236-20220228215331.patch text/plain 4219 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYyOWExMDM3YzhiNzRm ZDRiZWI1NTA3NjUwODZiNjAzMTNmODZkOS4uOTAzNzAxY2EyM2ExZjdhZjZkNTFmZjMzZjIyM2Yx OTI3ZTMxODZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwbGljaXRlbHkgZGlzYWJsZSBz dHlsZSBzaGFyaW5nIGZvciBmb3JtIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcyMzYKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0 aSBLb2l2aXN0by4KKworICAgICAgICBUaGVyZSB3YXMgYSB0eXBvIGludHJvZHVjZWQgaW4gYnVn IDE1Mzc2OCBhbmQgYnVnIDEzODc2OSwgd2hpY2ggZXNzZW50aWFsbHkgZGlzYWJsZXMKKyAgICAg ICAgc3R5bGUgc2hhcmluZyBjb21wbGV0ZWx5IGZvciBmb3JtIGNvbnRyb2xzLiBMZXQncyBtYWtl IHRoYXQgZXhwbGljaXQuCisKKyAgICAgICAgKiBzdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2hhcmluZ1Jlc29sdmVyOjpjYW5TaGFyZVN0 eWxlV2l0aENvbnRyb2wpOiBSZW1vdmVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlNoYXJp bmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50IGNvbnN0KToKKwogMjAyMi0wMi0y OCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJlIFJl bW90ZU1lZGlhUGxheWVyUHJveHkgc2V0cyBpdHMgcmVzb3VyY2Ugb3duZXIgdG8gcGl4ZWwgYnVm ZmVycyBjcmVhdGVkIGJ5IGl0cyBwbGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxl U2hhcmluZ1Jlc29sdmVyLmNwcAppbmRleCAwYTJlNGFkMTUxYTI5YTgzZGI5YmIxN2UzNTJhNjQ2 N2RlN2VkZjM4Li4zM2E0OTkzYTEzZjAyN2IxNmYyMTRhYjQ1ZGY5NjViZDNjOWY2ODY2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwCkBAIC0xNzks MzMgKzE3OSw2IEBAIE5vZGUqIFNoYXJpbmdSZXNvbHZlcjo6bG9jYXRlQ291c2luTGlzdChjb25z dCBFbGVtZW50KiBwYXJlbnQpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLXN0YXRp YyBib29sIGNhblNoYXJlU3R5bGVXaXRoQ29udHJvbChjb25zdCBIVE1MRm9ybUNvbnRyb2xFbGVt ZW50JiBlbGVtZW50LCBjb25zdCBIVE1MRm9ybUNvbnRyb2xFbGVtZW50JiBmb3JtRWxlbWVudCkK LXsKLSAgICBpZiAoIWlzPEhUTUxJbnB1dEVsZW1lbnQ+KGZvcm1FbGVtZW50KSB8fCAhaXM8SFRN TElucHV0RWxlbWVudD4oZWxlbWVudCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGF1 dG8mIHRoaXNJbnB1dEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MSW5wdXRFbGVtZW50Pihmb3JtRWxl bWVudCk7Ci0gICAgYXV0byYgb3RoZXJJbnB1dEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MSW5wdXRF bGVtZW50PihlbGVtZW50KTsKLQotICAgIGlmICh0aGlzSW5wdXRFbGVtZW50LmlzQXV0b0ZpbGxl ZCgpICE9IG90aGVySW5wdXRFbGVtZW50LmlzQXV0b0ZpbGxlZCgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuc2hvdWxkQXBwZWFyQ2hlY2tlZCgpICE9 IG90aGVySW5wdXRFbGVtZW50LnNob3VsZEFwcGVhckNoZWNrZWQoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIGlmICh0aGlzSW5wdXRFbGVtZW50LmlzUmVxdWlyZWQoKSAhPSBvdGhlcklu cHV0RWxlbWVudC5pc1JlcXVpcmVkKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlm IChmb3JtRWxlbWVudC5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSAhPSBlbGVtZW50LmlzRGlzYWJs ZWRGb3JtQ29udHJvbCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoZm9ybUVs ZW1lbnQuaXNJblJhbmdlKCkgIT0gZWxlbWVudC5pc0luUmFuZ2UoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgaWYgKGZvcm1FbGVtZW50LmlzT3V0T2ZSYW5nZSgpICE9IGVsZW1lbnQu aXNPdXRPZlJhbmdlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVl OwotfQotCiBib29sIFNoYXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNv bnN0IENvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0eWxlZEVsZW1lbnQmIGNhbmRpZGF0ZUVsZW1l bnQpIGNvbnN0CiB7CiAgICAgYXV0byYgZWxlbWVudCA9IGNvbnRleHQuZWxlbWVudDsKQEAgLTI1 NSwxMiArMjI4LDExIEBAIGJvb2wgU2hhcmluZ1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0aEVs ZW1lbnQoY29uc3QgQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3R5CiAgICAgaWYgKCFjYW5kaWRh dGVFbGVtZW50SWQuaXNOdWxsKCkgJiYgbV9ydWxlU2V0cy5mZWF0dXJlcygpLmlkc0luUnVsZXMu Y29udGFpbnMoY2FuZGlkYXRlRWxlbWVudElkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgYm9vbCBpc0NvbnRyb2wgPSBpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVF bGVtZW50KTsKLQotICAgIGlmIChpc0NvbnRyb2wgIT0gaXM8SFRNTEZvcm1Db250cm9sRWxlbWVu dD4oZWxlbWVudCkpCisgICAgaWYgKGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0 ZUVsZW1lbnQpIHx8IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGVsZW1lbnQpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoaXNDb250cm9sICYmICFjYW5TaGFyZVN0eWxlV2l0 aENvbnRyb2woZG93bmNhc3Q8SFRNTEZvcm1Db250cm9sRWxlbWVudD4oZWxlbWVudCksIGRvd25j YXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0ZUVsZW1lbnQpKSkKKyAgICAvLyBI VE1MRm9ybUVsZW1lbnQgY2FuIGdldCB0aGUgOnZhbGlkL2ludmFsaWQgcHNldWRvIGNsYXNzZXMK KyAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5tYXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygpICE9IGVs ZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRvQ2xhc3MoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuaGFzS2V5ZnJhbWVFZmZlY3RzKFBzZXVkb0lkOjpO b25lKSkKQEAgLTI5NywxOCArMjY5LDYgQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJl U3R5bGVXaXRoRWxlbWVudChjb25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5t YXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRvQ2xh c3MoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKGVsZW1lbnQubWF0Y2hlc0lu dmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRvQ2xhc3MoKSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQubWF0Y2hl c0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5h dGVQc2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoY2FuZGlk YXRlRWxlbWVudC5tYXRjaGVzRGVmYXVsdFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVz RGVmYXVsdFBzZXVkb0NsYXNzKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIGlmIChj YW5kaWRhdGVFbGVtZW50LnNoYWRvd1Jvb3QoKSAmJiAhY2FuZGlkYXRlRWxlbWVudC5zaGFkb3dS b290KCktPnN0eWxlU2NvcGUoKS5yZXNvbHZlcigpLnJ1bGVTZXRzKCkuYXV0aG9yU3R5bGUoKS5o b3N0UHNldWRvQ2xhc3NSdWxlcygpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog Cg== 453438 2022-02-28 15:11:13 -0800 2022-02-28 15:17:09 -0800 Patch bug-237236-20220301001112.patch text/plain 4407 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYyOWExMDM3YzhiNzRm ZDRiZWI1NTA3NjUwODZiNjAzMTNmODZkOS4uNDFkOWQ1NjM4ZWIxMzIyY2UxNzk2MGY1YmUzZGJm NGEyMzZjZjJmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwbGljaXRseSBkaXNhYmxlIHN0 eWxlIHNoYXJpbmcgZm9yIGZvcm0gY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIFRoZXJlIHdhcyBhIHR5cG8gaW50cm9kdWNlZCBpbiBidWcg MTUzNzY4IGFuZCBidWcgMTM4NzY5LCB3aGljaCBlc3NlbnRpYWxseSBkaXNhYmxlcworICAgICAg ICBzdHlsZSBzaGFyaW5nIGNvbXBsZXRlbHkgZm9yIGZvcm0gY29udHJvbHMuIExldCdzIG1ha2Ug dGhhdCBleHBsaWNpdC4KKworICAgICAgICAqIHN0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5 bGVXaXRoQ29udHJvbCk6IFJlbW92ZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2hhcmlu Z1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0aEVsZW1lbnQgY29uc3QpOgorCiAyMDIyLTAyLTI4 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUgUmVt b3RlTWVkaWFQbGF5ZXJQcm94eSBzZXRzIGl0cyByZXNvdXJjZSBvd25lciB0byBwaXhlbCBidWZm ZXJzIGNyZWF0ZWQgYnkgaXRzIHBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVT aGFyaW5nUmVzb2x2ZXIuY3BwCmluZGV4IDBhMmU0YWQxNTFhMjlhODNkYjliYjE3ZTM1MmE2NDY3 ZGU3ZWRmMzguLjAwZmU2MTE5MGVkN2VlNTZjNzc1ZTNlMzE4N2YxOGJmNmQ0YmVhMDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKQEAgLTE3OSwz MyArMTc5LDYgQEAgTm9kZSogU2hhcmluZ1Jlc29sdmVyOjpsb2NhdGVDb3VzaW5MaXN0KGNvbnN0 IEVsZW1lbnQqIHBhcmVudCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotc3RhdGlj IGJvb2wgY2FuU2hhcmVTdHlsZVdpdGhDb250cm9sKGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1l bnQmIGVsZW1lbnQsIGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1lbnQmIGZvcm1FbGVtZW50KQot ewotICAgIGlmICghaXM8SFRNTElucHV0RWxlbWVudD4oZm9ybUVsZW1lbnQpIHx8ICFpczxIVE1M SW5wdXRFbGVtZW50PihlbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgYXV0 byYgdGhpc0lucHV0RWxlbWVudCA9IGRvd25jYXN0PEhUTUxJbnB1dEVsZW1lbnQ+KGZvcm1FbGVt ZW50KTsKLSAgICBhdXRvJiBvdGhlcklucHV0RWxlbWVudCA9IGRvd25jYXN0PEhUTUxJbnB1dEVs ZW1lbnQ+KGVsZW1lbnQpOwotCi0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuaXNBdXRvRmlsbGVk KCkgIT0gb3RoZXJJbnB1dEVsZW1lbnQuaXNBdXRvRmlsbGVkKCkpCi0gICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBpZiAodGhpc0lucHV0RWxlbWVudC5zaG91bGRBcHBlYXJDaGVja2VkKCkgIT0g b3RoZXJJbnB1dEVsZW1lbnQuc2hvdWxkQXBwZWFyQ2hlY2tlZCgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuaXNSZXF1aXJlZCgpICE9IG90aGVySW5w dXRFbGVtZW50LmlzUmVxdWlyZWQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYg KGZvcm1FbGVtZW50LmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpICE9IGVsZW1lbnQuaXNEaXNhYmxl ZEZvcm1Db250cm9sKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmIChmb3JtRWxl bWVudC5pc0luUmFuZ2UoKSAhPSBlbGVtZW50LmlzSW5SYW5nZSgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICBpZiAoZm9ybUVsZW1lbnQuaXNPdXRPZlJhbmdlKCkgIT0gZWxlbWVudC5p c091dE9mUmFuZ2UoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIGJvb2wgU2hhcmluZ1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0aEVsZW1lbnQoY29u c3QgQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3R5bGVkRWxlbWVudCYgY2FuZGlkYXRlRWxlbWVu dCkgY29uc3QKIHsKICAgICBhdXRvJiBlbGVtZW50ID0gY29udGV4dC5lbGVtZW50OwpAQCAtMjU1 LDEyICsyMjgsMTUgQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5bGVXaXRoRWxl bWVudChjb25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkKICAgICBpZiAoIWNhbmRpZGF0 ZUVsZW1lbnRJZC5pc051bGwoKSAmJiBtX3J1bGVTZXRzLmZlYXR1cmVzKCkuaWRzSW5SdWxlcy5j b250YWlucyhjYW5kaWRhdGVFbGVtZW50SWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBib29sIGlzQ29udHJvbCA9IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0ZUVs ZW1lbnQpOworICAgIGlmIChpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVFbGVt ZW50KSB8fCBpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihlbGVtZW50KSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgaWYgKGlzQ29udHJvbCAhPSBpczxIVE1MRm9ybUNvbnRyb2xFbGVt ZW50PihlbGVtZW50KSkKKyAgICAvLyBIVE1MRm9ybUVsZW1lbnQgY2FuIGdldCB0aGUgOnZhbGlk L2ludmFsaWQgcHNldWRvIGNsYXNzZXMKKyAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5tYXRjaGVz VmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRvQ2xhc3MoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKGlzQ29udHJvbCAmJiAhY2FuU2hhcmVT dHlsZVdpdGhDb250cm9sKGRvd25jYXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGVsZW1lbnQp LCBkb3duY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVFbGVtZW50KSkpCisg ICAgLy8gSFRNTFByb2dyZXNzRWxlbWVudCBpcyBub3QgYSBIVE1MRm9ybUNvbnRyb2xFbGVtZW50 CisgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFz cygpICE9IGVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFzcygpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5oYXNLZXlmcmFtZUVm ZmVjdHMoUHNldWRvSWQ6Ok5vbmUpKQpAQCAtMjk3LDE4ICsyNzMsNiBAQCBib29sIFNoYXJpbmdS ZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNvbnN0IENvbnRleHQmIGNvbnRleHQs IGNvbnN0IFN0eQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGlmIChj YW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNWYWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRj aGVzVmFsaWRQc2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAo ZWxlbWVudC5tYXRjaGVzSW52YWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRjaGVzVmFs aWRQc2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoY2FuZGlk YXRlRWxlbWVudC5tYXRjaGVzSW5kZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5t YXRjaGVzSW5kZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xhc3MoKSAh PSBlbGVtZW50Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xhc3MoKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotCiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuc2hhZG93Um9vdCgpICYmICFjYW5kaWRh dGVFbGVtZW50LnNoYWRvd1Jvb3QoKS0+c3R5bGVTY29wZSgpLnJlc29sdmVyKCkucnVsZVNldHMo KS5hdXRob3JTdHlsZSgpLmhvc3RQc2V1ZG9DbGFzc1J1bGVzKCkuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAK 453441 2022-02-28 15:16:53 -0800 2022-03-01 03:26:11 -0800 [fast-cq] Patch bug-237236-20220301001652.patch text/plain 4584 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTYyOWExMDM3YzhiNzRm ZDRiZWI1NTA3NjUwODZiNjAzMTNmODZkOS4uNDFkOWQ1NjM4ZWIxMzIyY2UxNzk2MGY1YmUzZGJm NGEyMzZjZjJmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTI4ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwbGljaXRseSBkaXNhYmxlIHN0 eWxlIHNoYXJpbmcgZm9yIGZvcm0gY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIFRoZXJlIHdhcyBhIHR5cG8gaW50cm9kdWNlZCBpbiBidWcg MTUzNzY4IGFuZCBidWcgMTM4NzY5LCB3aGljaCBlc3NlbnRpYWxseSBkaXNhYmxlcworICAgICAg ICBzdHlsZSBzaGFyaW5nIGNvbXBsZXRlbHkgZm9yIGZvcm0gY29udHJvbHMuIExldCdzIG1ha2Ug dGhhdCBleHBsaWNpdC4KKworICAgICAgICAqIHN0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5 bGVXaXRoQ29udHJvbCk6IFJlbW92ZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2hhcmlu Z1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0aEVsZW1lbnQgY29uc3QpOgorCiAyMDIyLTAyLTI4 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUgUmVt b3RlTWVkaWFQbGF5ZXJQcm94eSBzZXRzIGl0cyByZXNvdXJjZSBvd25lciB0byBwaXhlbCBidWZm ZXJzIGNyZWF0ZWQgYnkgaXRzIHBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVTaGFyaW5nUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVT aGFyaW5nUmVzb2x2ZXIuY3BwCmluZGV4IDBhMmU0YWQxNTFhMjlhODNkYjliYjE3ZTM1MmE2NDY3 ZGU3ZWRmMzguLjcxNDRkODk2MWU1OGMyM2EzMTJiY2UzNTNlNWM4YzEyZjQ2MTk3OTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2hhcmluZ1Jlc29sdmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNoYXJpbmdSZXNvbHZlci5jcHAKQEAgLTE3OSwz MyArMTc5LDYgQEAgTm9kZSogU2hhcmluZ1Jlc29sdmVyOjpsb2NhdGVDb3VzaW5MaXN0KGNvbnN0 IEVsZW1lbnQqIHBhcmVudCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotc3RhdGlj IGJvb2wgY2FuU2hhcmVTdHlsZVdpdGhDb250cm9sKGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1l bnQmIGVsZW1lbnQsIGNvbnN0IEhUTUxGb3JtQ29udHJvbEVsZW1lbnQmIGZvcm1FbGVtZW50KQot ewotICAgIGlmICghaXM8SFRNTElucHV0RWxlbWVudD4oZm9ybUVsZW1lbnQpIHx8ICFpczxIVE1M SW5wdXRFbGVtZW50PihlbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgYXV0 byYgdGhpc0lucHV0RWxlbWVudCA9IGRvd25jYXN0PEhUTUxJbnB1dEVsZW1lbnQ+KGZvcm1FbGVt ZW50KTsKLSAgICBhdXRvJiBvdGhlcklucHV0RWxlbWVudCA9IGRvd25jYXN0PEhUTUxJbnB1dEVs ZW1lbnQ+KGVsZW1lbnQpOwotCi0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuaXNBdXRvRmlsbGVk KCkgIT0gb3RoZXJJbnB1dEVsZW1lbnQuaXNBdXRvRmlsbGVkKCkpCi0gICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBpZiAodGhpc0lucHV0RWxlbWVudC5zaG91bGRBcHBlYXJDaGVja2VkKCkgIT0g b3RoZXJJbnB1dEVsZW1lbnQuc2hvdWxkQXBwZWFyQ2hlY2tlZCgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgaWYgKHRoaXNJbnB1dEVsZW1lbnQuaXNSZXF1aXJlZCgpICE9IG90aGVySW5w dXRFbGVtZW50LmlzUmVxdWlyZWQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYg KGZvcm1FbGVtZW50LmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpICE9IGVsZW1lbnQuaXNEaXNhYmxl ZEZvcm1Db250cm9sKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmIChmb3JtRWxl bWVudC5pc0luUmFuZ2UoKSAhPSBlbGVtZW50LmlzSW5SYW5nZSgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICBpZiAoZm9ybUVsZW1lbnQuaXNPdXRPZlJhbmdlKCkgIT0gZWxlbWVudC5p c091dE9mUmFuZ2UoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KIGJvb2wgU2hhcmluZ1Jlc29sdmVyOjpjYW5TaGFyZVN0eWxlV2l0aEVsZW1lbnQoY29u c3QgQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3R5bGVkRWxlbWVudCYgY2FuZGlkYXRlRWxlbWVu dCkgY29uc3QKIHsKICAgICBhdXRvJiBlbGVtZW50ID0gY29udGV4dC5lbGVtZW50OwpAQCAtMjU1 LDEyICsyMjgsMTkgQEAgYm9vbCBTaGFyaW5nUmVzb2x2ZXI6OmNhblNoYXJlU3R5bGVXaXRoRWxl bWVudChjb25zdCBDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHkKICAgICBpZiAoIWNhbmRpZGF0 ZUVsZW1lbnRJZC5pc051bGwoKSAmJiBtX3J1bGVTZXRzLmZlYXR1cmVzKCkuaWRzSW5SdWxlcy5j b250YWlucyhjYW5kaWRhdGVFbGVtZW50SWQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBib29sIGlzQ29udHJvbCA9IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGNhbmRpZGF0ZUVs ZW1lbnQpOworICAgIGlmIChpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVFbGVt ZW50KSB8fCBpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihlbGVtZW50KSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgaWYgKGlzQ29udHJvbCAhPSBpczxIVE1MRm9ybUNvbnRyb2xFbGVt ZW50PihlbGVtZW50KSkKKyAgICAvLyBIVE1MRm9ybUVsZW1lbnQgY2FuIGdldCB0aGUgOnZhbGlk L2ludmFsaWQgcHNldWRvIGNsYXNzZXMKKyAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5tYXRjaGVz VmFsaWRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc1ZhbGlkUHNldWRvQ2xhc3MoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKGlzQ29udHJvbCAmJiAhY2FuU2hhcmVT dHlsZVdpdGhDb250cm9sKGRvd25jYXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KGVsZW1lbnQp LCBkb3duY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50PihjYW5kaWRhdGVFbGVtZW50KSkpCisg ICAgLy8gSFRNTFByb2dyZXNzRWxlbWVudCBpcyBub3QgYSBIVE1MRm9ybUNvbnRyb2xFbGVtZW50 CisgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFz cygpICE9IGVsZW1lbnQubWF0Y2hlc0luZGV0ZXJtaW5hdGVQc2V1ZG9DbGFzcygpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBIVE1MT3B0aW9uRWxlbWVudCBpcyBub3QgYSBIVE1M Rm9ybUNvbnRyb2xFbGVtZW50CisgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQubWF0Y2hlc0RlZmF1 bHRQc2V1ZG9DbGFzcygpICE9IGVsZW1lbnQubWF0Y2hlc0RlZmF1bHRQc2V1ZG9DbGFzcygpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoY2FuZGlkYXRlRWxlbWVudC5oYXNLZXlm cmFtZUVmZmVjdHMoUHNldWRvSWQ6Ok5vbmUpKQpAQCAtMjk3LDE4ICsyNzcsNiBAQCBib29sIFNo YXJpbmdSZXNvbHZlcjo6Y2FuU2hhcmVTdHlsZVdpdGhFbGVtZW50KGNvbnN0IENvbnRleHQmIGNv bnRleHQsIGNvbnN0IFN0eQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAg IGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNWYWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVu dC5tYXRjaGVzVmFsaWRQc2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICBpZiAoZWxlbWVudC5tYXRjaGVzSW52YWxpZFBzZXVkb0NsYXNzKCkgIT0gZWxlbWVudC5tYXRj aGVzVmFsaWRQc2V1ZG9DbGFzcygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAo Y2FuZGlkYXRlRWxlbWVudC5tYXRjaGVzSW5kZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkgIT0gZWxl bWVudC5tYXRjaGVzSW5kZXRlcm1pbmF0ZVBzZXVkb0NsYXNzKCkpCi0gICAgICAgIHJldHVybiBm YWxzZTsKLQotICAgIGlmIChjYW5kaWRhdGVFbGVtZW50Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xh c3MoKSAhPSBlbGVtZW50Lm1hdGNoZXNEZWZhdWx0UHNldWRvQ2xhc3MoKSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotCiAgICAgaWYgKGNhbmRpZGF0ZUVsZW1lbnQuc2hhZG93Um9vdCgpICYmICFj YW5kaWRhdGVFbGVtZW50LnNoYWRvd1Jvb3QoKS0+c3R5bGVTY29wZSgpLnJlc29sdmVyKCkucnVs ZVNldHMoKS5hdXRob3JTdHlsZSgpLmhvc3RQc2V1ZG9DbGFzc1J1bGVzKCkuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAK