234033 2021-12-08 13:16:25 -0800 [LFC][IFC] Try not to include non-content type of inline boxes in the visual reordering 2021-12-09 13:30:24 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1821751 0 zalan 2021-12-08 13:16:25 -0800 they may confuse the reordering algorithm. 1821758 1 446416 zalan 2021-12-08 13:24:55 -0800 Created attachment 446416 Patch 1822207 2 446569 zalan 2021-12-09 11:05:52 -0800 Created attachment 446569 Patch 1822309 3 ews-feeder 2021-12-09 13:29:41 -0800 Committed r286801 (245041@main): <https://commits.webkit.org/245041@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446569. 1822311 4 webkit-bug-importer 2021-12-09 13:30:24 -0800 <rdar://problem/86288284> 446416 2021-12-08 13:24:55 -0800 2021-12-09 11:05:50 -0800 Patch bug-234033-20211208132454.patch text/plain 7863 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxZDA2ZTllZTRlMDY4 YzgwYTJkNmY4ZjJjNjRhMTEyZjAxZmZkMi4uMDU4NWRjODY4YzFmZjA5OGI2NWE4MzllODViMWNj MWNmZDg3MjRkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEyLTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRyeSBub3Qg dG8gaW5jbHVkZSBub24tY29udGVudCB0eXBlIG9mIGlubGluZSBib3hlcyBpbiB0aGUgdmlzdWFs IHJlb3JkZXJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNDAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIElubGluZUl0ZW1zQnVpbGRlcjo6c2V0QmlkaUxldmVsRm9yT3BhcXVlSW5saW5lSXRl bXMgd2UgdHJ5IHRvIGZpZ3VyZSBvdXQgdGhlIGJpZGkKKyAgICAgICAgbGV2ZWwgZm9yIGlubGlu ZSBib3ggbWFya2VycyAoPHNwYW4+IGFuZCA8L3NwYW4+KSBtb3N0bHkgdG8gYmUgYWJsZSB0byBw b3NpdGlvbgorICAgICAgICBlbXB0eSBpbmxpbmUgYm94ZXMgKHNwZWNpZmljYWxseSB3aXRoIGRl Y29yYXRpb25zKS4gSW4gc29tZSBjYXNlcyB0aG91Z2ggdGhlIGd1ZXNzZWQKKyAgICAgICAgYmlk aSBsZXZlbCBicmVha3MgdGhlIGNvbnRpbnVhdGlvbiBiZXR3ZWVuIHRoZSBjb250ZW50IGJlZm9y ZSBhbmQgYWZ0ZXIgdGhlIG1hcmtlciAoZS5nLiAgYmVmb3JlPC9zcGFuPmFmdGVyKQorICAgICAg ICBJbiB0aGlzIHBhdGNoIHdlIHRyeSB0byBsaW1pdCB0aGUgbnVtYmVyIG9mIGl0ZW1zIGFzc29j aWF0ZWQgd2l0aCB0aGlzIGd1ZXNzZWQgYmlkaSBsZXZlbC4KKworICAgICAgICAqIGxheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 cHJvY2Vzc0JpZGlDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVJdGVtLmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVD b250ZW50KTogd2UgbWF5IG9ubHkgc3VibWl0IGEgc3Vic2V0IG9mIHJ1bnMgdG8gdGhlIHJlb3Jk ZXJpbmcKKyAgICAgICAgYWxnb3JpdGhtLiBJdCBhbHNvIG1lYW5zIHdlIG1heSBlbmQgdXAgd2l0 aCBnYXBzIGJldHdlZW4gdGhlIHZpc3VhbCBpbmRleCB2YWx1ZXMgYW5kIHRoZSByZWFsIHJ1biBp dGVtIGluZGV4ZXMuCisgICAgICAgIFRoZSBydW5JbmRleE9mZnNldE1hcCBlbnN1cmVzIHRoYXQg dGhlIGluZGV4ZXMgYXJlIGFsd2F5cyBjb25zaXN0ZW50IHdpdGggdGhlIGNvbnRlbnQgaW4gdGhl IGxpbmVSdW5zIHZlY3Rvci4KKwogMjAyMS0xMi0wNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ10gdHJ5Ym90CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA0ZDFkYmE2NTBjOGNiMzIx OWZhZGM4MzVlY2QwNTAyNzNiMzE0MzIxLi5mNjRhZDg5NmFmN2RlZDYzMjY4Zjc5YTQyZWIxMzAw NjI5NzExMDRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5jcHAKQEAgLTQ1Myw3ICs0NTMsNyBAQCB2b2lkIElubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JDaGlsZE5vZGUoY29uc3QgRGlz cGxheQogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250 ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRv cExlZnQsIERpc3BsYXlCb3hlcyYgYm94ZXMpCiB7Ci0gICAgQVNTRVJUKGxpbmVDb250ZW50LnZp c3VhbE9yZGVyTGlzdC5zaXplKCkgPT0gbGluZUNvbnRlbnQucnVucy5zaXplKCkpOworICAgIEFT U0VSVChsaW5lQ29udGVudC52aXN1YWxPcmRlckxpc3Quc2l6ZSgpIDw9IGxpbmVDb250ZW50LnJ1 bnMuc2l6ZSgpKTsKIAogICAgIEFuY2VzdG9yU3RhY2sgYW5jZXN0b3JTdGFjazsKICAgICBEaXNw bGF5Qm94Tm9kZSByb290RGlzcGxheUJveE5vZGUgPSB7IH07CkBAIC00NzIsMTIgKzQ3MiwxMyBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogCiAgICAgICAgIGF1dG8gY29udGVudFJpZ2h0SW5W aXN1YWxPcmRlciA9IGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXI7CiAgICAgICAgIGF1dG8mIHJ1 bnMgPSBsaW5lQ29udGVudC5ydW5zOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJ1 bnMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgIGF1dG8gdmlzdWFsSW5kZXggPSBsaW5lQ29u dGVudC52aXN1YWxPcmRlckxpc3RbaV07Ci0gICAgICAgICAgICBhdXRvJiBsaW5lUnVuID0gcnVu c1t2aXN1YWxJbmRleF07CisgICAgICAgIGZvciAoYXV0byB2aXN1YWxPcmRlciA6IGxpbmVDb250 ZW50LnZpc3VhbE9yZGVyTGlzdCkgeworICAgICAgICAgICAgQVNTRVJUKHJ1bnNbdmlzdWFsT3Jk ZXJdLmJpZGlMZXZlbCgpICE9IElubGluZUl0ZW06Om9wYXF1ZUJpZGlMZXZlbCk7CisKKyAgICAg ICAgICAgIGF1dG8mIGxpbmVSdW4gPSBydW5zW3Zpc3VhbE9yZGVyXTsKICAgICAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKLSAgICAgICAgICAgIGF1dG8g bmVlZHNEaXNwbGF5Qm94ID0gIWxpbmVSdW4uaXNJbmxpbmVCb3hFbmQoKSAmJiAhbGluZVJ1bi5p c1dvcmRCcmVha09wcG9ydHVuaXR5KCk7CisgICAgICAgICAgICBhdXRvIG5lZWRzRGlzcGxheUJv eCA9ICFsaW5lUnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKICAgICAgICAgICAgIGlmICgh bmVlZHNEaXNwbGF5Qm94KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJ dGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVJdGVtLmgKaW5kZXggOGExYjQ0NTMzNmMzZGU1MzFlYzlmNjFjZTRkYzk5ODg5MGNmYWUz Zi4uYjdhMDAzMTI0Njg1MTQ4YjliODdkYmE3ZDVmOWE1ZTE3NmYzZGUxYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUl0ZW0uaApAQCAtNTEsNiArNTEsNyBAQCBwdWJsaWM6CiAgICAgSW5saW5lSXRlbShj b25zdCBCb3gmIGxheW91dEJveCwgVHlwZSwgVUJpRGlMZXZlbCA9IFVCSURJX0RFRkFVTFRfTFRS KTsKIAogICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQorICAgIHN0YXRp YyBjb25zdGV4cHIgVUJpRGlMZXZlbCBvcGFxdWVCaWRpTGV2ZWwgPSAweGZmOwogICAgIFVCaURp TGV2ZWwgYmlkaUxldmVsKCkgY29uc3QgeyByZXR1cm4gbV9iaWRpTGV2ZWw7IH0KICAgICBjb25z dCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJuICptX2xheW91dEJveDsgfQogICAgIGNv bnN0IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxl KCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IDQx ZjFiMmY0NTVjOWRiODJiMWU1NzMxMDZhYmQ0Y2MzMTkwZjJjY2YuLmVlNGY3MmViNDBmYmMzNjg2 MTY4YTMwOTQ0Njg4MzZiYThkODAyZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcApAQCAtMzMzLDE1ICszMzMsOCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAg ICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAo aW5saW5lSXRlbXNbaW5kZXhdLmlzSW5saW5lQm94RW5kKCkpIHsKLSAgICAgICAgICAgICAgICAv LyBJbmxpbmUgYm94IGVuZCAoZS5nLiA8L3NwYW4+KSBhbHNvIHVzZXMgdGhlIGNvbnRlbnQgYmlk aSBsZXZlbCwgYnV0IGluIHRoaXMgY2FzZSBpdCdzIHRoZSBwcmV2aW91cyBjb250ZW50LgotICAg ICAgICAgICAgICAgIGF1dG8gcHJldmlvdXNCaWRpTGV2ZWwgPSBbJl0oKSAtPiBzdGQ6Om9wdGlv bmFsPFVCaURpTGV2ZWw+IHsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvIGkgPSBpbmRl eDsgaS0tOykgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlubGluZUl0ZW1PZmZzZXRz W2ldKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBpbmxpbmVJdGVtc1tpXS5i aWRpTGV2ZWwoKTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBy ZXR1cm4geyB9OwotICAgICAgICAgICAgICAgIH0oKTsKLSAgICAgICAgICAgICAgICBpbmxpbmVJ dGVtc1tpbmRleF0uc2V0QmlkaUxldmVsKHByZXZpb3VzQmlkaUxldmVsLnZhbHVlX29yKHJvb3RC aWRpTGV2ZWwpKTsKKyAgICAgICAgICAgICAgICAvLyBMZXQncyBub3QgY29uZnVzZSB1YmlkaSB3 aXRoIG5vbi1jb250ZW50IGVudHJpZXMuIE9wYXF1ZSBydW5zIGFyZSBleGNsdWRlZCBmcm9tIHRo ZSB2aXN1YWwgbGlzdC4KKyAgICAgICAgICAgICAgICBpbmxpbmVJdGVtc1tpbmRleF0uc2V0Qmlk aUxldmVsKElubGluZUl0ZW06Om9wYXF1ZUJpZGlMZXZlbCk7CiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAyNzhjNmM3MGU5 MzIxZjA0NTc5OTRmYmQ0ZWNiNTE4MmNkYjI1YjVlLi40MWIzYjk3M2QyODgyZmY5ZGJlZjdlMGI3 Zjg2YTI0ZmQwZmIxMDgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCkBAIC0zMDAsMTMgKzMwMCwyOSBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1 aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAg ICBpZiAoIW1fbGluZS5jb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZygpKQogICAgICAgICAgICAg cmV0dXJuIHsgfTsKIAotICAgICAgICBWZWN0b3I8VUJpRGlMZXZlbD4gcnVuTGV2ZWxzKGxpbmVS dW5zLnNpemUoKSk7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBtYXkgY2FjaGUgdGhlc2UgdmFsdWVz IGluIExpbmUsIGlmIGl0IHR1cm5zIG91dCB0byBiZSBhIHBlcmYgaGl0LgotICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGxpbmVSdW5zLnNpemUoKTsgKytpKQotICAgICAgICAgICAgcnVu TGV2ZWxzW2ldID0gbGluZVJ1bnNbaV0uYmlkaUxldmVsKCk7CisgICAgICAgIFZlY3RvcjxVQmlE aUxldmVsPiBydW5MZXZlbHM7CisgICAgICAgIHJ1bkxldmVscy5yZXNlcnZlSW5pdGlhbENhcGFj aXR5KGxpbmVSdW5zLnNpemUoKSk7CisKKyAgICAgICAgVmVjdG9yPHNpemVfdD4gcnVuSW5kZXhP ZmZzZXRNYXA7CisgICAgICAgIHJ1bkluZGV4T2Zmc2V0TWFwLnJlc2VydmVJbml0aWFsQ2FwYWNp dHkobGluZVJ1bnMuc2l6ZSgpKTsKKyAgICAgICAgYXV0byBoYXNPcGFxdWVSdW4gPSBmYWxzZTsK KyAgICAgICAgZm9yIChzaXplX3QgaSA9IDAsIGFjY3VtdWxhdGVkT2Zmc2V0ID0gMDsgaSA8IGxp bmVSdW5zLnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICBpZiAobGluZVJ1bnNbaV0uYmlkaUxl dmVsKCkgPT0gSW5saW5lSXRlbTo6b3BhcXVlQmlkaUxldmVsKSB7CisgICAgICAgICAgICAgICAg KythY2N1bXVsYXRlZE9mZnNldDsKKyAgICAgICAgICAgICAgICBoYXNPcGFxdWVSdW4gPSB0cnVl OworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAg cnVuTGV2ZWxzLmFwcGVuZChsaW5lUnVuc1tpXS5iaWRpTGV2ZWwoKSk7CisgICAgICAgICAgICBy dW5JbmRleE9mZnNldE1hcC5hcHBlbmQoYWNjdW11bGF0ZWRPZmZzZXQpOworICAgICAgICB9CiAK LSAgICAgICAgVmVjdG9yPGludDMyX3Q+IHZpc3VhbE9yZGVyTGlzdChsaW5lUnVucy5zaXplKCkp OworICAgICAgICBWZWN0b3I8aW50MzJfdD4gdmlzdWFsT3JkZXJMaXN0KHJ1bkxldmVscy5zaXpl KCkpOwogICAgICAgICB1YmlkaV9yZW9yZGVyVmlzdWFsKHJ1bkxldmVscy5kYXRhKCksIHJ1bkxl dmVscy5zaXplKCksIHZpc3VhbE9yZGVyTGlzdC5kYXRhKCkpOworICAgICAgICBpZiAoaGFzT3Bh cXVlUnVuKSB7CisgICAgICAgICAgICBBU1NFUlQodmlzdWFsT3JkZXJMaXN0LnNpemUoKSA9PSBy dW5JbmRleE9mZnNldE1hcC5zaXplKCkpOworICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBydW5JbmRleE9mZnNldE1hcC5zaXplKCk7ICsraSkKKyAgICAgICAgICAgICAgICB2aXN1 YWxPcmRlckxpc3RbaV0gKz0gcnVuSW5kZXhPZmZzZXRNYXBbdmlzdWFsT3JkZXJMaXN0W2ldXTsK KyAgICAgICAgfQogICAgICAgICByZXR1cm4gdmlzdWFsT3JkZXJMaXN0OwogICAgIH07CiAK 446569 2021-12-09 11:05:52 -0800 2021-12-09 13:29:44 -0800 Patch bug-234033-20211209110551.patch text/plain 7911 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTI1YmNiODZiMmU1NjBk ZTkyZTM1NzI0Mzc5OWNiNTMyM2JiZmViZi4uNTgzN2MzNDBhOWYzOTY1NTE5M2NjY2JjMzI4YWYx NDk2ZjE4NDMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEyLTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRyeSBub3Qg dG8gaW5jbHVkZSBub24tY29udGVudCB0eXBlIG9mIGlubGluZSBib3hlcyBpbiB0aGUgdmlzdWFs IHJlb3JkZXJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNDAzMworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIEluIElubGluZUl0ZW1zQnVpbGRlcjo6c2V0QmlkaUxldmVsRm9yT3BhcXVlSW5saW5lSXRl bXMgd2UgdHJ5IHRvIGZpZ3VyZSBvdXQgdGhlIGJpZGkKKyAgICAgICAgbGV2ZWwgZm9yIGlubGlu ZSBib3ggbWFya2VycyAoPHNwYW4+IGFuZCA8L3NwYW4+KSBtb3N0bHkgdG8gYmUgYWJsZSB0byBw b3NpdGlvbgorICAgICAgICBlbXB0eSBpbmxpbmUgYm94ZXMgKHNwZWNpZmljYWxseSB3aXRoIGRl Y29yYXRpb25zKS4gSW4gc29tZSBjYXNlcyB0aG91Z2ggdGhlIGd1ZXNzZWQKKyAgICAgICAgYmlk aSBsZXZlbCBicmVha3MgdGhlIGNvbnRpbnVhdGlvbiBiZXR3ZWVuIHRoZSBjb250ZW50IGJlZm9y ZSBhbmQgYWZ0ZXIgdGhlIG1hcmtlciAoZS5nLiAgYmVmb3JlPC9zcGFuPmFmdGVyKQorICAgICAg ICBJbiB0aGlzIHBhdGNoIHdlIHRyeSB0byBsaW1pdCB0aGUgbnVtYmVyIG9mIGl0ZW1zIGFzc29j aWF0ZWQgd2l0aCB0aGlzIGd1ZXNzZWQgYmlkaSBsZXZlbC4KKworICAgICAgICAqIGxheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 cHJvY2Vzc0JpZGlDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVJdGVtLmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVD b250ZW50KTogd2UgbWF5IG9ubHkgc3VibWl0IGEgc3Vic2V0IG9mIHJ1bnMgdG8gdGhlIHJlb3Jk ZXJpbmcKKyAgICAgICAgYWxnb3JpdGhtLiBJdCBhbHNvIG1lYW5zIHdlIG1heSBlbmQgdXAgd2l0 aCBnYXBzIGJldHdlZW4gdGhlIHZpc3VhbCBpbmRleCB2YWx1ZXMgYW5kIHRoZSByZWFsIHJ1biBp dGVtIGluZGV4ZXMuCisgICAgICAgIFRoZSBydW5JbmRleE9mZnNldE1hcCBlbnN1cmVzIHRoYXQg dGhlIGluZGV4ZXMgYXJlIGFsd2F5cyBjb25zaXN0ZW50IHdpdGggdGhlIGNvbnRlbnQgaW4gdGhl IGxpbmVSdW5zIHZlY3Rvci4KKwogMjAyMS0xMi0wOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgaW5rIG92ZXJmbG93 IG9uIGJpZGkgaW5saW5lIGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCBlNTQ0YWM3ZmJlOGI1ZTYwZTdlN2E1MGRh MGYxZmFjZGZhY2I5OTA0Li4wY2QwOGYzNGFlNTlmNzU2ZGJhZmE3YjA4MGU2OGNmNzc2MjNhMzk5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAKQEAgLTQ2MCw3ICs0NjAsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVp bGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JDaGlsZE5vZGUoY29uc3QgRGlzcGxheQogCiB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0 IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IExpbmVCb3gmIGxp bmVCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsaW5lQm94TG9naWNhbFRvcExlZnQsIERp c3BsYXlCb3hlcyYgYm94ZXMpCiB7Ci0gICAgQVNTRVJUKGxpbmVDb250ZW50LnZpc3VhbE9yZGVy TGlzdC5zaXplKCkgPT0gbGluZUNvbnRlbnQucnVucy5zaXplKCkpOworICAgIEFTU0VSVChsaW5l Q29udGVudC52aXN1YWxPcmRlckxpc3Quc2l6ZSgpIDw9IGxpbmVDb250ZW50LnJ1bnMuc2l6ZSgp KTsKIAogICAgIEFuY2VzdG9yU3RhY2sgYW5jZXN0b3JTdGFjazsKICAgICBEaXNwbGF5Qm94Tm9k ZSByb290RGlzcGxheUJveE5vZGUgPSB7IH07CkBAIC00NzksMTIgKzQ3OSwxMyBAQCB2b2lkIElu bGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udAogCiAgICAgICAgIGF1dG8gY29udGVudFJpZ2h0SW5WaXN1YWxPcmRl ciA9IGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXI7CiAgICAgICAgIGF1dG8mIHJ1bnMgPSBsaW5l Q29udGVudC5ydW5zOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJ1bnMuc2l6ZSgp OyArK2kpIHsKLSAgICAgICAgICAgIGF1dG8gdmlzdWFsSW5kZXggPSBsaW5lQ29udGVudC52aXN1 YWxPcmRlckxpc3RbaV07Ci0gICAgICAgICAgICBhdXRvJiBsaW5lUnVuID0gcnVuc1t2aXN1YWxJ bmRleF07CisgICAgICAgIGZvciAoYXV0byB2aXN1YWxPcmRlciA6IGxpbmVDb250ZW50LnZpc3Vh bE9yZGVyTGlzdCkgeworICAgICAgICAgICAgQVNTRVJUKHJ1bnNbdmlzdWFsT3JkZXJdLmJpZGlM ZXZlbCgpICE9IElubGluZUl0ZW06Om9wYXF1ZUJpZGlMZXZlbCk7CisKKyAgICAgICAgICAgIGF1 dG8mIGxpbmVSdW4gPSBydW5zW3Zpc3VhbE9yZGVyXTsKICAgICAgICAgICAgIGF1dG8mIGxheW91 dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAKLSAgICAgICAgICAgIGF1dG8gbmVlZHNEaXNw bGF5Qm94ID0gIWxpbmVSdW4uaXNJbmxpbmVCb3hFbmQoKSAmJiAhbGluZVJ1bi5pc1dvcmRCcmVh a09wcG9ydHVuaXR5KCk7CisgICAgICAgICAgICBhdXRvIG5lZWRzRGlzcGxheUJveCA9ICFsaW5l UnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKTsKICAgICAgICAgICAgIGlmICghbmVlZHNEaXNw bGF5Qm94KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVt LmgKaW5kZXggOGExYjQ0NTMzNmMzZGU1MzFlYzlmNjFjZTRkYzk5ODg5MGNmYWUzZi4uYjdhMDAz MTI0Njg1MTQ4YjliODdkYmE3ZDVmOWE1ZTE3NmYzZGUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0 ZW0uaApAQCAtNTEsNiArNTEsNyBAQCBwdWJsaWM6CiAgICAgSW5saW5lSXRlbShjb25zdCBCb3gm IGxheW91dEJveCwgVHlwZSwgVUJpRGlMZXZlbCA9IFVCSURJX0RFRkFVTFRfTFRSKTsKIAogICAg IFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQorICAgIHN0YXRpYyBjb25zdGV4 cHIgVUJpRGlMZXZlbCBvcGFxdWVCaWRpTGV2ZWwgPSAweGZmOwogICAgIFVCaURpTGV2ZWwgYmlk aUxldmVsKCkgY29uc3QgeyByZXR1cm4gbV9iaWRpTGV2ZWw7IH0KICAgICBjb25zdCBCb3gmIGxh eW91dEJveCgpIGNvbnN0IHsgcmV0dXJuICptX2xheW91dEJveDsgfQogICAgIGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCk7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IDQxZjFiMmY0NTVj OWRiODJiMWU1NzMxMDZhYmQ0Y2MzMTkwZjJjY2YuLmVlNGY3MmViNDBmYmMzNjg2MTY4YTMwOTQ0 Njg4MzZiYThkODAyZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy LmNwcApAQCAtMzMzLDE1ICszMzMsOCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtB bmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoaW5saW5lSXRl bXNbaW5kZXhdLmlzSW5saW5lQm94RW5kKCkpIHsKLSAgICAgICAgICAgICAgICAvLyBJbmxpbmUg Ym94IGVuZCAoZS5nLiA8L3NwYW4+KSBhbHNvIHVzZXMgdGhlIGNvbnRlbnQgYmlkaSBsZXZlbCwg YnV0IGluIHRoaXMgY2FzZSBpdCdzIHRoZSBwcmV2aW91cyBjb250ZW50LgotICAgICAgICAgICAg ICAgIGF1dG8gcHJldmlvdXNCaWRpTGV2ZWwgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPFVCaURp TGV2ZWw+IHsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvIGkgPSBpbmRleDsgaS0tOykg ewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlubGluZUl0ZW1PZmZzZXRzW2ldKQotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBpbmxpbmVJdGVtc1tpXS5iaWRpTGV2ZWwo KTsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICByZXR1cm4geyB9 OwotICAgICAgICAgICAgICAgIH0oKTsKLSAgICAgICAgICAgICAgICBpbmxpbmVJdGVtc1tpbmRl eF0uc2V0QmlkaUxldmVsKHByZXZpb3VzQmlkaUxldmVsLnZhbHVlX29yKHJvb3RCaWRpTGV2ZWwp KTsKKyAgICAgICAgICAgICAgICAvLyBMZXQncyBub3QgY29uZnVzZSB1YmlkaSB3aXRoIG5vbi1j b250ZW50IGVudHJpZXMuIE9wYXF1ZSBydW5zIGFyZSBleGNsdWRlZCBmcm9tIHRoZSB2aXN1YWwg bGlzdC4KKyAgICAgICAgICAgICAgICBpbmxpbmVJdGVtc1tpbmRleF0uc2V0QmlkaUxldmVsKElu bGluZUl0ZW06Om9wYXF1ZUJpZGlMZXZlbCk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAyNzhjNmM3MGU5MzIxZjA0NTc5 OTRmYmQ0ZWNiNTE4MmNkYjI1YjVlLi40MWIzYjk3M2QyODgyZmY5ZGJlZjdlMGI3Zjg2YTI0ZmQw ZmIxMDgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0z MDAsMTMgKzMwMCwyOSBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6Omxh eW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAgICBpZiAoIW1f bGluZS5jb250ZW50TmVlZHNCaWRpUmVvcmRlcmluZygpKQogICAgICAgICAgICAgcmV0dXJuIHsg fTsKIAotICAgICAgICBWZWN0b3I8VUJpRGlMZXZlbD4gcnVuTGV2ZWxzKGxpbmVSdW5zLnNpemUo KSk7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBtYXkgY2FjaGUgdGhlc2UgdmFsdWVzIGluIExpbmUs IGlmIGl0IHR1cm5zIG91dCB0byBiZSBhIHBlcmYgaGl0LgotICAgICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IGxpbmVSdW5zLnNpemUoKTsgKytpKQotICAgICAgICAgICAgcnVuTGV2ZWxzW2ld ID0gbGluZVJ1bnNbaV0uYmlkaUxldmVsKCk7CisgICAgICAgIFZlY3RvcjxVQmlEaUxldmVsPiBy dW5MZXZlbHM7CisgICAgICAgIHJ1bkxldmVscy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGxpbmVS dW5zLnNpemUoKSk7CisKKyAgICAgICAgVmVjdG9yPHNpemVfdD4gcnVuSW5kZXhPZmZzZXRNYXA7 CisgICAgICAgIHJ1bkluZGV4T2Zmc2V0TWFwLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobGluZVJ1 bnMuc2l6ZSgpKTsKKyAgICAgICAgYXV0byBoYXNPcGFxdWVSdW4gPSBmYWxzZTsKKyAgICAgICAg Zm9yIChzaXplX3QgaSA9IDAsIGFjY3VtdWxhdGVkT2Zmc2V0ID0gMDsgaSA8IGxpbmVSdW5zLnNp emUoKTsgKytpKSB7CisgICAgICAgICAgICBpZiAobGluZVJ1bnNbaV0uYmlkaUxldmVsKCkgPT0g SW5saW5lSXRlbTo6b3BhcXVlQmlkaUxldmVsKSB7CisgICAgICAgICAgICAgICAgKythY2N1bXVs YXRlZE9mZnNldDsKKyAgICAgICAgICAgICAgICBoYXNPcGFxdWVSdW4gPSB0cnVlOworICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcnVuTGV2ZWxz LmFwcGVuZChsaW5lUnVuc1tpXS5iaWRpTGV2ZWwoKSk7CisgICAgICAgICAgICBydW5JbmRleE9m ZnNldE1hcC5hcHBlbmQoYWNjdW11bGF0ZWRPZmZzZXQpOworICAgICAgICB9CiAKLSAgICAgICAg VmVjdG9yPGludDMyX3Q+IHZpc3VhbE9yZGVyTGlzdChsaW5lUnVucy5zaXplKCkpOworICAgICAg ICBWZWN0b3I8aW50MzJfdD4gdmlzdWFsT3JkZXJMaXN0KHJ1bkxldmVscy5zaXplKCkpOwogICAg ICAgICB1YmlkaV9yZW9yZGVyVmlzdWFsKHJ1bkxldmVscy5kYXRhKCksIHJ1bkxldmVscy5zaXpl KCksIHZpc3VhbE9yZGVyTGlzdC5kYXRhKCkpOworICAgICAgICBpZiAoaGFzT3BhcXVlUnVuKSB7 CisgICAgICAgICAgICBBU1NFUlQodmlzdWFsT3JkZXJMaXN0LnNpemUoKSA9PSBydW5JbmRleE9m ZnNldE1hcC5zaXplKCkpOworICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBydW5J bmRleE9mZnNldE1hcC5zaXplKCk7ICsraSkKKyAgICAgICAgICAgICAgICB2aXN1YWxPcmRlckxp c3RbaV0gKz0gcnVuSW5kZXhPZmZzZXRNYXBbdmlzdWFsT3JkZXJMaXN0W2ldXTsKKyAgICAgICAg fQogICAgICAgICByZXR1cm4gdmlzdWFsT3JkZXJMaXN0OwogICAgIH07CiAK