243166 2022-07-25 07:48:57 -0700 [LFC][IFC] Take IFC root's scrollbar space into account when setting up geometry 2022-08-15 09:28:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=243937 InRadar P2 Normal --- 243222 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1886503 0 zalan 2022-07-25 07:48:57 -0700 ssia 1886504 1 461196 zalan 2022-07-25 07:55:07 -0700 Created attachment 461196 Patch 1886506 2 461198 zalan 2022-07-25 08:11:00 -0700 Created attachment 461198 Patch 1886763 3 ews-feeder 2022-07-26 07:08:30 -0700 Committed 252821@main (f4f4a765f5a7): <https://commits.webkit.org/252821@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 461198. 1886764 4 webkit-bug-importer 2022-07-26 07:09:18 -0700 <rdar://problem/97604499> 461196 2022-07-25 07:55:07 -0700 2022-07-25 08:10:58 -0700 Patch bug-243166-20220725075506.patch text/plain 7615 zalan RnJvbSA3N2ExNTVmNGM4NDI3ODM5ZTk2NzI0NDk5Y2YyYmE4MWEyNGQwZWY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBN b24sIDI1IEp1bCAyMDIyIDA3OjQ5OjEyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBUYWtlIEJGQyByb290J3Mgc2Nyb2xsYmFyIHNwYWNlIGludG8gYWNjb3VudCB3aGVuCiBzZXR0 aW5nIHVwIGdlb21ldHJ5IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDMxNjYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBpbiBwcmVwYXJhdGlv biBmb3Igc3VwcG9ydGluZyAib3ZlcmZsb3c6IHNjcm9sbCIuCgoxLiBDb252ZXJ0IHZpc3VhbCBz Y3JvbGxiYXIgd2lkdGgvaGVpZ2h0IC0+IGxvZ2ljYWwgc2Nyb2xsYmFyIHdpZHRoL2hlaWdodCBi ZWZvcmUgaW5saW5lIGxheW91dAoyLiBVc2Ugc2Nyb2xsYmFyIGxvZ2ljYWwgd2lkdGggdG8gb2Zm c2V0IFJUTCBsaW5lIGJveCAoc2Nyb2xsYmFyIGlzIGF0IHZpc3VhbCBsZWZ0KS4KMy4gVGFrZSBz Y3JvbGxiYXIgaGVpZ2h0IGludG8gYWNjb3VudCB3aGVuIHNldHRpbmcgaGVpZ2h0IGZvciBSZW5k ZXJCbG9ja0Zsb3cuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZCBjb25zdCk6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnNjcm9sbGJhckxvZ2ljYWxTaXpl KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRC b3hEaW1lbnNpb25zKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1 cGRhdGVGb3JtYXR0aW5nUm9vdEdlb21ldHJ5QW5kSW52YWxpZGF0ZSk6CiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmxheW91dE1vZGVybkxpbmVzKToKLS0tCiAuLi4vZGlzcGxheS9JbmxpbmVEaXNwbGF5TGlu ZUJ1aWxkZXIuY3BwICAgICAgfCAgMiArLQogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuY3BwICAgIHwgMjkgKysrKysrKysrKysrKy0tLS0tLQogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwg MjIgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCmluZGV4IDc0 YWQzZDI4MGE2Yy4uNTdlNDkxMjVkM2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVp bGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCkBAIC04OSw3ICs4OSw3 IEBAIElubGluZURpc3BsYXk6OkxpbmUgSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlCiAKICAgICBhdXRvIGxpbmVCb3hWaXN1YWxMZWZ0 ID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbgogICAgICAgICA/IHJvb3RHZW9tZXRyeS5jb250ZW50 Qm94TGVmdCgpICsgbGluZU9mZnNldEZyb21Db250ZW50Qm94Ci0gICAgICAgIDogSW5saW5lTGF5 b3V0VW5pdCB7IHJvb3RHZW9tZXRyeS5ib3JkZXJFbmQoKSB9ICsgcm9vdEdlb21ldHJ5LnBhZGRp bmdFbmQoKS52YWx1ZV9vcigwX2x1KTsKKyAgICAgICAgOiBJbmxpbmVMYXlvdXRVbml0IHsgcm9v dEdlb21ldHJ5LmJvcmRlckVuZCgpIH0gKyByb290R2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9y U2Nyb2xsYmFyKCkgKyByb290R2VvbWV0cnkucGFkZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUpOwog ICAgIGF1dG8gY29udGVudFZpc3VhbExlZnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uCiAgICAg ICAgID8gbGluZUJveC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkKICAgICAgICAgOiBy b290R2VvbWV0cnkuY29udGVudEJveFdpZHRoKCkgLSBsaW5lT2Zmc2V0RnJvbUNvbnRlbnRCb3gg LSAgbGluZUJveC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkgLSBsaW5lQ29udGVudC5j b250ZW50TG9naWNhbFJpZ2h0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwCmluZGV4IGRjZjJhNjUxZDYwMS4uMjZjYTIxYWJmMmYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u TGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0yNjIsNiArMjYyLDE5IEBA IHN0YXRpYyBpbmxpbmUgTGF5b3V0OjpFZGdlcyBsb2dpY2FsUGFkZGluZyhjb25zdCBSZW5kZXJC b3hNb2RlbE9iamVjdCYgcmVuZGVyZXIsCiAgICAgcmV0dXJuIHsgeyBwYWRkaW5nTG9naWNhbExl ZnQsIHBhZGRpbmdMb2dpY2FsUmlnaHQgfSwgeyBwYWRkaW5nTG9naWNhbFRvcCwgcGFkZGluZ0xv Z2ljYWxCb3R0b20gfSB9OwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFNpemUgc2Nyb2xsYmFy TG9naWNhbFNpemUoY29uc3QgUmVuZGVyQm94JiByZW5kZXJlcikKK3sKKyAgICAvLyBTY3JvbGxi YXJzIGVhdCBpbnRvIHRoZSBwYWRkaW5nIGJveCBhcmVhLiBUaGV5IG5ldmVyIHN0cmV0Y2ggdGhl IGJvcmRlciBib3ggYnV0IHRoZXkgbWF5IHNocmluayB0aGUgcGFkZGluZyBib3guCisgICAgLy8g SW4gbGVnYWN5IHJlbmRlciB0cmVlLCBSZW5kZXJCb3g6OmNvbnRlbnRXaWR0aC9jb250ZW50SGVp Z2h0IHZhbHVlcyBhcmUgYWRqdXN0ZWQgdG8gYWNjb21vZGF0ZSB0aGUgc2Nyb2xsYmFyIHdpZHRo L2hlaWdodC4KKyAgICAvLyBlLmcuIDxkaXYgc3R5bGU9IndpZHRoOiAxMHB4OyBvdmVyZmxvdzog c2Nyb2xsOyI+Y29udGVudDwvZGl2PiwgUmVuZGVyQm94Ojpjb250ZW50V2lkdGgoKSB3b24ndCBi ZSByZXR1cm5pbmcgdGhlIHZhbHVlIG9mIDEwcHggYnV0IGluc3RlYWQgMHB4ICgxMHB4IC0gMTVw eCkuCisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IHJlbmRlcmVyLnN0eWxlKCku aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBhdXRvIHZpc3VhbEhvcml6b250YWxTcGFj ZVJlc2VydmVkRm9yU2Nyb2xsYmFyID0gcmVuZGVyZXIucGFkZGluZ0JveFJlY3RJbmNsdWRpbmdT Y3JvbGxiYXIoKS53aWR0aCgpIC0gcmVuZGVyZXIucGFkZGluZ0JveFdpZHRoKCk7CisgICAgYXV0 byB2aXN1YWxWZXJ0aWNhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIgPSByZW5kZXJlci5wYWRk aW5nQm94UmVjdEluY2x1ZGluZ1Njcm9sbGJhcigpLmhlaWdodCgpIC0gcmVuZGVyZXIucGFkZGlu Z0JveEhlaWdodCgpOworICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSkKKyAgICAgICAg cmV0dXJuIHsgdmlzdWFsSG9yaXpvbnRhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIsIHZpc3Vh bFZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciB9OworICAgIHJldHVybiB7IHZpc3Vh bFZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciwgdmlzdWFsSG9yaXpvbnRhbFNwYWNl UmVzZXJ2ZWRGb3JTY3JvbGxiYXIgfTsKK30KKwogdm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlv dXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQog ewogICAgIGF1dG8mIGxheW91dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihy ZXBsYWNlZE9ySW5saW5lQmxvY2spOwpAQCAtMjY5LDE0ICsyODIsOSBAQCB2b2lkIExpbmVMYXlv dXQ6OnVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVyQm94JiByZXBsYWNlZE9y SW5saW5lQmxvYwogICAgIGF1dG8mIHJlcGxhY2VkQm94ID0gZG93bmNhc3Q8TGF5b3V0OjpSZXBs YWNlZEJveD4obGF5b3V0Qm94KTsKIAogICAgIGF1dG8mIHJlcGxhY2VkQm94R2VvbWV0cnkgPSBt X2xheW91dFN0YXRlLmVuc3VyZUdlb21ldHJ5Rm9yQm94KHJlcGxhY2VkQm94KTsKLSAgICAvLyBT Y3JvbGxiYXJzIGVhdCBpbnRvIHRoZSBwYWRkaW5nIGJveCBhcmVhLiBUaGV5IG5ldmVyIHN0cmV0 Y2ggdGhlIGJvcmRlciBib3ggYnV0IHRoZXkgbWF5IHNocmluayB0aGUgcGFkZGluZyBib3guCi0g ICAgLy8gSW4gbGVnYWN5IHJlbmRlciB0cmVlLCBSZW5kZXJCb3g6OmNvbnRlbnRXaWR0aC9jb250 ZW50SGVpZ2h0IHZhbHVlcyBhcmUgYWRqdXN0ZWQgdG8gYWNjb21vZGF0ZSB0aGUgc2Nyb2xsYmFy IHdpZHRoL2hlaWdodC4KLSAgICAvLyBlLmcuIDxkaXYgc3R5bGU9IndpZHRoOiAxMHB4OyBvdmVy Zmxvdzogc2Nyb2xsOyI+Y29udGVudDwvZGl2PiwgUmVuZGVyQm94Ojpjb250ZW50V2lkdGgoKSB3 b24ndCBiZSByZXR1cm5pbmcgdGhlIHZhbHVlIG9mIDEwcHggYnV0IGluc3RlYWQgMHB4ICgxMHB4 IC0gMTVweCkuCi0gICAgYXV0byBob3Jpem9udGFsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciA9 IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5wYWRkaW5nQm94UmVjdEluY2x1ZGluZ1Njcm9sbGJhcigp LndpZHRoKCkgLSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0JveFdpZHRoKCk7Ci0gICAg cmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsU3BhY2VGb3JTY3JvbGxiYXIoaG9yaXpv bnRhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIpOwotCi0gICAgYXV0byB2ZXJ0aWNhbFNwYWNl UmVzZXJ2ZWRGb3JTY3JvbGxiYXIgPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0JveFJl Y3RJbmNsdWRpbmdTY3JvbGxiYXIoKS5oZWlnaHQoKSAtIHJlcGxhY2VkT3JJbmxpbmVCbG9jay5w YWRkaW5nQm94SGVpZ2h0KCk7Ci0gICAgcmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRWZXJ0aWNhbFNw YWNlRm9yU2Nyb2xsYmFyKHZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhcik7CisgICAg YXV0byBzY3JvbGxiYXJTaXplID0gc2Nyb2xsYmFyTG9naWNhbFNpemUocmVwbGFjZWRPcklubGlu ZUJsb2NrKTsKKyAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldEhvcml6b250YWxTcGFjZUZvclNj cm9sbGJhcihzY3JvbGxiYXJTaXplLndpZHRoKCkpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnku c2V0VmVydGljYWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJTaXplLmhlaWdodCgpKTsKIAog ICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKGNvbnRlbnRMb2dpY2Fs V2lkdGhGb3JSZW5kZXJlcihyZXBsYWNlZE9ySW5saW5lQmxvY2spKTsKICAgICByZXBsYWNlZEJv eEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoY29udGVudExvZ2ljYWxIZWlnaHRGb3JSZW5k ZXJlcihyZXBsYWNlZE9ySW5saW5lQmxvY2spKTsKQEAgLTQxNSwxMCArNDIzLDEzIEBAIHZvaWQg TGluZUxheW91dDo6dXBkYXRlRm9ybWF0dGluZ1Jvb3RHZW9tZXRyeUFuZEludmFsaWRhdGUoKQog ICAgIGF1dG8gdXBkYXRlR2VvbWV0cnkgPSBbJl0oYXV0byYgcm9vdCkgewogICAgICAgICBhdXRv IGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24gPSBmbG93LnN0eWxlKCkuaXNMZWZ0VG9SaWdo dERpcmVjdGlvbigpOwogICAgICAgICBhdXRvIHdyaXRpbmdNb2RlID0gZmxvdy5zdHlsZSgpLndy aXRpbmdNb2RlKCk7CisgICAgICAgIGF1dG8gc2Nyb2xsYmFyU2l6ZSA9IHNjcm9sbGJhckxvZ2lj YWxTaXplKGZsb3cpOwogCi0gICAgICAgIHJvb3Quc2V0Q29udGVudEJveFdpZHRoKHdyaXRpbmdN b2RlID09IFdyaXRpbmdNb2RlOjpUb3BUb0JvdHRvbSA/IGZsb3cuY29udGVudFdpZHRoKCkgOiBm bG93LmNvbnRlbnRIZWlnaHQoKSk7CisgICAgICAgIHJvb3Quc2V0Q29udGVudEJveFdpZHRoKFdl YkNvcmU6OmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKSA/IGZsb3cuY29udGVu dFdpZHRoKCkgOiBmbG93LmNvbnRlbnRIZWlnaHQoKSk7CiAgICAgICAgIHJvb3Quc2V0UGFkZGlu Zyhsb2dpY2FsUGFkZGluZyhmbG93LCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCB3cml0 aW5nTW9kZSkpOwogICAgICAgICByb290LnNldEJvcmRlcihsb2dpY2FsQm9yZGVyKGZsb3csIGlz TGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIHdyaXRpbmdNb2RlKSk7CisgICAgICAgIHJvb3Qu c2V0SG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKHNjcm9sbGJhclNpemUud2lkdGgoKSk7Cisg ICAgICAgIHJvb3Quc2V0VmVydGljYWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJTaXplLmhl aWdodCgpKTsKICAgICAgICAgcm9vdC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CiAgICAgICAg IHJvb3Quc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAwYjIwM2ZmZTg0MDYuLjU5NjRjMTU3 OTU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAK QEAgLTM2MzcsNyArMzYzNyw3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRNb2Rlcm5M aW5lcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlcGFpCiAKICAgICBhdXRv IGNvbXB1dGVCb3JkZXJCb3hCb3R0b20gPSBbJl0gewogICAgICAgICBhdXRvIGNvbnRlbnRCb3hC b3R0b20gPSBjb250ZW50Qm94VG9wICsgY29tcHV0ZUNvbnRlbnRIZWlnaHQoKTsKLSAgICAgICAg cmV0dXJuIGNvbnRlbnRCb3hCb3R0b20gKyBib3JkZXJBbmRQYWRkaW5nQWZ0ZXIoKTsKKyAgICAg ICAgcmV0dXJuIGNvbnRlbnRCb3hCb3R0b20gKyBib3JkZXJBbmRQYWRkaW5nQWZ0ZXIoKSArIHNj cm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKICAgICB9OwogCiAgICAgYXV0byBvbGRCb3JkZXJCb3hC b3R0b20gPSBjb21wdXRlQm9yZGVyQm94Qm90dG9tKCk7Cg== 461198 2022-07-25 08:11:00 -0700 2022-07-26 07:08:32 -0700 Patch bug-243166-20220725081059.patch text/plain 7615 zalan RnJvbSAzNGFmZDIxNWRlMTNkYTVmZGZmNDBhODk2M2Q2OTU3NTMyYzQ2NDk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBN b24sIDI1IEp1bCAyMDIyIDA3OjQ5OjEyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBUYWtlIElGQyByb290J3Mgc2Nyb2xsYmFyIHNwYWNlIGludG8gYWNjb3VudCB3aGVuCiBzZXR0 aW5nIHVwIGdlb21ldHJ5IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDMxNjYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBpbiBwcmVwYXJhdGlv biBmb3Igc3VwcG9ydGluZyAib3ZlcmZsb3c6IHNjcm9sbCIuCgoxLiBDb252ZXJ0IHZpc3VhbCBz Y3JvbGxiYXIgd2lkdGgvaGVpZ2h0IC0+IGxvZ2ljYWwgc2Nyb2xsYmFyIHdpZHRoL2hlaWdodCBi ZWZvcmUgaW5saW5lIGxheW91dAoyLiBVc2Ugc2Nyb2xsYmFyIGxvZ2ljYWwgd2lkdGggdG8gb2Zm c2V0IFJUTCBsaW5lIGJveCAoc2Nyb2xsYmFyIGlzIGF0IHZpc3VhbCBsZWZ0KS4KMy4gVGFrZSBz Y3JvbGxiYXIgaGVpZ2h0IGludG8gYWNjb3VudCB3aGVuIHNldHRpbmcgaGVpZ2h0IGZvciBSZW5k ZXJCbG9ja0Zsb3cuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZCBjb25zdCk6CiogU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnNjcm9sbGJhckxvZ2ljYWxTaXpl KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRC b3hEaW1lbnNpb25zKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1 cGRhdGVGb3JtYXR0aW5nUm9vdEdlb21ldHJ5QW5kSW52YWxpZGF0ZSk6CiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmxheW91dE1vZGVybkxpbmVzKToKLS0tCiAuLi4vZGlzcGxheS9JbmxpbmVEaXNwbGF5TGlu ZUJ1aWxkZXIuY3BwICAgICAgfCAgMiArLQogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuY3BwICAgIHwgMjkgKysrKysrKysrKysrKy0tLS0tLQogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwg MjIgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCmluZGV4IDc0 YWQzZDI4MGE2Yy4uNTdlNDkxMjVkM2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVp bGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCkBAIC04OSw3ICs4OSw3 IEBAIElubGluZURpc3BsYXk6OkxpbmUgSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZChj b25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlCiAKICAgICBhdXRvIGxpbmVCb3hWaXN1YWxMZWZ0 ID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbgogICAgICAgICA/IHJvb3RHZW9tZXRyeS5jb250ZW50 Qm94TGVmdCgpICsgbGluZU9mZnNldEZyb21Db250ZW50Qm94Ci0gICAgICAgIDogSW5saW5lTGF5 b3V0VW5pdCB7IHJvb3RHZW9tZXRyeS5ib3JkZXJFbmQoKSB9ICsgcm9vdEdlb21ldHJ5LnBhZGRp bmdFbmQoKS52YWx1ZV9vcigwX2x1KTsKKyAgICAgICAgOiBJbmxpbmVMYXlvdXRVbml0IHsgcm9v dEdlb21ldHJ5LmJvcmRlckVuZCgpIH0gKyByb290R2VvbWV0cnkuaG9yaXpvbnRhbFNwYWNlRm9y U2Nyb2xsYmFyKCkgKyByb290R2VvbWV0cnkucGFkZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUpOwog ICAgIGF1dG8gY29udGVudFZpc3VhbExlZnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uCiAgICAg ICAgID8gbGluZUJveC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkKICAgICAgICAgOiBy b290R2VvbWV0cnkuY29udGVudEJveFdpZHRoKCkgLSBsaW5lT2Zmc2V0RnJvbUNvbnRlbnRCb3gg LSAgbGluZUJveC5yb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkgLSBsaW5lQ29udGVudC5j b250ZW50TG9naWNhbFJpZ2h0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwCmluZGV4IGRjZjJhNjUxZDYwMS4uMjZjYTIxYWJmMmYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9u TGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0yNjIsNiArMjYyLDE5IEBA IHN0YXRpYyBpbmxpbmUgTGF5b3V0OjpFZGdlcyBsb2dpY2FsUGFkZGluZyhjb25zdCBSZW5kZXJC b3hNb2RlbE9iamVjdCYgcmVuZGVyZXIsCiAgICAgcmV0dXJuIHsgeyBwYWRkaW5nTG9naWNhbExl ZnQsIHBhZGRpbmdMb2dpY2FsUmlnaHQgfSwgeyBwYWRkaW5nTG9naWNhbFRvcCwgcGFkZGluZ0xv Z2ljYWxCb3R0b20gfSB9OwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFNpemUgc2Nyb2xsYmFy TG9naWNhbFNpemUoY29uc3QgUmVuZGVyQm94JiByZW5kZXJlcikKK3sKKyAgICAvLyBTY3JvbGxi YXJzIGVhdCBpbnRvIHRoZSBwYWRkaW5nIGJveCBhcmVhLiBUaGV5IG5ldmVyIHN0cmV0Y2ggdGhl IGJvcmRlciBib3ggYnV0IHRoZXkgbWF5IHNocmluayB0aGUgcGFkZGluZyBib3guCisgICAgLy8g SW4gbGVnYWN5IHJlbmRlciB0cmVlLCBSZW5kZXJCb3g6OmNvbnRlbnRXaWR0aC9jb250ZW50SGVp Z2h0IHZhbHVlcyBhcmUgYWRqdXN0ZWQgdG8gYWNjb21vZGF0ZSB0aGUgc2Nyb2xsYmFyIHdpZHRo L2hlaWdodC4KKyAgICAvLyBlLmcuIDxkaXYgc3R5bGU9IndpZHRoOiAxMHB4OyBvdmVyZmxvdzog c2Nyb2xsOyI+Y29udGVudDwvZGl2PiwgUmVuZGVyQm94Ojpjb250ZW50V2lkdGgoKSB3b24ndCBi ZSByZXR1cm5pbmcgdGhlIHZhbHVlIG9mIDEwcHggYnV0IGluc3RlYWQgMHB4ICgxMHB4IC0gMTVw eCkuCisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IHJlbmRlcmVyLnN0eWxlKCku aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBhdXRvIHZpc3VhbEhvcml6b250YWxTcGFj ZVJlc2VydmVkRm9yU2Nyb2xsYmFyID0gcmVuZGVyZXIucGFkZGluZ0JveFJlY3RJbmNsdWRpbmdT Y3JvbGxiYXIoKS53aWR0aCgpIC0gcmVuZGVyZXIucGFkZGluZ0JveFdpZHRoKCk7CisgICAgYXV0 byB2aXN1YWxWZXJ0aWNhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIgPSByZW5kZXJlci5wYWRk aW5nQm94UmVjdEluY2x1ZGluZ1Njcm9sbGJhcigpLmhlaWdodCgpIC0gcmVuZGVyZXIucGFkZGlu Z0JveEhlaWdodCgpOworICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSkKKyAgICAgICAg cmV0dXJuIHsgdmlzdWFsSG9yaXpvbnRhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIsIHZpc3Vh bFZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciB9OworICAgIHJldHVybiB7IHZpc3Vh bFZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciwgdmlzdWFsSG9yaXpvbnRhbFNwYWNl UmVzZXJ2ZWRGb3JTY3JvbGxiYXIgfTsKK30KKwogdm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlv dXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQog ewogICAgIGF1dG8mIGxheW91dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihy ZXBsYWNlZE9ySW5saW5lQmxvY2spOwpAQCAtMjY5LDE0ICsyODIsOSBAQCB2b2lkIExpbmVMYXlv dXQ6OnVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVyQm94JiByZXBsYWNlZE9y SW5saW5lQmxvYwogICAgIGF1dG8mIHJlcGxhY2VkQm94ID0gZG93bmNhc3Q8TGF5b3V0OjpSZXBs YWNlZEJveD4obGF5b3V0Qm94KTsKIAogICAgIGF1dG8mIHJlcGxhY2VkQm94R2VvbWV0cnkgPSBt X2xheW91dFN0YXRlLmVuc3VyZUdlb21ldHJ5Rm9yQm94KHJlcGxhY2VkQm94KTsKLSAgICAvLyBT Y3JvbGxiYXJzIGVhdCBpbnRvIHRoZSBwYWRkaW5nIGJveCBhcmVhLiBUaGV5IG5ldmVyIHN0cmV0 Y2ggdGhlIGJvcmRlciBib3ggYnV0IHRoZXkgbWF5IHNocmluayB0aGUgcGFkZGluZyBib3guCi0g ICAgLy8gSW4gbGVnYWN5IHJlbmRlciB0cmVlLCBSZW5kZXJCb3g6OmNvbnRlbnRXaWR0aC9jb250 ZW50SGVpZ2h0IHZhbHVlcyBhcmUgYWRqdXN0ZWQgdG8gYWNjb21vZGF0ZSB0aGUgc2Nyb2xsYmFy IHdpZHRoL2hlaWdodC4KLSAgICAvLyBlLmcuIDxkaXYgc3R5bGU9IndpZHRoOiAxMHB4OyBvdmVy Zmxvdzogc2Nyb2xsOyI+Y29udGVudDwvZGl2PiwgUmVuZGVyQm94Ojpjb250ZW50V2lkdGgoKSB3 b24ndCBiZSByZXR1cm5pbmcgdGhlIHZhbHVlIG9mIDEwcHggYnV0IGluc3RlYWQgMHB4ICgxMHB4 IC0gMTVweCkuCi0gICAgYXV0byBob3Jpem9udGFsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciA9 IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5wYWRkaW5nQm94UmVjdEluY2x1ZGluZ1Njcm9sbGJhcigp LndpZHRoKCkgLSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0JveFdpZHRoKCk7Ci0gICAg cmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsU3BhY2VGb3JTY3JvbGxiYXIoaG9yaXpv bnRhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIpOwotCi0gICAgYXV0byB2ZXJ0aWNhbFNwYWNl UmVzZXJ2ZWRGb3JTY3JvbGxiYXIgPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0JveFJl Y3RJbmNsdWRpbmdTY3JvbGxiYXIoKS5oZWlnaHQoKSAtIHJlcGxhY2VkT3JJbmxpbmVCbG9jay5w YWRkaW5nQm94SGVpZ2h0KCk7Ci0gICAgcmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRWZXJ0aWNhbFNw YWNlRm9yU2Nyb2xsYmFyKHZlcnRpY2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhcik7CisgICAg YXV0byBzY3JvbGxiYXJTaXplID0gc2Nyb2xsYmFyTG9naWNhbFNpemUocmVwbGFjZWRPcklubGlu ZUJsb2NrKTsKKyAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldEhvcml6b250YWxTcGFjZUZvclNj cm9sbGJhcihzY3JvbGxiYXJTaXplLndpZHRoKCkpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnku c2V0VmVydGljYWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJTaXplLmhlaWdodCgpKTsKIAog ICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKGNvbnRlbnRMb2dpY2Fs V2lkdGhGb3JSZW5kZXJlcihyZXBsYWNlZE9ySW5saW5lQmxvY2spKTsKICAgICByZXBsYWNlZEJv eEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoY29udGVudExvZ2ljYWxIZWlnaHRGb3JSZW5k ZXJlcihyZXBsYWNlZE9ySW5saW5lQmxvY2spKTsKQEAgLTQxNSwxMCArNDIzLDEzIEBAIHZvaWQg TGluZUxheW91dDo6dXBkYXRlRm9ybWF0dGluZ1Jvb3RHZW9tZXRyeUFuZEludmFsaWRhdGUoKQog ICAgIGF1dG8gdXBkYXRlR2VvbWV0cnkgPSBbJl0oYXV0byYgcm9vdCkgewogICAgICAgICBhdXRv IGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24gPSBmbG93LnN0eWxlKCkuaXNMZWZ0VG9SaWdo dERpcmVjdGlvbigpOwogICAgICAgICBhdXRvIHdyaXRpbmdNb2RlID0gZmxvdy5zdHlsZSgpLndy aXRpbmdNb2RlKCk7CisgICAgICAgIGF1dG8gc2Nyb2xsYmFyU2l6ZSA9IHNjcm9sbGJhckxvZ2lj YWxTaXplKGZsb3cpOwogCi0gICAgICAgIHJvb3Quc2V0Q29udGVudEJveFdpZHRoKHdyaXRpbmdN b2RlID09IFdyaXRpbmdNb2RlOjpUb3BUb0JvdHRvbSA/IGZsb3cuY29udGVudFdpZHRoKCkgOiBm bG93LmNvbnRlbnRIZWlnaHQoKSk7CisgICAgICAgIHJvb3Quc2V0Q29udGVudEJveFdpZHRoKFdl YkNvcmU6OmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKSA/IGZsb3cuY29udGVu dFdpZHRoKCkgOiBmbG93LmNvbnRlbnRIZWlnaHQoKSk7CiAgICAgICAgIHJvb3Quc2V0UGFkZGlu Zyhsb2dpY2FsUGFkZGluZyhmbG93LCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCB3cml0 aW5nTW9kZSkpOwogICAgICAgICByb290LnNldEJvcmRlcihsb2dpY2FsQm9yZGVyKGZsb3csIGlz TGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIHdyaXRpbmdNb2RlKSk7CisgICAgICAgIHJvb3Qu c2V0SG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKHNjcm9sbGJhclNpemUud2lkdGgoKSk7Cisg ICAgICAgIHJvb3Quc2V0VmVydGljYWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJTaXplLmhl aWdodCgpKTsKICAgICAgICAgcm9vdC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CiAgICAgICAg IHJvb3Quc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAwYjIwM2ZmZTg0MDYuLjU5NjRjMTU3 OTU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAK QEAgLTM2MzcsNyArMzYzNyw3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRNb2Rlcm5M aW5lcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlcGFpCiAKICAgICBhdXRv IGNvbXB1dGVCb3JkZXJCb3hCb3R0b20gPSBbJl0gewogICAgICAgICBhdXRvIGNvbnRlbnRCb3hC b3R0b20gPSBjb250ZW50Qm94VG9wICsgY29tcHV0ZUNvbnRlbnRIZWlnaHQoKTsKLSAgICAgICAg cmV0dXJuIGNvbnRlbnRCb3hCb3R0b20gKyBib3JkZXJBbmRQYWRkaW5nQWZ0ZXIoKTsKKyAgICAg ICAgcmV0dXJuIGNvbnRlbnRCb3hCb3R0b20gKyBib3JkZXJBbmRQYWRkaW5nQWZ0ZXIoKSArIHNj cm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKICAgICB9OwogCiAgICAgYXV0byBvbGRCb3JkZXJCb3hC b3R0b20gPSBjb21wdXRlQm9yZGVyQm94Qm90dG9tKCk7Cg==