260454 2023-08-20 19:24:25 -0700 [IFC] Add non-line-builder based minimum width computation 2023-08-21 19:56:57 -0700 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 1972314 0 zalan 2023-08-20 19:24:25 -0700 ssia 1972315 1 467352 zalan 2023-08-20 19:30:43 -0700 Created attachment 467352 Patch 1972316 2 webkit-bug-importer 2023-08-20 19:30:57 -0700 <rdar://problem/114170752> 1972386 3 467352 koivisto 2023-08-21 08:50:18 -0700 Comment on attachment 467352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=467352&action=review > COMMIT_MESSAGE:8 > +(This is a 4x speedup on PerformanceTests/Layout/line-layout-preferred-width-break-all.html) Not even 10x. Sad. > Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.cpp:39 > +static bool isEligibleForNonLineBuilderProcess(const RenderStyle& style) A new process? 1972431 4 467371 zalan 2023-08-21 11:00:45 -0700 Created attachment 467371 Patch 1972486 5 467372 zalan 2023-08-21 14:14:24 -0700 Created attachment 467372 [fast-cq]Patch 1972555 6 ews-feeder 2023-08-21 19:56:55 -0700 Committed 267116@main (23014ddf9929): <https://commits.webkit.org/267116@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467372. 467352 2023-08-20 19:30:43 -0700 2023-08-21 11:00:43 -0700 Patch bug-260454-20230820193043.patch text/plain 9516 zalan RnJvbSA2ZGNkZDBmOWVkM2Y3MTg5NGM3OThhNWM0YjBjODkzNTM4NGQyMjc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjAgQXVnIDIwMjMgMTk6MjU6MjUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBB ZGQgbm9uLWxpbmUtYnVpbGRlciBiYXNlZCBtaW5pbXVtIHdpZHRoIGNvbXB1dGF0aW9uCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYwNDU0CgpSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KCk1pbmltdW0gc2l6ZSBjb21wdXRhdGlvbiB3aXRoIGJyZWFraW5nIGF0 IGFyYml0cmFyeSBwb3NpdGlvbnMgZG9lcyBub3QgcmVxdWlyZSBsaW5lIGJ1aWxkZXIuCgooVGhp cyBpcyBhIDR4IHNwZWVkdXAgb24gUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQt cHJlZmVycmVkLXdpZHRoLWJyZWFrLWFsbC5odG1sKQoKKiBQZXJmb3JtYW5jZVRlc3RzL0xheW91 dC9saW5lLWxheW91dC5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6 OmlzRWxpZ2libGVGb3JOb25MaW5lQnVpbGRlclByb2Nlc3MpOgooV2ViQ29yZTo6TGF5b3V0OjpJ bnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6ZXMpOgooV2ViQ29yZTo6 TGF5b3V0OjpJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OnNpbXBsaWZpZWRNaW5pbXVtV2lkdGggY29u c3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu dHJpbnNpY1dpZHRoSGFuZGxlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6 TGF5b3V0OjpUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpUZXh0T25seVNpbXBsZUxpbmVCdWls ZGVyKToKKFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpU ZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjppc1dyYXBwaW5nQWxsb3dlZCBjb25zdCk6Ci0tLQog Li4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwICAgICAgICAgIHwgNDEgKysrKysr KysrKysrKysrLS0tLQogLi4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaCAgICAgICAg ICAgIHwgIDEgKwogLi4uL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCAgICAg IHwgIDMgKy0KIC4uLi9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oICAgICAgICB8 ICAyICsKIDQgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAKaW5kZXgg ZWVjYmVmNGVmMmM5Li4xYzVmYjRmZmUyMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50 cmluc2ljV2lkdGhIYW5kbGVyLmNwcApAQCAtMzYsNiArMzYsMTEgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCitzdGF0aWMgYm9vbCBpc0VsaWdpYmxlRm9yTm9u TGluZUJ1aWxkZXJQcm9jZXNzKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK3sKKyAgICByZXR1 cm4gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHN0eWxlKSAmJiAoc3R5bGUubGluZUJyZWFr KCkgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSB8fCBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJl YWs6OkJyZWFrQWxsIHx8IHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtXb3Jk KTsKK30KKwogSW50cmluc2ljV2lkdGhIYW5kbGVyOjpJbnRyaW5zaWNXaWR0aEhhbmRsZXIoY29u c3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAg IDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKIHsK QEAgLTQ0LDI0ICs0OSwyNCBAQCBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OkludHJpbnNpY1dpZHRo SGFuZGxlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saQogSW50cmluc2ljV2lk dGhDb25zdHJhaW50cyBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6 ZXMoKQogewogICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IGZvcm1hdHRpbmdTdGF0 ZSgpOworICAgIGF1dG8mIHJvb3RTdHlsZSA9IHJvb3QoKS5zdHlsZSgpOwogCiAgICAgYXV0byBj b21wdXRlZEludHJpbnNpY1ZhbHVlID0gWyZdKGF1dG8gaW50cmluc2ljV2lkdGhNb2RlLCBhdXRv JiBpbmxpbmVCdWlsZGVyLCBNYXlDYWNoZUxheW91dFJlc3VsdCBtYXlDYWNoZUxheW91dFJlc3Vs dCA9IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpObykgewogICAgICAgICBpbmxpbmVCdWlsZGVyLnNl dEludHJpbnNpY1dpZHRoTW9kZShpbnRyaW5zaWNXaWR0aE1vZGUpOwogICAgICAgICByZXR1cm4g Y2VpbGVkTGF5b3V0VW5pdChjb21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChpbnRy aW5zaWNXaWR0aE1vZGUsIGlubGluZUJ1aWxkZXIsIG1heUNhY2hlTGF5b3V0UmVzdWx0KSk7CiAg ICAgfTsKIAotICAgIGF1dG8gaW50cmluc2ljU2l6ZXMgPSBJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzIHsgfTsKICAgICBpZiAoVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6aXNFbGlnaWJsZUZv clNpbXBsaWZpZWRUZXh0T25seUlubGluZUxheW91dChyb290KCksIGlubGluZUZvcm1hdHRpbmdT dGF0ZSkpIHsKICAgICAgICAgYXV0byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBUZXh0T25seVNp bXBsZUxpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0NvbnRleHQoKSwgeyB9LCBpbmxpbmVGb3JtYXR0 aW5nU3RhdGUuaW5saW5lSXRlbXMoKSB9OwotICAgICAgICBpbnRyaW5zaWNTaXplcyA9IHsgY29t cHV0ZWRJbnRyaW5zaWNWYWx1ZShJbnRyaW5zaWNXaWR0aE1vZGU6Ok1pbmltdW0sIHNpbXBsaWZp ZWRMaW5lQnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2Rl OjpNYXhpbXVtLCBzaW1wbGlmaWVkTGluZUJ1aWxkZXIsIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxk ZXI6Omhhc0ludHJpbnNpY1dpZHRoU3BlY2lmaWNTdHlsZShyb290KCkuc3R5bGUoKSkgPyBNYXlD YWNoZUxheW91dFJlc3VsdDo6Tm8gOiBNYXlDYWNoZUxheW91dFJlc3VsdDo6WWVzKSB9OwotICAg IH0gZWxzZSB7Ci0gICAgICAgIGF1dG8gZmxvYXRpbmdTdGF0ZSA9IEZsb2F0aW5nU3RhdGUgeyBy b290KCkgfTsKLSAgICAgICAgYXV0byBwYXJlbnRCbG9ja0xheW91dFN0YXRlID0gQmxvY2tMYXlv dXRTdGF0ZSB7IGZsb2F0aW5nU3RhdGUsIHsgfSB9OwotICAgICAgICBhdXRvIGlubGluZUxheW91 dFN0YXRlID0gSW5saW5lTGF5b3V0U3RhdGUgeyBwYXJlbnRCbG9ja0xheW91dFN0YXRlLCB7IH0g fTsKLSAgICAgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0Nv bnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwgaW5saW5lRm9y bWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKLSAgICAgICAgaW50cmluc2ljU2l6ZXMgPSB7 IGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNaW5pbXVtLCBsaW5l QnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNYXhp bXVtLCBsaW5lQnVpbGRlcikgfTsKKyAgICAgICAgYXV0byBtaW5pbXVtV2lkdGggPSBpc0VsaWdp YmxlRm9yTm9uTGluZUJ1aWxkZXJQcm9jZXNzKHJvb3RTdHlsZSkgPyBjZWlsZWRMYXlvdXRVbml0 KHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgoKSkgOiBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJp bnNpY1dpZHRoTW9kZTo6TWluaW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyKTsKKyAgICAgICAg cmV0dXJuIHsgbWluaW11bVdpZHRoLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dp ZHRoTW9kZTo6TWF4aW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyLCBUZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyOjpoYXNJbnRyaW5zaWNXaWR0aFNwZWNpZmljU3R5bGUocm9vdFN0eWxlKSA/IE1h eUNhY2hlTGF5b3V0UmVzdWx0OjpObyA6IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpZZXMpIH07CiAg ICAgfQotICAgIHJldHVybiBpbnRyaW5zaWNTaXplczsKKworICAgIGF1dG8gZmxvYXRpbmdTdGF0 ZSA9IEZsb2F0aW5nU3RhdGUgeyByb290KCkgfTsKKyAgICBhdXRvIHBhcmVudEJsb2NrTGF5b3V0 U3RhdGUgPSBCbG9ja0xheW91dFN0YXRlIHsgZmxvYXRpbmdTdGF0ZSwgeyB9IH07CisgICAgYXV0 byBpbmxpbmVMYXlvdXRTdGF0ZSA9IElubGluZUxheW91dFN0YXRlIHsgcGFyZW50QmxvY2tMYXlv dXRTdGF0ZSwgeyB9IH07CisgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9y bWF0dGluZ0NvbnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwg aW5saW5lRm9ybWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKKyAgICByZXR1cm4geyBjb21w dXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSwgbGluZUJ1aWxk ZXIpLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWF4aW11bSwg bGluZUJ1aWxkZXIpIH07CiB9CiAKIExheW91dFVuaXQgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpt YXhpbXVtQ29udGVudFNpemUoKQpAQCAtMTE5LDYgKzEyNCwyNCBAQCBJbmxpbmVMYXlvdXRVbml0 IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFp bnQoSW50cgogICAgIHJldHVybiBtYXhpbXVtQ29udGVudFdpZHRoOwogfQogCitJbmxpbmVMYXlv dXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6c2ltcGxpZmllZE1pbmltdW1XaWR0aCgpIGNv bnN0Cit7CisgICAgYXV0byYgcm9vdFN0eWxlID0gcm9vdCgpLnN0eWxlKCk7CisgICAgYXV0byYg Zm9udENhc2NhZGUgPSByb290U3R5bGUuZm9udENhc2NhZGUoKTsKKworICAgIGF1dG8gbWF4aW11 bVdpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgZm9yIChhdXRvJiBpbmxpbmVJdGVt IDogZm9ybWF0dGluZ1N0YXRlKCkuaW5saW5lSXRlbXMoKSkgeworICAgICAgICBpZiAoaW5saW5l SXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3du Y2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CisgICAgICAgICAgICBmb3IgKHNpemVf dCBjaGFyYWN0ZXJJbmRleCA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7IGNoYXJhY3RlckluZGV4 IDwgaW5saW5lVGV4dEl0ZW0uZW5kKCk7ICsrY2hhcmFjdGVySW5kZXgpCisgICAgICAgICAgICAg ICAgbWF4aW11bVdpZHRoID0gc3RkOjptYXgobWF4aW11bVdpZHRoLCBUZXh0VXRpbDo6d2lkdGgo aW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBjaGFyYWN0ZXJJbmRleCwgY2hhcmFjdGVySW5k ZXggKyAxLCB7IH0sIFRleHRVdGlsOjpVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRp bWl6YXRpb246Ok5vKSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAg ICBBU1NFUlQoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpKTsKKyAgICB9CisgICAgcmV0dXJuIG1h eGltdW1XaWR0aDsKK30KKwogY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIEludHJpbnNp Y1dpZHRoSGFuZGxlcjo6Zm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogewogICAgIHJldHVybiBt X2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbnRyaW5zaWNX aWR0aEhhbmRsZXIuaAppbmRleCBlYTQxZjAwNWE0ZmUuLjVjNDQ4NjU5YjZiMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmlu c2ljV2lkdGhIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmgKQEAgLTQ5LDYgKzQ5LDcgQEAg cHVibGljOgogcHJpdmF0ZToKICAgICBlbnVtIGNsYXNzIE1heUNhY2hlTGF5b3V0UmVzdWx0IDog Ym9vbCB7IE5vLCBZZXMgfTsKICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkSW50cmluc2lj V2lkdGhGb3JDb25zdHJhaW50KEludHJpbnNpY1dpZHRoTW9kZSwgQWJzdHJhY3RMaW5lQnVpbGRl ciYsIE1heUNhY2hlTGF5b3V0UmVzdWx0ID0gTWF5Q2FjaGVMYXlvdXRSZXN1bHQ6Ok5vKTsKKyAg ICBJbmxpbmVMYXlvdXRVbml0IHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgoKSBjb25zdDsKIAogICAg IGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0 OwogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIu Y3BwCmluZGV4IDU1MTEwZjMwNzU2Mi4uMTBkYjVmNjUzYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcApAQCAtOTIsMTMgKzkyLDE0 IEBAIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6OlRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRlCiAgICAgLCBtX3Jvb3RIb3Jpem9udGFsQ29uc3Ry YWludHMocm9vdEhvcml6b250YWxDb25zdHJhaW50cykKICAgICAsIG1fbGluZShpbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCkKICAgICAsIG1faW5saW5lSXRlbXMoaW5saW5lSXRlbXMpCisgICAgLCBt X2lzV3JhcHBpbmdBbGxvd2VkKFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChyb290KCkuc3R5 bGUoKSkpCiB7CiB9CiAKIExpbmVMYXlvdXRSZXN1bHQgVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRl cjo6bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmIGxpbmVJbnB1dCwgY29uc3Qg c3RkOjpvcHRpb25hbDxQcmV2aW91c0xpbmU+JiBwcmV2aW91c0xpbmUpCiB7CiAgICAgaW5pdGlh bGl6ZShsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSwgbGluZUlucHV0LmluaXRpYWxMb2dpY2Fs UmVjdCwgcHJldmlvdXNMaW5lKTsKLSAgICBhdXRvIHBsYWNlZENvbnRlbnRFbmQgPSBUZXh0VXRp bDo6aXNXcmFwcGluZ0FsbG93ZWQocm9vdCgpLnN0eWxlKCkpID8gcGxhY2VJbmxpbmVUZXh0Q29u dGVudChsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSkgOiBwbGFjZU5vbldyYXBwaW5nSW5saW5l VGV4dENvbnRlbnQobGluZUlucHV0Lm5lZWRzTGF5b3V0UmFuZ2UpOworICAgIGF1dG8gcGxhY2Vk Q29udGVudEVuZCA9IGlzV3JhcHBpbmdBbGxvd2VkKCkgPyBwbGFjZUlubGluZVRleHRDb250ZW50 KGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKSA6IHBsYWNlTm9uV3JhcHBpbmdJbmxpbmVUZXh0 Q29udGVudChsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSk7CiAgICAgYXV0byByZXN1bHQgPSBt X2xpbmUuY2xvc2UoKTsKIAogICAgIGF1dG8gaXNMYXN0TGluZSA9IGlzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudChwbGFjZWRDb250ZW50RW5kLCBsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZS5l bmRJbmRleCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1 aWxkZXIuaAppbmRleCA1MDQ4ZmNhMzQ0MmUuLjMwMWU1NjAzNjU0YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1w bGVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaApAQCAtNTYsNiArNTYsNyBA QCBwcml2YXRlOgogICAgIHNpemVfdCByZXZlcnRUb1RyYWlsaW5nSXRlbShjb25zdCBJbmxpbmVJ dGVtUmFuZ2UmLCBjb25zdCBJbmxpbmVUZXh0SXRlbSYpOwogICAgIHNpemVfdCByZXZlcnRUb0xh c3ROb25PdmVyZmxvd2luZ0l0ZW0oY29uc3QgSW5saW5lSXRlbVJhbmdlJik7CiAgICAgSW5saW5l TGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNvbnN0OworICAgIGJvb2wgaXNXcmFwcGluZ0Fs bG93ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzV3JhcHBpbmdBbGxvd2VkOyB9CiAKICAgICBib29s IGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkgY29uc3QgeyByZXR1cm4gIW1fcHJldmlvdXNMaW5lLmhh c192YWx1ZSgpOyB9CiAKQEAgLTczLDYgKzc0LDcgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0 IG1fbGluZUxvZ2ljYWxSZWN0OwogICAgIGNvbnN0IElubGluZUl0ZW1zJiBtX2lubGluZUl0ZW1z OwogICAgIFZlY3Rvcjxjb25zdCBJbmxpbmVUZXh0SXRlbSo+IG1fd3JhcE9wcG9ydHVuaXR5TGlz dDsKKyAgICBib29sIG1faXNXcmFwcGluZ0FsbG93ZWQgeyBmYWxzZSB9OwogCiAgICAgc3RkOjpv cHRpb25hbDxJbmxpbmVUZXh0SXRlbT4gbV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtOwogfTsK 467371 2023-08-21 11:00:45 -0700 2023-08-21 14:18:15 -0700 Patch bug-260454-20230821110045.patch text/plain 9516 zalan RnJvbSBjZGNiMTE4ZTJjZjNkODYyMjM0ZmM3ZWY1OWFjYjJlOTI4ZGQ3NzM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjAgQXVnIDIwMjMgMTk6MjU6MjUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBB ZGQgbm9uLWxpbmUtYnVpbGRlciBiYXNlZCBtaW5pbXVtIHdpZHRoIGNvbXB1dGF0aW9uCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYwNDU0CgpSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KCk1pbmltdW0gc2l6ZSBjb21wdXRhdGlvbiB3aXRoIGJyZWFraW5nIGF0 IGFyYml0cmFyeSBwb3NpdGlvbnMgZG9lcyBub3QgcmVxdWlyZSBsaW5lIGJ1aWxkZXIuCgooVGhp cyBpcyBhIDR4IHNwZWVkdXAgb24gUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQt cHJlZmVycmVkLXdpZHRoLWJyZWFrLWFsbC5odG1sKQoKKiBQZXJmb3JtYW5jZVRlc3RzL0xheW91 dC9saW5lLWxheW91dC5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6 OmlzRWxpZ2libGVGb3JOb25MaW5lQnVpbGRlclByb2Nlc3MpOgooV2ViQ29yZTo6TGF5b3V0OjpJ bnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6ZXMpOgooV2ViQ29yZTo6 TGF5b3V0OjpJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OnNpbXBsaWZpZWRNaW5pbXVtV2lkdGggY29u c3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu dHJpbnNpY1dpZHRoSGFuZGxlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6 TGF5b3V0OjpUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpUZXh0T25seVNpbXBsZUxpbmVCdWls ZGVyKToKKFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpU ZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjppc1dyYXBwaW5nQWxsb3dlZCBjb25zdCk6Ci0tLQog Li4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwICAgICAgICAgIHwgNDEgKysrKysr KysrKysrKysrLS0tLQogLi4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaCAgICAgICAg ICAgIHwgIDEgKwogLi4uL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCAgICAg IHwgIDMgKy0KIC4uLi9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oICAgICAgICB8 ICAyICsKIDQgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAKaW5kZXgg ZWVjYmVmNGVmMmM5Li4xYzVmYjRmZmUyMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50 cmluc2ljV2lkdGhIYW5kbGVyLmNwcApAQCAtMzYsNiArMzYsMTEgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCitzdGF0aWMgYm9vbCBpc0VsaWdpYmxlRm9yTm9u TGluZUJ1aWxkZXJQcm9jZXNzKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK3sKKyAgICByZXR1 cm4gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHN0eWxlKSAmJiAoc3R5bGUubGluZUJyZWFr KCkgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSB8fCBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJl YWs6OkJyZWFrQWxsIHx8IHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtXb3Jk KTsKK30KKwogSW50cmluc2ljV2lkdGhIYW5kbGVyOjpJbnRyaW5zaWNXaWR0aEhhbmRsZXIoY29u c3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAg IDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKIHsK QEAgLTQ0LDI0ICs0OSwyNCBAQCBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OkludHJpbnNpY1dpZHRo SGFuZGxlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saQogSW50cmluc2ljV2lk dGhDb25zdHJhaW50cyBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6 ZXMoKQogewogICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IGZvcm1hdHRpbmdTdGF0 ZSgpOworICAgIGF1dG8mIHJvb3RTdHlsZSA9IHJvb3QoKS5zdHlsZSgpOwogCiAgICAgYXV0byBj b21wdXRlZEludHJpbnNpY1ZhbHVlID0gWyZdKGF1dG8gaW50cmluc2ljV2lkdGhNb2RlLCBhdXRv JiBpbmxpbmVCdWlsZGVyLCBNYXlDYWNoZUxheW91dFJlc3VsdCBtYXlDYWNoZUxheW91dFJlc3Vs dCA9IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpObykgewogICAgICAgICBpbmxpbmVCdWlsZGVyLnNl dEludHJpbnNpY1dpZHRoTW9kZShpbnRyaW5zaWNXaWR0aE1vZGUpOwogICAgICAgICByZXR1cm4g Y2VpbGVkTGF5b3V0VW5pdChjb21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChpbnRy aW5zaWNXaWR0aE1vZGUsIGlubGluZUJ1aWxkZXIsIG1heUNhY2hlTGF5b3V0UmVzdWx0KSk7CiAg ICAgfTsKIAotICAgIGF1dG8gaW50cmluc2ljU2l6ZXMgPSBJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzIHsgfTsKICAgICBpZiAoVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6aXNFbGlnaWJsZUZv clNpbXBsaWZpZWRUZXh0T25seUlubGluZUxheW91dChyb290KCksIGlubGluZUZvcm1hdHRpbmdT dGF0ZSkpIHsKICAgICAgICAgYXV0byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBUZXh0T25seVNp bXBsZUxpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0NvbnRleHQoKSwgeyB9LCBpbmxpbmVGb3JtYXR0 aW5nU3RhdGUuaW5saW5lSXRlbXMoKSB9OwotICAgICAgICBpbnRyaW5zaWNTaXplcyA9IHsgY29t cHV0ZWRJbnRyaW5zaWNWYWx1ZShJbnRyaW5zaWNXaWR0aE1vZGU6Ok1pbmltdW0sIHNpbXBsaWZp ZWRMaW5lQnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2Rl OjpNYXhpbXVtLCBzaW1wbGlmaWVkTGluZUJ1aWxkZXIsIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxk ZXI6Omhhc0ludHJpbnNpY1dpZHRoU3BlY2lmaWNTdHlsZShyb290KCkuc3R5bGUoKSkgPyBNYXlD YWNoZUxheW91dFJlc3VsdDo6Tm8gOiBNYXlDYWNoZUxheW91dFJlc3VsdDo6WWVzKSB9OwotICAg IH0gZWxzZSB7Ci0gICAgICAgIGF1dG8gZmxvYXRpbmdTdGF0ZSA9IEZsb2F0aW5nU3RhdGUgeyBy b290KCkgfTsKLSAgICAgICAgYXV0byBwYXJlbnRCbG9ja0xheW91dFN0YXRlID0gQmxvY2tMYXlv dXRTdGF0ZSB7IGZsb2F0aW5nU3RhdGUsIHsgfSB9OwotICAgICAgICBhdXRvIGlubGluZUxheW91 dFN0YXRlID0gSW5saW5lTGF5b3V0U3RhdGUgeyBwYXJlbnRCbG9ja0xheW91dFN0YXRlLCB7IH0g fTsKLSAgICAgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0Nv bnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwgaW5saW5lRm9y bWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKLSAgICAgICAgaW50cmluc2ljU2l6ZXMgPSB7 IGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNaW5pbXVtLCBsaW5l QnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNYXhp bXVtLCBsaW5lQnVpbGRlcikgfTsKKyAgICAgICAgYXV0byBtaW5pbXVtV2lkdGggPSBpc0VsaWdp YmxlRm9yTm9uTGluZUJ1aWxkZXJQcm9jZXNzKHJvb3RTdHlsZSkgPyBjZWlsZWRMYXlvdXRVbml0 KHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgoKSkgOiBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJp bnNpY1dpZHRoTW9kZTo6TWluaW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyKTsKKyAgICAgICAg cmV0dXJuIHsgbWluaW11bVdpZHRoLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dp ZHRoTW9kZTo6TWF4aW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyLCBUZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyOjpoYXNJbnRyaW5zaWNXaWR0aFNwZWNpZmljU3R5bGUocm9vdFN0eWxlKSA/IE1h eUNhY2hlTGF5b3V0UmVzdWx0OjpObyA6IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpZZXMpIH07CiAg ICAgfQotICAgIHJldHVybiBpbnRyaW5zaWNTaXplczsKKworICAgIGF1dG8gZmxvYXRpbmdTdGF0 ZSA9IEZsb2F0aW5nU3RhdGUgeyByb290KCkgfTsKKyAgICBhdXRvIHBhcmVudEJsb2NrTGF5b3V0 U3RhdGUgPSBCbG9ja0xheW91dFN0YXRlIHsgZmxvYXRpbmdTdGF0ZSwgeyB9IH07CisgICAgYXV0 byBpbmxpbmVMYXlvdXRTdGF0ZSA9IElubGluZUxheW91dFN0YXRlIHsgcGFyZW50QmxvY2tMYXlv dXRTdGF0ZSwgeyB9IH07CisgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9y bWF0dGluZ0NvbnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwg aW5saW5lRm9ybWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKKyAgICByZXR1cm4geyBjb21w dXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSwgbGluZUJ1aWxk ZXIpLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWF4aW11bSwg bGluZUJ1aWxkZXIpIH07CiB9CiAKIExheW91dFVuaXQgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpt YXhpbXVtQ29udGVudFNpemUoKQpAQCAtMTE5LDYgKzEyNCwyNCBAQCBJbmxpbmVMYXlvdXRVbml0 IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFp bnQoSW50cgogICAgIHJldHVybiBtYXhpbXVtQ29udGVudFdpZHRoOwogfQogCitJbmxpbmVMYXlv dXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6c2ltcGxpZmllZE1pbmltdW1XaWR0aCgpIGNv bnN0Cit7CisgICAgYXV0byYgcm9vdFN0eWxlID0gcm9vdCgpLnN0eWxlKCk7CisgICAgYXV0byYg Zm9udENhc2NhZGUgPSByb290U3R5bGUuZm9udENhc2NhZGUoKTsKKworICAgIGF1dG8gbWF4aW11 bVdpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgZm9yIChhdXRvJiBpbmxpbmVJdGVt IDogZm9ybWF0dGluZ1N0YXRlKCkuaW5saW5lSXRlbXMoKSkgeworICAgICAgICBpZiAoaW5saW5l SXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3du Y2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CisgICAgICAgICAgICBmb3IgKHNpemVf dCBjaGFyYWN0ZXJJbmRleCA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7IGNoYXJhY3RlckluZGV4 IDwgaW5saW5lVGV4dEl0ZW0uZW5kKCk7ICsrY2hhcmFjdGVySW5kZXgpCisgICAgICAgICAgICAg ICAgbWF4aW11bVdpZHRoID0gc3RkOjptYXgobWF4aW11bVdpZHRoLCBUZXh0VXRpbDo6d2lkdGgo aW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBjaGFyYWN0ZXJJbmRleCwgY2hhcmFjdGVySW5k ZXggKyAxLCB7IH0sIFRleHRVdGlsOjpVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRp bWl6YXRpb246Ok5vKSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAg ICBBU1NFUlQoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpKTsKKyAgICB9CisgICAgcmV0dXJuIG1h eGltdW1XaWR0aDsKK30KKwogY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIEludHJpbnNp Y1dpZHRoSGFuZGxlcjo6Zm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogewogICAgIHJldHVybiBt X2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbnRyaW5zaWNX aWR0aEhhbmRsZXIuaAppbmRleCBlYTQxZjAwNWE0ZmUuLjVjNDQ4NjU5YjZiMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmlu c2ljV2lkdGhIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmgKQEAgLTQ5LDYgKzQ5LDcgQEAg cHVibGljOgogcHJpdmF0ZToKICAgICBlbnVtIGNsYXNzIE1heUNhY2hlTGF5b3V0UmVzdWx0IDog Ym9vbCB7IE5vLCBZZXMgfTsKICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbXB1dGVkSW50cmluc2lj V2lkdGhGb3JDb25zdHJhaW50KEludHJpbnNpY1dpZHRoTW9kZSwgQWJzdHJhY3RMaW5lQnVpbGRl ciYsIE1heUNhY2hlTGF5b3V0UmVzdWx0ID0gTWF5Q2FjaGVMYXlvdXRSZXN1bHQ6Ok5vKTsKKyAg ICBJbmxpbmVMYXlvdXRVbml0IHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgoKSBjb25zdDsKIAogICAg IGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0 OwogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIu Y3BwCmluZGV4IDU1MTEwZjMwNzU2Mi4uMTBkYjVmNjUzYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcApAQCAtOTIsMTMgKzkyLDE0 IEBAIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6OlRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRlCiAgICAgLCBtX3Jvb3RIb3Jpem9udGFsQ29uc3Ry YWludHMocm9vdEhvcml6b250YWxDb25zdHJhaW50cykKICAgICAsIG1fbGluZShpbmxpbmVGb3Jt YXR0aW5nQ29udGV4dCkKICAgICAsIG1faW5saW5lSXRlbXMoaW5saW5lSXRlbXMpCisgICAgLCBt X2lzV3JhcHBpbmdBbGxvd2VkKFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChyb290KCkuc3R5 bGUoKSkpCiB7CiB9CiAKIExpbmVMYXlvdXRSZXN1bHQgVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRl cjo6bGF5b3V0SW5saW5lQ29udGVudChjb25zdCBMaW5lSW5wdXQmIGxpbmVJbnB1dCwgY29uc3Qg c3RkOjpvcHRpb25hbDxQcmV2aW91c0xpbmU+JiBwcmV2aW91c0xpbmUpCiB7CiAgICAgaW5pdGlh bGl6ZShsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSwgbGluZUlucHV0LmluaXRpYWxMb2dpY2Fs UmVjdCwgcHJldmlvdXNMaW5lKTsKLSAgICBhdXRvIHBsYWNlZENvbnRlbnRFbmQgPSBUZXh0VXRp bDo6aXNXcmFwcGluZ0FsbG93ZWQocm9vdCgpLnN0eWxlKCkpID8gcGxhY2VJbmxpbmVUZXh0Q29u dGVudChsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSkgOiBwbGFjZU5vbldyYXBwaW5nSW5saW5l VGV4dENvbnRlbnQobGluZUlucHV0Lm5lZWRzTGF5b3V0UmFuZ2UpOworICAgIGF1dG8gcGxhY2Vk Q29udGVudEVuZCA9IGlzV3JhcHBpbmdBbGxvd2VkKCkgPyBwbGFjZUlubGluZVRleHRDb250ZW50 KGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKSA6IHBsYWNlTm9uV3JhcHBpbmdJbmxpbmVUZXh0 Q29udGVudChsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSk7CiAgICAgYXV0byByZXN1bHQgPSBt X2xpbmUuY2xvc2UoKTsKIAogICAgIGF1dG8gaXNMYXN0TGluZSA9IGlzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudChwbGFjZWRDb250ZW50RW5kLCBsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZS5l bmRJbmRleCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1 aWxkZXIuaAppbmRleCA1MDQ4ZmNhMzQ0MmUuLjMwMWU1NjAzNjU0YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1w bGVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuaApAQCAtNTYsNiArNTYsNyBA QCBwcml2YXRlOgogICAgIHNpemVfdCByZXZlcnRUb1RyYWlsaW5nSXRlbShjb25zdCBJbmxpbmVJ dGVtUmFuZ2UmLCBjb25zdCBJbmxpbmVUZXh0SXRlbSYpOwogICAgIHNpemVfdCByZXZlcnRUb0xh c3ROb25PdmVyZmxvd2luZ0l0ZW0oY29uc3QgSW5saW5lSXRlbVJhbmdlJik7CiAgICAgSW5saW5l TGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNvbnN0OworICAgIGJvb2wgaXNXcmFwcGluZ0Fs bG93ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzV3JhcHBpbmdBbGxvd2VkOyB9CiAKICAgICBib29s IGlzRmlyc3RGb3JtYXR0ZWRMaW5lKCkgY29uc3QgeyByZXR1cm4gIW1fcHJldmlvdXNMaW5lLmhh c192YWx1ZSgpOyB9CiAKQEAgLTczLDYgKzc0LDcgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0 IG1fbGluZUxvZ2ljYWxSZWN0OwogICAgIGNvbnN0IElubGluZUl0ZW1zJiBtX2lubGluZUl0ZW1z OwogICAgIFZlY3Rvcjxjb25zdCBJbmxpbmVUZXh0SXRlbSo+IG1fd3JhcE9wcG9ydHVuaXR5TGlz dDsKKyAgICBib29sIG1faXNXcmFwcGluZ0FsbG93ZWQgeyBmYWxzZSB9OwogCiAgICAgc3RkOjpv cHRpb25hbDxJbmxpbmVUZXh0SXRlbT4gbV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtOwogfTsK 467372 2023-08-21 14:14:24 -0700 2023-08-21 19:56:56 -0700 [fast-cq]Patch bug-260454-20230821141423.patch text/plain 9869 zalan RnJvbSAxMmE0YTg3MmFmYmM3N2M2MzZjMjgxYzYzMGJjNmNjZmE4YmNhNDZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjAgQXVnIDIwMjMgMTk6MjU6MjUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBB ZGQgbm9uLWxpbmUtYnVpbGRlciBiYXNlZCBtaW5pbXVtIHdpZHRoIGNvbXB1dGF0aW9uCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYwNDU0CgpSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KCk1pbmltdW0gc2l6ZSBjb21wdXRhdGlvbiB3aXRoIGJyZWFraW5nIGF0 IGFyYml0cmFyeSBwb3NpdGlvbnMgZG9lcyBub3QgcmVxdWlyZSBsaW5lIGJ1aWxkZXIuCgooVGhp cyBpcyBhIDR4IHNwZWVkdXAgb24gUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQt cHJlZmVycmVkLXdpZHRoLWJyZWFrLWFsbC5odG1sKQoKKiBQZXJmb3JtYW5jZVRlc3RzL0xheW91 dC9saW5lLWxheW91dC5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6 OmlzRWxpZ2libGVGb3JOb25MaW5lQnVpbGRlclByb2Nlc3MpOgooV2ViQ29yZTo6TGF5b3V0OjpJ bnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6ZXMpOgooV2ViQ29yZTo6 TGF5b3V0OjpJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OnNpbXBsaWZpZWRNaW5pbXVtV2lkdGggY29u c3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu dHJpbnNpY1dpZHRoSGFuZGxlci5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6 TGF5b3V0OjpUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpUZXh0T25seVNpbXBsZUxpbmVCdWls ZGVyKToKKFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpU ZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjppc1dyYXBwaW5nQWxsb3dlZCBjb25zdCk6Ci0tLQog Li4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwICAgICAgICAgIHwgNDggKysrKysr KysrKysrKysrLS0tLQogLi4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaCAgICAgICAg ICAgIHwgIDEgKwogLi4uL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCAgICAg IHwgIDMgKy0KIC4uLi9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oICAgICAgICB8 ICAyICsKIDQgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAKaW5kZXgg ZWVjYmVmNGVmMmM5Li41NTUyNTdjYzIwMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50 cmluc2ljV2lkdGhIYW5kbGVyLmNwcApAQCAtMzYsNiArMzYsMTEgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCitzdGF0aWMgYm9vbCBpc0VsaWdpYmxlRm9yTm9u TGluZUJ1aWxkZXJQcm9jZXNzKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK3sKKyAgICByZXR1 cm4gVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHN0eWxlKSAmJiAoc3R5bGUubGluZUJyZWFr KCkgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSB8fCBzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJl YWs6OkJyZWFrQWxsIHx8IHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtXb3Jk KTsKK30KKwogSW50cmluc2ljV2lkdGhIYW5kbGVyOjpJbnRyaW5zaWNXaWR0aEhhbmRsZXIoY29u c3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAg IDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKIHsK QEAgLTQ0LDI0ICs0OSwyNCBAQCBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OkludHJpbnNpY1dpZHRo SGFuZGxlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saQogSW50cmluc2ljV2lk dGhDb25zdHJhaW50cyBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OmNvbXB1dGVkSW50cmluc2ljU2l6 ZXMoKQogewogICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IGZvcm1hdHRpbmdTdGF0 ZSgpOworICAgIGF1dG8mIHJvb3RTdHlsZSA9IHJvb3QoKS5zdHlsZSgpOwogCiAgICAgYXV0byBj b21wdXRlZEludHJpbnNpY1ZhbHVlID0gWyZdKGF1dG8gaW50cmluc2ljV2lkdGhNb2RlLCBhdXRv JiBpbmxpbmVCdWlsZGVyLCBNYXlDYWNoZUxheW91dFJlc3VsdCBtYXlDYWNoZUxheW91dFJlc3Vs dCA9IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpObykgewogICAgICAgICBpbmxpbmVCdWlsZGVyLnNl dEludHJpbnNpY1dpZHRoTW9kZShpbnRyaW5zaWNXaWR0aE1vZGUpOwogICAgICAgICByZXR1cm4g Y2VpbGVkTGF5b3V0VW5pdChjb21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChpbnRy aW5zaWNXaWR0aE1vZGUsIGlubGluZUJ1aWxkZXIsIG1heUNhY2hlTGF5b3V0UmVzdWx0KSk7CiAg ICAgfTsKIAotICAgIGF1dG8gaW50cmluc2ljU2l6ZXMgPSBJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzIHsgfTsKICAgICBpZiAoVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6aXNFbGlnaWJsZUZv clNpbXBsaWZpZWRUZXh0T25seUlubGluZUxheW91dChyb290KCksIGlubGluZUZvcm1hdHRpbmdT dGF0ZSkpIHsKICAgICAgICAgYXV0byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBUZXh0T25seVNp bXBsZUxpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0NvbnRleHQoKSwgeyB9LCBpbmxpbmVGb3JtYXR0 aW5nU3RhdGUuaW5saW5lSXRlbXMoKSB9OwotICAgICAgICBpbnRyaW5zaWNTaXplcyA9IHsgY29t cHV0ZWRJbnRyaW5zaWNWYWx1ZShJbnRyaW5zaWNXaWR0aE1vZGU6Ok1pbmltdW0sIHNpbXBsaWZp ZWRMaW5lQnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2Rl OjpNYXhpbXVtLCBzaW1wbGlmaWVkTGluZUJ1aWxkZXIsIFRleHRPbmx5U2ltcGxlTGluZUJ1aWxk ZXI6Omhhc0ludHJpbnNpY1dpZHRoU3BlY2lmaWNTdHlsZShyb290KCkuc3R5bGUoKSkgPyBNYXlD YWNoZUxheW91dFJlc3VsdDo6Tm8gOiBNYXlDYWNoZUxheW91dFJlc3VsdDo6WWVzKSB9OwotICAg IH0gZWxzZSB7Ci0gICAgICAgIGF1dG8gZmxvYXRpbmdTdGF0ZSA9IEZsb2F0aW5nU3RhdGUgeyBy b290KCkgfTsKLSAgICAgICAgYXV0byBwYXJlbnRCbG9ja0xheW91dFN0YXRlID0gQmxvY2tMYXlv dXRTdGF0ZSB7IGZsb2F0aW5nU3RhdGUsIHsgfSB9OwotICAgICAgICBhdXRvIGlubGluZUxheW91 dFN0YXRlID0gSW5saW5lTGF5b3V0U3RhdGUgeyBwYXJlbnRCbG9ja0xheW91dFN0YXRlLCB7IH0g fTsKLSAgICAgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0Nv bnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwgaW5saW5lRm9y bWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKLSAgICAgICAgaW50cmluc2ljU2l6ZXMgPSB7 IGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNaW5pbXVtLCBsaW5l QnVpbGRlciksIGNvbXB1dGVkSW50cmluc2ljVmFsdWUoSW50cmluc2ljV2lkdGhNb2RlOjpNYXhp bXVtLCBsaW5lQnVpbGRlcikgfTsKKyAgICAgICAgYXV0byBtaW5pbXVtV2lkdGggPSBpc0VsaWdp YmxlRm9yTm9uTGluZUJ1aWxkZXJQcm9jZXNzKHJvb3RTdHlsZSkgPyBjZWlsZWRMYXlvdXRVbml0 KHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgoKSkgOiBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJp bnNpY1dpZHRoTW9kZTo6TWluaW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyKTsKKyAgICAgICAg cmV0dXJuIHsgbWluaW11bVdpZHRoLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dp ZHRoTW9kZTo6TWF4aW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyLCBUZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyOjpoYXNJbnRyaW5zaWNXaWR0aFNwZWNpZmljU3R5bGUocm9vdFN0eWxlKSA/IE1h eUNhY2hlTGF5b3V0UmVzdWx0OjpObyA6IE1heUNhY2hlTGF5b3V0UmVzdWx0OjpZZXMpIH07CiAg ICAgfQotICAgIHJldHVybiBpbnRyaW5zaWNTaXplczsKKworICAgIGF1dG8gZmxvYXRpbmdTdGF0 ZSA9IEZsb2F0aW5nU3RhdGUgeyByb290KCkgfTsKKyAgICBhdXRvIHBhcmVudEJsb2NrTGF5b3V0 U3RhdGUgPSBCbG9ja0xheW91dFN0YXRlIHsgZmxvYXRpbmdTdGF0ZSwgeyB9IH07CisgICAgYXV0 byBpbmxpbmVMYXlvdXRTdGF0ZSA9IElubGluZUxheW91dFN0YXRlIHsgcGFyZW50QmxvY2tMYXlv dXRTdGF0ZSwgeyB9IH07CisgICAgYXV0byBsaW5lQnVpbGRlciA9IExpbmVCdWlsZGVyIHsgZm9y bWF0dGluZ0NvbnRleHQoKSwgaW5saW5lTGF5b3V0U3RhdGUsIGZsb2F0aW5nU3RhdGUsIHsgfSwg aW5saW5lRm9ybWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCkgfTsKKyAgICByZXR1cm4geyBjb21w dXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSwgbGluZUJ1aWxk ZXIpLCBjb21wdXRlZEludHJpbnNpY1ZhbHVlKEludHJpbnNpY1dpZHRoTW9kZTo6TWF4aW11bSwg bGluZUJ1aWxkZXIpIH07CiB9CiAKIExheW91dFVuaXQgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpt YXhpbXVtQ29udGVudFNpemUoKQpAQCAtMTE5LDYgKzEyNCwzMSBAQCBJbmxpbmVMYXlvdXRVbml0 IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFp bnQoSW50cgogICAgIHJldHVybiBtYXhpbXVtQ29udGVudFdpZHRoOwogfQogCitJbmxpbmVMYXlv dXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6c2ltcGxpZmllZE1pbmltdW1XaWR0aCgpIGNv bnN0Cit7CisgICAgYXV0byYgcm9vdFN0eWxlID0gcm9vdCgpLnN0eWxlKCk7CisgICAgYXV0byYg Zm9udENhc2NhZGUgPSByb290U3R5bGUuZm9udENhc2NhZGUoKTsKKworICAgIGF1dG8gbWF4aW11 bVdpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgZm9yIChhdXRvJiBpbmxpbmVJdGVt IDogZm9ybWF0dGluZ1N0YXRlKCkuaW5saW5lSXRlbXMoKSkgeworICAgICAgICBpZiAoaW5saW5l SXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3du Y2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CisgICAgICAgICAgICBhdXRvIGNvbnRl bnRMZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKKyAgICAgICAgICAgIHNpemVfdCBp bmRleCA9IDA7CisgICAgICAgICAgICB3aGlsZSAoaW5kZXggPCBjb250ZW50TGVuZ3RoKSB7Cisg ICAgICAgICAgICAgICAgYXV0byBjaGFyYWN0ZXJJbmRleCA9IGlubGluZVRleHRJdGVtLnN0YXJ0 KCkgKyBpbmRleDsKKyAgICAgICAgICAgICAgICBhdXRvIGNoYXJhY3Rlckxlbmd0aCA9IFRleHRV dGlsOjpmaXJzdFVzZXJQZXJjZWl2ZWRDaGFyYWN0ZXJMZW5ndGgoaW5saW5lVGV4dEl0ZW0uaW5s aW5lVGV4dEJveCgpLCBjaGFyYWN0ZXJJbmRleCwgY29udGVudExlbmd0aCAtIGluZGV4KTsKKyAg ICAgICAgICAgICAgICBBU1NFUlQoY2hhcmFjdGVyTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICBt YXhpbXVtV2lkdGggPSBzdGQ6Om1heChtYXhpbXVtV2lkdGgsIFRleHRVdGlsOjp3aWR0aChpbmxp bmVUZXh0SXRlbSwgZm9udENhc2NhZGUsIGNoYXJhY3RlckluZGV4LCBjaGFyYWN0ZXJJbmRleCAr IGNoYXJhY3Rlckxlbmd0aCwgeyB9LCBUZXh0VXRpbDo6VXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVh c3VyaW5nT3B0aW1pemF0aW9uOjpObykpOworICAgICAgICAgICAgICAgIGluZGV4ICs9IGNoYXJh Y3Rlckxlbmd0aDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICB9CisgICAgICAgIEFTU0VSVChpbmxpbmVJdGVtLmlzTGluZUJyZWFrKCkpOworICAgIH0KKyAg ICByZXR1cm4gbWF4aW11bVdpZHRoOworfQorCiBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dCYgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbnRyaW5zaWNXaWR0aEhh bmRsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0ludHJpbnNpY1dpZHRoSGFuZGxlci5oCmluZGV4IGVhNDFmMDA1YTRmZS4uNWM0NDg2NTliNmIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaApAQCAtNDks NiArNDksNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGVudW0gY2xhc3MgTWF5Q2FjaGVMYXlv dXRSZXN1bHQgOiBib29sIHsgTm8sIFllcyB9OwogICAgIElubGluZUxheW91dFVuaXQgY29tcHV0 ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0cmFpbnQoSW50cmluc2ljV2lkdGhNb2RlLCBBYnN0cmFj dExpbmVCdWlsZGVyJiwgTWF5Q2FjaGVMYXlvdXRSZXN1bHQgPSBNYXlDYWNoZUxheW91dFJlc3Vs dDo6Tm8pOworICAgIElubGluZUxheW91dFVuaXQgc2ltcGxpZmllZE1pbmltdW1XaWR0aCgpIGNv bnN0OwogCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250 ZXh0KCkgY29uc3Q7CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5n U3RhdGUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVM aW5lQnVpbGRlci5jcHAKaW5kZXggNTUxMTBmMzA3NTYyLi4xMGRiNWY2NTNiNDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRP bmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwCkBAIC05 MiwxMyArOTIsMTQgQEAgVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6VGV4dE9ubHlTaW1wbGVM aW5lQnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGUKICAgICAsIG1fcm9vdEhvcml6 b250YWxDb25zdHJhaW50cyhyb290SG9yaXpvbnRhbENvbnN0cmFpbnRzKQogICAgICwgbV9saW5l KGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAgICwgbV9pbmxpbmVJdGVtcyhpbmxpbmVJdGVt cykKKyAgICAsIG1faXNXcmFwcGluZ0FsbG93ZWQoVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2Vk KHJvb3QoKS5zdHlsZSgpKSkKIHsKIH0KIAogTGluZUxheW91dFJlc3VsdCBUZXh0T25seVNpbXBs ZUxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IExpbmVJbnB1dCYgbGluZUlu cHV0LCBjb25zdCBzdGQ6Om9wdGlvbmFsPFByZXZpb3VzTGluZT4mIHByZXZpb3VzTGluZSkKIHsK ICAgICBpbml0aWFsaXplKGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlLCBsaW5lSW5wdXQuaW5p dGlhbExvZ2ljYWxSZWN0LCBwcmV2aW91c0xpbmUpOwotICAgIGF1dG8gcGxhY2VkQ29udGVudEVu ZCA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dlZChyb290KCkuc3R5bGUoKSkgPyBwbGFjZUlu bGluZVRleHRDb250ZW50KGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKSA6IHBsYWNlTm9uV3Jh cHBpbmdJbmxpbmVUZXh0Q29udGVudChsaW5lSW5wdXQubmVlZHNMYXlvdXRSYW5nZSk7CisgICAg YXV0byBwbGFjZWRDb250ZW50RW5kID0gaXNXcmFwcGluZ0FsbG93ZWQoKSA/IHBsYWNlSW5saW5l VGV4dENvbnRlbnQobGluZUlucHV0Lm5lZWRzTGF5b3V0UmFuZ2UpIDogcGxhY2VOb25XcmFwcGlu Z0lubGluZVRleHRDb250ZW50KGxpbmVJbnB1dC5uZWVkc0xheW91dFJhbmdlKTsKICAgICBhdXRv IHJlc3VsdCA9IG1fbGluZS5jbG9zZSgpOwogCiAgICAgYXV0byBpc0xhc3RMaW5lID0gaXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50KHBsYWNlZENvbnRlbnRFbmQsIGxpbmVJbnB1dC5uZWVkc0xh eW91dFJhbmdlLmVuZEluZGV4KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlT aW1wbGVMaW5lQnVpbGRlci5oCmluZGV4IDUwNDhmY2EzNDQyZS4uMzAxZTU2MDM2NTRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9U ZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5oCkBAIC01 Niw2ICs1Niw3IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IHJldmVydFRvVHJhaWxpbmdJdGVtKGNv bnN0IElubGluZUl0ZW1SYW5nZSYsIGNvbnN0IElubGluZVRleHRJdGVtJik7CiAgICAgc2l6ZV90 IHJldmVydFRvTGFzdE5vbk92ZXJmbG93aW5nSXRlbShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmKTsK ICAgICBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKCkgY29uc3Q7CisgICAgYm9vbCBp c1dyYXBwaW5nQWxsb3dlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNXcmFwcGluZ0FsbG93ZWQ7IH0K IAogICAgIGJvb2wgaXNGaXJzdEZvcm1hdHRlZExpbmUoKSBjb25zdCB7IHJldHVybiAhbV9wcmV2 aW91c0xpbmUuaGFzX3ZhbHVlKCk7IH0KIApAQCAtNzMsNiArNzQsNyBAQCBwcml2YXRlOgogICAg IElubGluZVJlY3QgbV9saW5lTG9naWNhbFJlY3Q7CiAgICAgY29uc3QgSW5saW5lSXRlbXMmIG1f aW5saW5lSXRlbXM7CiAgICAgVmVjdG9yPGNvbnN0IElubGluZVRleHRJdGVtKj4gbV93cmFwT3Bw b3J0dW5pdHlMaXN0OworICAgIGJvb2wgbV9pc1dyYXBwaW5nQWxsb3dlZCB7IGZhbHNlIH07CiAK ICAgICBzdGQ6Om9wdGlvbmFsPElubGluZVRleHRJdGVtPiBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0 ZW07CiB9Owo=