233616 2021-11-29 20:09:10 -0800 [LFC][IFC] Set BoxGeometry for bidi inline boxes 2021-12-04 05:54:27 -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 1818585 0 zalan 2021-11-29 20:09:10 -0800 this is about offsetWidth etc. 1818586 1 445374 zalan 2021-11-29 20:14:31 -0800 Created attachment 445374 Patch 1819547 2 445664 zalan 2021-12-01 20:18:05 -0800 Created attachment 445664 Patch 1819727 3 445725 zalan 2021-12-02 09:24:50 -0800 Created attachment 445725 Patch 1820451 4 ews-feeder 2021-12-04 05:53:02 -0800 Committed r286529 (244861@main): <https://commits.webkit.org/244861@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445725. 1820452 5 webkit-bug-importer 2021-12-04 05:54:27 -0800 <rdar://problem/86051777> 445374 2021-11-29 20:14:31 -0800 2021-12-01 16:03:50 -0800 Patch bug-233616-20211129201430.patch text/plain 5585 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M4YTZhNmEzNDJhZmUw ZjI1NzI0ODZkNDc2ZjkzNjg3NWJiNmEzZS4uNWMyMzdhMDA2YjBjOGJmYTVlZDVkYTI2NmZhMTU0 MTNlYmY2YzFhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNldCBCb3hH ZW9tZXRyeSBmb3IgYmlkaSBpbmxpbmUgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzYxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgY29tcHV0ZSB0aGUgQm94R2Vv bWV0cnkgdmFsdWVzIGZvciB0aGUgYmlkaSBpbmxpbmUgYm94ZXMuCisgICAgICAgIEJveEdlb21l dHJ5IGlzIG1vc3RseSB1c2VkIGZvciBib3VuZGluZ0NsaWVudFJlY3Qvb2Zmc2V0V2lkdGgobGVm dCBldGMpIGNvbXB1dGF0aW9uLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRl bnQpOiBzZXQgdGhlIGluaXRpYWwgQm94R2VvbWV0cnkgb24gdGhlIGZpcnN0IGlubGluZSBib3gK KyAgICAgICAgYW5kIHVwZGF0ZSBvbiB0aGUgbGFzdC4KKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRCb3hHZW9tZXRyeS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCb3hH ZW9tZXRyeTo6Ym9yZGVyQW5kUGFkZGluZ1N0YXJ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckFuZFBhZGRpbmdFbmQgY29uc3QpOgorCiAyMDIx LTExLTI5ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIE1vdmUgaW5saW5lIGJveCBnZW9tZXRyeSAoQm94R2VvbWV0cnkpIHVwZGF0ZSBsb2dpYyB0 byBhIGRlZGljYXRlZCBmdW5jdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYWY5MGQwNTZiYWFiNjc3YTQ1YTMwNTgy OTQxNzVmYjc4MTIzZGZiNC4uZWQ3YzYxMjNlMjJlZjU5Yjc2MzcxYmZjZGRhYTBkOWZjZjVlY2Ji ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXIuY3BwCkBAIC00NjIsNyArNDYyLDEwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAg ICAgICAgICAgICAgICAgICAgIGlmIChpbmxpbmVCb3hEaXNwbGF5Qm94LmlzRmlyc3RCb3goKSkK ICAgICAgICAgICAgICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJp Z2h0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOwogICAgICAgICAgICAgICAgICAgICBpZiAo aW5saW5lQm94RGlzcGxheUJveC5pc0xhc3RCb3goKSkgewotICAgICAgICAgICAgICAgICAgICAg ICAgaW5saW5lQm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciArIGJveEdlb21ldHJ5LmJvcmRlclJpZ2h0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5n UmlnaHQoKS52YWx1ZV9vcigwKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIGNvbnRl bnRMZWZ0SW5WaXN1YWxPcmRlciA9IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hMZWZ0KGJveEdlb21l dHJ5KSArIGJveEdlb21ldHJ5LmJvcmRlckFuZFBhZGRpbmdTdGFydCgpOworICAgICAgICAgICAg ICAgICAgICAgICAgQVNTRVJUKGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgPj0gY29udGVudExl ZnRJblZpc3VhbE9yZGVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNl dENvbnRlbnRCb3hXaWR0aChMYXlvdXRVbml0IHsgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciB9 IC0gY29udGVudExlZnRJblZpc3VhbE9yZGVyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlu bGluZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJpZ2h0KGNvbnRlbnRSaWdodEluVmlzdWFsT3Jk ZXIgKyBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nRW5kKCkpOwogICAgICAgICAgICAgICAg ICAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciA9IGlubGluZUJveERpc3BsYXlCb3gu bG9naWNhbFJpZ2h0KCkgKyBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKICAgICAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTQ3Niw3ICs0NzksOSBAQCB2b2lkIElubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgICAgIGF1dG8gZGlzcGxheUJveExlZnQgPSBjb250 ZW50UmlnaHRJblZpc3VhbE9yZGVyOwogICAgICAgICAgICAgICAgIGlmIChkaXNwbGF5Qm94Lmlz Rmlyc3RCb3goKSkgewogICAgICAgICAgICAgICAgICAgICBkaXNwbGF5Qm94TGVmdCArPSBib3hH ZW9tZXRyeS5tYXJnaW5TdGFydCgpOwotICAgICAgICAgICAgICAgICAgICBjb250ZW50UmlnaHRJ blZpc3VhbE9yZGVyID0gZGlzcGxheUJveExlZnQgKyBib3hHZW9tZXRyeS5ib3JkZXJMZWZ0KCkg KyBib3hHZW9tZXRyeS5wYWRkaW5nTGVmdCgpLnZhbHVlX29yKDApOworICAgICAgICAgICAgICAg ICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gZGlzcGxheUJveExlZnQgKyBib3hHZW9t ZXRyeS5ib3JkZXJBbmRQYWRkaW5nU3RhcnQoKTsKKyAgICAgICAgICAgICAgICAgICAgLy8gVmlz dWFsIHdpZHRoIGlzIG5vdCB5ZXQga25vd24uCisgICAgICAgICAgICAgICAgICAgIHNldElubGlu ZUJveEdlb21ldHJ5KGxheW91dEJveCwgeyBkaXNwbGF5Qm94LmxvZ2ljYWxUb3AoKSwgZGlzcGxh eUJveExlZnQsIHsgfSwgZGlzcGxheUJveC5sb2dpY2FsSGVpZ2h0KCkgfSwgdHJ1ZSk7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0TG9naWNhbExlZnQo ZGlzcGxheUJveExlZnQpOwogICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTUwNyw3ICs1MTIsMTIg QEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3gg PSBib3hlc1tpbmxpbmVCb3hJbmRleF07CiAgICAgICAgICAgICBBU1NFUlQoZGlzcGxheUJveC5p c0xhc3RCb3goKSk7CiAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdT dGF0ZSgpLmJveEdlb21ldHJ5KGRpc3BsYXlCb3gubGF5b3V0Qm94KCkpOwotICAgICAgICAgICAg ZGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArIGJv eEdlb21ldHJ5LmJvcmRlclJpZ2h0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKS52YWx1 ZV9vcigwKSk7CisKKyAgICAgICAgICAgIGF1dG8gY29udGVudExlZnRJblZpc3VhbE9yZGVyID0g Qm94R2VvbWV0cnk6OmJvcmRlckJveExlZnQoYm94R2VvbWV0cnkpICsgYm94R2VvbWV0cnkuYm9y ZGVyQW5kUGFkZGluZ1N0YXJ0KCk7CisgICAgICAgICAgICBBU1NFUlQoY29udGVudFJpZ2h0SW5W aXN1YWxPcmRlciA+PSBjb250ZW50TGVmdEluVmlzdWFsT3JkZXIpOworICAgICAgICAgICAgYm94 R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKExheW91dFVuaXQgeyBjb250ZW50UmlnaHRJblZp c3VhbE9yZGVyIH0gLSBjb250ZW50TGVmdEluVmlzdWFsT3JkZXIpOworCisgICAgICAgICAgICBk aXNwbGF5Qm94LnNldExvZ2ljYWxSaWdodChjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICsgYm94 R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ0VuZCgpKTsKICAgICAgICAgICAgIGNvbnRlbnRSaWdo dEluVmlzdWFsT3JkZXIgPSBkaXNwbGF5Qm94LmxvZ2ljYWxSaWdodCgpICsgYm94R2VvbWV0cnku bWFyZ2luRW5kKCk7CiAgICAgICAgIH0KICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKaW5kZXggNzQyNGY2Y2JhYzRm OTBmYjdiYmFiNDM5NTliNzc1MjJlYWFlMzQ5My4uOTBjYjM4NTBlNTFmYzgwZTQwZTdlZmRiNGQ3 NDQzNjA0YzEwM2RmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94R2VvbWV0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRCb3hHZW9tZXRyeS5oCkBAIC05OSw2ICs5OSw5IEBAIHB1YmxpYzoKICAgICBM YXlvdXRVbml0IHZlcnRpY2FsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpIGNvbnN0IHsgcmV0dXJu IG1hcmdpbkJlZm9yZSgpICsgdmVydGljYWxCb3JkZXIoKSArIHZlcnRpY2FsUGFkZGluZygpLnZh bHVlX29yKDApICsgbWFyZ2luQWZ0ZXIoKTsgfQogICAgIExheW91dFVuaXQgaG9yaXpvbnRhbE1h cmdpbkJvcmRlckFuZFBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtYXJnaW5TdGFydCgpICsgaG9y aXpvbnRhbEJvcmRlcigpICsgaG9yaXpvbnRhbFBhZGRpbmcoKS52YWx1ZV9vcigwKSArIG1hcmdp bkVuZCgpOyB9CiAKKyAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdTdGFydCgpIGNvbnN0 IHsgcmV0dXJuIGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7IH0KKyAg ICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdFbmQoKSBjb25zdCB7IHJldHVybiBib3JkZXJS aWdodCgpICsgcGFkZGluZ1JpZ2h0KCkudmFsdWVfb3IoMCk7IH0KKwogICAgIExheW91dFVuaXQg dmVydGljYWxTcGFjZUZvclNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIG1fdmVydGljYWxTcGFj ZUZvclNjcm9sbGJhcjsgfQogICAgIExheW91dFVuaXQgaG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xs YmFyKCkgY29uc3QgeyByZXR1cm4gbV9ob3Jpem9udGFsU3BhY2VGb3JTY3JvbGxiYXI7IH0KIAo= 445664 2021-12-01 20:18:05 -0800 2021-12-02 09:24:47 -0800 Patch bug-233616-20211201201804.patch text/plain 3312 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDgyMGJiYzc1NzZhMjE2 MjVjZTRhMTJkM2I3ZGNmYjRjY2ViNmI3Ni4uNGYzMzcyOWVhODJiOWM5YmI3MWU3ZTUyYTNjOTFk MGYxOWM2ZDhiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNldCBCb3hH ZW9tZXRyeSBmb3IgYmlkaSBpbmxpbmUgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzYxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgY29tcHV0ZSB0aGUgQm94R2Vv bWV0cnkgdmFsdWVzIGZvciB0aGUgYmlkaSBpbmxpbmUgYm94ZXMuCisgICAgICAgIEJveEdlb21l dHJ5IGlzIG1vc3RseSB1c2VkIGZvciBib3VuZGluZ0NsaWVudFJlY3Qvb2Zmc2V0V2lkdGgobGVm dCBldGMpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorCiAyMDIx LTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIE1vdmUgdGhlIChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxp bmUgYm94IG1hcmdpbiwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4 IGJkMjAyNTBlNTQ5NmM2MTBkMGQyMGVkNzZjODUxODQxMDc2ZGRhNjYuLmMzYzE0OGYwMjkwODc0 MWMxM2QyNzNiNWM0NWJkY2Y4N2I2MjNjYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNDg4LDYgKzQ4OCw3IEBAIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmlzdWFs UmVjdC5zZXRXaWR0aCh7IH0pOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluc2VydElu bGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkobGluZUJveC5pbmxpbmVMZXZlbEJveEZv ckxheW91dEJveCgqaW5saW5lQm94KSwgdmlzdWFsUmVjdCwgaXNGaXJzdEZyYWdtZW50LCBpbmRl eCwgYm94ZXMpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICsraW5kZXg7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc2V0SW5saW5lQm94R2VvbWV0cnkoKmlubGluZUJveCwgdmlz dWFsUmVjdCwgaXNGaXJzdEZyYWdtZW50KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBOZWVkIHRvIHB1c2ggdGhlIHJlc3Qgb2YgdGhlIGNvbnRlbnQgd2hlbiB0aGlzIGlubGluZSBi b3ggaGFzIG1hcmdpbi9ib3JkZXIvcGFkZGluZy4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBuZWVkc0Rpc3BsYXlCb3hIb3Jpem9udGFsQWRqdXN0bWVudCA9IG5lZWRzRGlzcGxheUJveEhv cml6b250YWxBZGp1c3RtZW50CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJv eEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKQpAQCAtNTM1LDEyICs1MzYsMTYgQEAgdm9pZCBJ bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5l QnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgICAgICAgICBpZiAoaW5saW5lQm94RGlzcGxheUJv eC5pc0xhc3RCb3goKSkgewogICAgICAgICAgICAgICAgICAgICBhY2N1bXVsYXRlZE9mZnNldCAr PSBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nRW5kKCkgKyBib3hHZW9tZXRyeS5tYXJnaW5F bmQoKTsKICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94RGlzcGxheUJveC5zZXRMb2dpY2Fs UmlnaHQoY29udGVudFJpZ2h0ICsgYm94R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ0VuZCgpKTsK KworICAgICAgICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRMZWZ0ID0gQm94R2VvbWV0cnk6OmJv cmRlckJveExlZnQoYm94R2VvbWV0cnkpICsgYm94R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ1N0 YXJ0KCk7CisgICAgICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0 aChMYXlvdXRVbml0IHsgY29udGVudFJpZ2h0IH0gLSBjb250ZW50TGVmdCk7CiAgICAgICAgICAg ICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3guc2V0 TG9naWNhbFJpZ2h0KGNvbnRlbnRSaWdodCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBp ZiAoZGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKSAmJiBkaXNwbGF5Qm94LmlzRmlyc3RC b3goKSkgewogICAgICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGRpc3BsYXlCb3gubGF5 b3V0Qm94KCk7CiAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5n U3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOworICAgICAgICAgICAgICAgIGJveEdlb21l dHJ5Lm1vdmVIb3Jpem9udGFsbHkoTGF5b3V0VW5pdCB7IGFjY3VtdWxhdGVkT2Zmc2V0IH0pOwog CiAgICAgICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5KGJveEdlb21ldHJ5 Lm1hcmdpblN0YXJ0KCkpOwogICAgICAgICAgICAgICAgIGFjY3VtdWxhdGVkT2Zmc2V0ICs9IGJv eEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nU3Rh cnQoKTsK 445725 2021-12-02 09:24:50 -0800 2021-12-04 05:53:03 -0800 Patch bug-233616-20211202092449.patch text/plain 2197 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDgyMGJiYzc1NzZhMjE2 MjVjZTRhMTJkM2I3ZGNmYjRjY2ViNmI3Ni4uNGYzMzcyOWVhODJiOWM5YmI3MWU3ZTUyYTNjOTFk MGYxOWM2ZDhiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNldCBCb3hH ZW9tZXRyeSBmb3IgYmlkaSBpbmxpbmUgYm94ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzYxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgY29tcHV0ZSB0aGUgQm94R2Vv bWV0cnkgdmFsdWVzIGZvciB0aGUgYmlkaSBpbmxpbmUgYm94ZXMuCisgICAgICAgIEJveEdlb21l dHJ5IGlzIG1vc3RseSB1c2VkIGZvciBib3VuZGluZ0NsaWVudFJlY3Qvb2Zmc2V0V2lkdGgobGVm dCBldGMpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorCiAyMDIx LTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIE1vdmUgdGhlIChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxp bmUgYm94IG1hcmdpbiwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4 IGJkMjAyNTBlNTQ5NmM2MTBkMGQyMGVkNzZjODUxODQxMDc2ZGRhNjYuLjFiNDhjNTlmYzJjYTBl NmQ4M2Q4NmYzZTA0MmFiOTYzOTdmZTk3MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNTQ5LDYgKzU0OSwxNiBAQCB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0 IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgIH07CiAgICAgaWYgKG5lZWRzRGlzcGxheUJveEhv cml6b250YWxBZGp1c3RtZW50KQogICAgICAgICBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJbmxp bmVCb3hlcygpOworCisgICAgYXV0byBjb21wdXRlSW5saW5lQm94R2VvbWV0cnkgPSBbJl0gewor ICAgICAgICBBU1NFUlQoIWlubGluZUJveFJhbmdlTGlzdC5pc0VtcHR5KCkpOworICAgICAgICBm b3IgKGF1dG8mIGlubGluZUJveFJhbmdlIDogaW5saW5lQm94UmFuZ2VMaXN0KSB7CisgICAgICAg ICAgICBhdXRvJiBpbmxpbmVCb3hEaXNwbGF5Qm94ID0gYm94ZXNbaW5saW5lQm94UmFuZ2UuYmVn aW4oKV07CisgICAgICAgICAgICBzZXRJbmxpbmVCb3hHZW9tZXRyeShpbmxpbmVCb3hEaXNwbGF5 Qm94LmxheW91dEJveCgpLCBpbmxpbmVCb3hEaXNwbGF5Qm94LmxvZ2ljYWxSZWN0KCksIGlubGlu ZUJveERpc3BsYXlCb3guaXNGaXJzdEJveCgpKTsKKyAgICAgICAgfQorICAgIH07CisgICAgaWYg KG5lZWRzTm9uUm9vdElubGluZUJveERpc3BsYXlCb3gpCisgICAgICAgIGNvbXB1dGVJbmxpbmVC b3hHZW9tZXRyeSgpOwogfQogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJv Y2Vzc092ZXJmbG93blJ1bnNGb3JFbGxpcHNpcyhEaXNwbGF5Qm94ZXMmIGJveGVzLCBJbmxpbmVM YXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsUmlnaHQpCg==