260387 2023-08-18 08:20:06 -0700 [IFC] Do not consult InlineContentBreaker when candidate content fits 2023-08-18 12:08:53 -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 1972056 0 zalan 2023-08-18 08:20:06 -0700 ssia 1972058 1 467325 zalan 2023-08-18 08:51:16 -0700 Created attachment 467325 Patch 1972059 2 467326 zalan 2023-08-18 08:53:30 -0700 Created attachment 467326 [fast-cq]Patch 1972060 3 webkit-bug-importer 2023-08-18 08:53:54 -0700 <rdar://problem/114089128> 1972115 4 ews-feeder 2023-08-18 12:08:50 -0700 Committed 267049@main (cf812ea1c732): <https://commits.webkit.org/267049@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467326. 467325 2023-08-18 08:51:16 -0700 2023-08-18 08:53:28 -0700 Patch bug-260387-20230818085115.patch text/plain 9812 zalan RnJvbSBjMjRiNDMyZjZkMjY4NjJlYmFhNDA1NTIwMWQ4OWUyYmIzYWRiZmU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMTggQXVnIDIwMjMgMDg6NDg6MzYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBE byBub3QgY29uc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlciB3aGVuIGNhbmRpZGF0ZQogY29udGVu dCBmaXRzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjAzODcKClJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKfjYgcHJvZ3Jlc3Npb24gb24gUGVyZm9ybWFuY2VU ZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQuaHRtbAoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CihXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudCk6Ciog U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5l Q29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OlRleHRP bmx5U2ltcGxlTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZVRleHRDb250ZW50KToKLS0tCiAuLi4v aW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCAgICAgICAgICAgfCAgOSArLS0tCiAuLi4v aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCAgICAgICAgICAgICAgfCA0NCArKysrKysrKysr LS0tLS0tLS0tCiAuLi4vaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwICAgICAg fCAxMyArKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmlu ZGV4IDE3OWM2ZmU2ZWYwOS4uM2IyY2IxM2YwOTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC0xMTEsMTMgKzExMSw4IEBAIHN0YXRpYyBpbmxp bmUgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGZpcnN0VGV4dFJ1bkluZGV4KGNvbnN0IElubGluZUNv bnRlbnRCcmVha2VyCiBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRC cmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDb250aW51b3VzQ29udGVudCYgY2Fu ZGlkYXRlQ29udGVudCwgY29uc3QgTGluZVN0YXR1cyYgbGluZVN0YXR1cykKIHsKICAgICBBU1NF UlQoIXN0ZDo6aXNuYW4obGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkpOwotICAgIGF1dG8gcHJv Y2Vzc0NhbmRpZGF0ZUNvbnRlbnQgPSBbJl0gewotICAgICAgICBpZiAoY2FuZGlkYXRlQ29udGVu dC5sb2dpY2FsV2lkdGgoKSA8PSBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoKQotICAgICAgICAg ICAgcmV0dXJuIFJlc3VsdCB7IFJlc3VsdDo6QWN0aW9uOjpLZWVwIH07Ci0gICAgICAgIHJldHVy biBwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQsIGxpbmVTdGF0dXMp OwotICAgIH07Ci0KLSAgICBhdXRvIHJlc3VsdCA9IHByb2Nlc3NDYW5kaWRhdGVDb250ZW50KCk7 CisgICAgQVNTRVJUKGNhbmRpZGF0ZUNvbnRlbnQubG9naWNhbFdpZHRoKCkgPiBsaW5lU3RhdHVz LmF2YWlsYWJsZVdpZHRoKTsKKyAgICBhdXRvIHJlc3VsdCA9IHByb2Nlc3NPdmVyZmxvd2luZ0Nv bnRlbnQoY2FuZGlkYXRlQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgaWYgKHJlc3VsdC5hY3Rp b24gPT0gUmVzdWx0OjpBY3Rpb246OldyYXAgJiYgbGluZVN0YXR1cy50cmFpbGluZ1NvZnRIeXBo ZW5XaWR0aCAmJiBoYXNMZWFkaW5nVGV4dENvbnRlbnQoY2FuZGlkYXRlQ29udGVudCkpIHsKICAg ICAgICAgLy8gQSB0cmFpbGluZyBzb2Z0IGh5cGhlbiB3aXRoIGEgd3JhcHBlZCB0ZXh0IGNvbnRl bnQgdHVybnMgaW50byBhIHZpc2libGUgaHlwaGVuLgogICAgICAgICAvLyBMZXQncyBjaGVjayBp ZiB0aGVyZSdzIGVub3VnaCBzcGFjZSBmb3IgdGhlIGh5cGhlbiBjaGFyYWN0ZXIuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggN2RjYjIyZjI3NGE1Li5hMTI0 NWY3ZTk0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTk1NCwzMSArOTU0LDExIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRs ZUlubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvCiAgICAgICAgIEFTU0VS VChpbmxpbmVDb250ZW50LnRyYWlsaW5nTGluZUJyZWFrKCkgfHwgaW5saW5lQ29udGVudC50cmFp bGluZ1dvcmRCcmVha09wcG9ydHVuaXR5KCkpOwogICAgICAgICByZXR1cm4geyBpbmxpbmVDb250 ZW50LnRyYWlsaW5nTGluZUJyZWFrKCkgPyBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxp bmU6OlllcyA6IElubGluZUNvbnRlbnRCcmVha2VyOjpJc0VuZE9mTGluZTo6Tm8gfTsKICAgICB9 Ci0gICAgbV9pbmxpbmVDb250ZW50QnJlYWtlci5zZXRIeXBoZW5hdGlvbkRpc2FibGVkKHNob3Vs ZERpc2FibGVIeXBoZW5hdGlvbihyb290KCkuc3R5bGUoKSwgbV9zdWNjZXNzaXZlSHlwaGVuYXRl ZExpbmVDb3VudCkpOwotICAgIG1faW5saW5lQ29udGVudEJyZWFrZXIuc2V0SXNJbkludHJpbnNp Y1dpZHRoTW9kZShpc0luSW50cmluc2ljV2lkdGhNb2RlKCkpOwogCiAgICAgLy8gV2hpbGUgdGhl IGZsb2F0cyBhcmUgbm90IGNvbnNpZGVyZWQgdG8gYmUgb24gdGhlIGxpbmUsIHRoZXkgbWFrZSB0 aGUgbGluZSBjb250ZW50ZnVsIGZvciBsaW5lIGJyZWFraW5nLgogICAgIGF1dG8gW2xpbmVSZWN0 QWRqdXRlZFdpdGhDYW5kaWRhdGVDb250ZW50LCBjYW5kaWRhdGVDb250ZW50SXNDb25zdHJhaW5l ZEJ5RmxvYXRdID0gYWRqdXN0ZWRMaW5lUmVjdFdpdGhDYW5kaWRhdGVJbmxpbmVDb250ZW50KGxp bmVDYW5kaWRhdGUpOwogICAgIC8vIE5vdGUgdGhhdCBhZGp1c3RlZCBsaW5lIGhlaWdodCBuZXZl ciBzaHJpbmtzLgogICAgIG1fY2FuZGlkYXRlSW5saW5lQ29udGVudEVuY2xvc2luZ0hlaWdodCA9 IGxpbmVSZWN0QWRqdXRlZFdpdGhDYW5kaWRhdGVDb250ZW50LmhlaWdodCgpOwotCi0gICAgLy8g SWYgd2lkdGggY29uc3RyYWludCBvdmVycmlkZXMgZXhpc3QsIG1vZGlmeSB0aGUgYXZhaWxhYmxl IHdpZHRoIGFjY29yZGluZ2x5LgotICAgIGF1dG8gbGluZUluZGV4ID0gbV9wcmV2aW91c0xpbmUg PyAobV9wcmV2aW91c0xpbmUtPmxpbmVJbmRleCArIDEpIDogMGx1OwotICAgIGNvbnN0IGF1dG8m IGF2YWlsYWJsZUxpbmVXaWR0aE92ZXJyaWRlID0gbV9pbmxpbmVMYXlvdXRTdGF0ZS5hdmFpbGFi bGVMaW5lV2lkdGhPdmVycmlkZSgpOwotICAgIGF1dG8gd2lkdGhPdmVycmlkZSA9IGF2YWlsYWJs ZUxpbmVXaWR0aE92ZXJyaWRlLmF2YWlsYWJsZUxpbmVXaWR0aE92ZXJyaWRlRm9yTGluZShsaW5l SW5kZXgpOwotICAgIGF1dG8gYXZhaWxhYmxlVG90YWxXaWR0aEZvckNvbnRlbnQgPSB3aWR0aE92 ZXJyaWRlID8gSW5saW5lTGF5b3V0VW5pdCB7IHdpZHRoT3ZlcnJpZGUudmFsdWUoKSB9IC0gbV9s aW5lTWFyZ2luU3RhcnQgOiBsaW5lUmVjdEFkanV0ZWRXaXRoQ2FuZGlkYXRlQ29udGVudC53aWR0 aCgpOwotCi0gICAgYXV0byBhdmFpbGFibGVXaWR0aEZvckNhbmRpZGF0ZUNvbnRlbnQgPSBhdmFp bGFibGVXaWR0aChpbmxpbmVDb250ZW50LCBtX2xpbmUsIGF2YWlsYWJsZVRvdGFsV2lkdGhGb3JD b250ZW50KTsKLSAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRDb250ZW50ZnVsID0gbV9saW5lLmhh c0NvbnRlbnRPckxpc3RNYXJrZXIoKSB8fCBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB8fCBj YW5kaWRhdGVDb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3RhdHVz ID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgewotICAgICAgICBtX2xpbmUuY29u dGVudExvZ2ljYWxSaWdodCgpLAotICAgICAgICBhdmFpbGFibGVXaWR0aEZvckNhbmRpZGF0ZUNv bnRlbnQsCi0gICAgICAgIG1fbGluZS50cmltbWFibGVUcmFpbGluZ1dpZHRoKCksCi0gICAgICAg IG1fbGluZS50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCgpLAotICAgICAgICBtX2xpbmUuaXNUcmFp bGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCksCi0gICAgICAgIGxpbmVJc0NvbnNpZGVyZWRDb250ZW50 ZnVsLAotICAgICAgICAhbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmlzRW1wdHkoKQotICAgIH07CiAg ICAgYXV0byB0b0xpbmVCdWlsZGVyUmVzdWx0ID0gWyZdKGF1dG8mIGxpbmVCcmVha2luZ1Jlc3Vs dCkgLT4gTGluZUJ1aWxkZXI6OlJlc3VsdCB7CiAgICAgICAgIGF1dG8mIGNhbmRpZGF0ZVJ1bnMg PSBjb250aW51b3VzSW5saW5lQ29udGVudC5ydW5zKCk7CiAgICAgCkBAIC0xMDY4LDcgKzEwNDgs MjkgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVu dChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW8KICAgICAgICAgcmV0dXJuIHsgSW5saW5lQ29u dGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpObyB9OwogICAgIH07CiAKLSAgICBhdXRvIGxpbmVC cmVha2luZ1Jlc3VsdCA9IG1faW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRl bnQoY29udGludW91c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0dXMpOworICAgIC8vIElmIHdpZHRo IGNvbnN0cmFpbnQgb3ZlcnJpZGVzIGV4aXN0LCBtb2RpZnkgdGhlIGF2YWlsYWJsZSB3aWR0aCBh Y2NvcmRpbmdseS4KKyAgICBhdXRvIGxpbmVJbmRleCA9IG1fcHJldmlvdXNMaW5lID8gKG1fcHJl dmlvdXNMaW5lLT5saW5lSW5kZXggKyAxKSA6IDBsdTsKKyAgICBjb25zdCBhdXRvJiBhdmFpbGFi bGVMaW5lV2lkdGhPdmVycmlkZSA9IG1faW5saW5lTGF5b3V0U3RhdGUuYXZhaWxhYmxlTGluZVdp ZHRoT3ZlcnJpZGUoKTsKKyAgICBhdXRvIHdpZHRoT3ZlcnJpZGUgPSBhdmFpbGFibGVMaW5lV2lk dGhPdmVycmlkZS5hdmFpbGFibGVMaW5lV2lkdGhPdmVycmlkZUZvckxpbmUobGluZUluZGV4KTsK KyAgICBhdXRvIGF2YWlsYWJsZVRvdGFsV2lkdGhGb3JDb250ZW50ID0gd2lkdGhPdmVycmlkZSA/ IElubGluZUxheW91dFVuaXQgeyB3aWR0aE92ZXJyaWRlLnZhbHVlKCkgfSAtIG1fbGluZU1hcmdp blN0YXJ0IDogbGluZVJlY3RBZGp1dGVkV2l0aENhbmRpZGF0ZUNvbnRlbnQud2lkdGgoKTsKKyAg ICBhdXRvIGF2YWlsYWJsZVdpZHRoRm9yQ2FuZGlkYXRlQ29udGVudCA9IGF2YWlsYWJsZVdpZHRo KGlubGluZUNvbnRlbnQsIG1fbGluZSwgYXZhaWxhYmxlVG90YWxXaWR0aEZvckNvbnRlbnQpOwor CisgICAgYXV0byBsaW5lQnJlYWtpbmdSZXN1bHQgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVz dWx0IHsgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6QWN0aW9uOjpLZWVwLCBJbmxpbmVD b250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vLCB7IH0sIHsgfSB9OworICAgIGlmIChjb250 aW51b3VzSW5saW5lQ29udGVudC5sb2dpY2FsV2lkdGgoKSA+IGF2YWlsYWJsZVdpZHRoRm9yQ2Fu ZGlkYXRlQ29udGVudCkgeworICAgICAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRDb250ZW50ZnVs ID0gbV9saW5lLmhhc0NvbnRlbnRPckxpc3RNYXJrZXIoKSB8fCBtX2xpbmVJc0NvbnN0cmFpbmVk QnlGbG9hdCB8fCBjYW5kaWRhdGVDb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7CisgICAgICAg IGF1dG8gbGluZVN0YXR1cyA9IElubGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsKKyAg ICAgICAgICAgIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksCisgICAgICAgICAgICBhdmFp bGFibGVXaWR0aEZvckNhbmRpZGF0ZUNvbnRlbnQsCisgICAgICAgICAgICBtX2xpbmUudHJpbW1h YmxlVHJhaWxpbmdXaWR0aCgpLAorICAgICAgICAgICAgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhl bldpZHRoKCksCisgICAgICAgICAgICBtX2xpbmUuaXNUcmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxl KCksCisgICAgICAgICAgICBsaW5lSXNDb25zaWRlcmVkQ29udGVudGZ1bCwKKyAgICAgICAgICAg ICFtX3dyYXBPcHBvcnR1bml0eUxpc3QuaXNFbXB0eSgpCisgICAgICAgIH07CisgICAgICAgIG1f aW5saW5lQ29udGVudEJyZWFrZXIuc2V0SHlwaGVuYXRpb25EaXNhYmxlZChzaG91bGREaXNhYmxl SHlwaGVuYXRpb24ocm9vdCgpLnN0eWxlKCksIG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5lQ291 bnQpKTsKKyAgICAgICAgbV9pbmxpbmVDb250ZW50QnJlYWtlci5zZXRJc0luSW50cmluc2ljV2lk dGhNb2RlKGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUoKSk7CisgICAgICAgIGxpbmVCcmVha2luZ1Jl c3VsdCA9IG1faW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQoY29udGlu dW91c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0dXMpOworICAgIH0KICAgICBhdXRvIGxpbmVHYWlu c05ld0NvbnRlbnQgPSBsaW5lQnJlYWtpbmdSZXN1bHQuYWN0aW9uID09IElubGluZUNvbnRlbnRC cmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6S2VlcCB8fCBsaW5lQnJlYWtpbmdSZXN1bHQuYWN0aW9u ID09IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6QnJlYWs7IAogICAgIGlm IChsaW5lR2FpbnNOZXdDb250ZW50KSB7CiAgICAgICAgIC8vIFNvbWV0aW1lcyBpbiBvcmRlciB0 byBwdXQgdGhpcyBjb250ZW50IG9uIHRoZSBsaW5lLCB3ZSBoYXZlIHRvIGF2b2lkIGFkZGl0aW9u YWwgZmxvYXQgYm94ZXMgKHdoZW4gdGhlIG5ldyBjb250ZW50IGlzIHRhbGxlciB0aGFuIGFueSBw cmV2aW91cyBjb250ZW50IGFuZCB3ZSBoYXZlIHZlcnRpY2FsbHkgc3RhY2tlZCBmbG9hdHMgb24g dGhpcyBsaW5lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVC dWlsZGVyLmNwcAppbmRleCBmZTBjMjY4ZDk0MmUuLjQ2OGM3MjdlMzQ5OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlT aW1wbGVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKQEAgLTI0NSwx MyArMjQ1LDE2IEBAIElubGluZUl0ZW1Qb3NpdGlvbiBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVy OjpwbGFjZU5vbldyYXBwaW5nSW5saW5lVGV4dENvbnRlbnQoCiAKIFRleHRPbmx5TGluZUJyZWFr UmVzdWx0IFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZVRleHRDb250ZW50 KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudCYgY2FuZGlkYXRl Q29udGVudCwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSkKIHsKKyAgICBBU1NF UlQoIWNhbmRpZGF0ZUNvbnRlbnQucnVucygpLmlzRW1wdHkoKSk7CisKICAgICBhdXRvIGNvbnRl bnRMb2dpY2FsUmlnaHQgPSBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpOwogICAgIGF1dG8g YXZhaWxhYmxlV2lkdGggPSAobV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSArIExheW91dFVuaXQ6 OmVwc2lsb24oKSkgLSAoIXN0ZDo6aXNuYW4oY29udGVudExvZ2ljYWxSaWdodCkgPyBjb250ZW50 TG9naWNhbFJpZ2h0IDogMC5mKTsKLSAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50 QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWls YWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgp LCBtX2xpbmUuaGFzQ29udGVudE9yTGlzdE1hcmtlcigpLCAhbV93cmFwT3Bwb3J0dW5pdHlMaXN0 LmlzRW1wdHkoKSB9OwotICAgIG1faW5saW5lQ29udGVudEJyZWFrZXIuc2V0SXNJbkludHJpbnNp Y1dpZHRoTW9kZShpc0luSW50cmluc2ljV2lkdGhNb2RlKCkpOwotICAgIGF1dG8gbGluZUJyZWFr aW5nUmVzdWx0ID0gbV9pbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChj YW5kaWRhdGVDb250ZW50LCBsaW5lU3RhdHVzKTsKLQotICAgIEFTU0VSVCghY2FuZGlkYXRlQ29u dGVudC5ydW5zKCkuaXNFbXB0eSgpKTsKKyAgICBhdXRvIGxpbmVCcmVha2luZ1Jlc3VsdCA9IElu bGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgeyBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0 OjpBY3Rpb246OktlZXAsIElubGluZUNvbnRlbnRCcmVha2VyOjpJc0VuZE9mTGluZTo6Tm8sIHsg fSwgeyB9IH07CisgICAgaWYgKGNhbmRpZGF0ZUNvbnRlbnQubG9naWNhbFdpZHRoKCkgPiBhdmFp bGFibGVXaWR0aCkgeworICAgICAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJl YWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJs ZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdT b2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBt X2xpbmUuaGFzQ29udGVudE9yTGlzdE1hcmtlcigpLCAhbV93cmFwT3Bwb3J0dW5pdHlMaXN0Lmlz RW1wdHkoKSB9OworICAgICAgICBtX2lubGluZUNvbnRlbnRCcmVha2VyLnNldElzSW5JbnRyaW5z aWNXaWR0aE1vZGUoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgpKTsKKyAgICAgICAgbGluZUJyZWFr aW5nUmVzdWx0ID0gbV9pbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChj YW5kaWRhdGVDb250ZW50LCBsaW5lU3RhdHVzKTsKKyAgICB9CiAKICAgICBpZiAobGluZUJyZWFr aW5nUmVzdWx0LmFjdGlvbiA9PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246 OktlZXApIHsKICAgICAgICAgYXV0byYgY29tbWl0dGVkUnVucyA9IGNhbmRpZGF0ZUNvbnRlbnQu cnVucygpOwo= 467326 2023-08-18 08:53:30 -0700 2023-08-18 12:08:51 -0700 [fast-cq]Patch bug-260387-20230818085329.patch text/plain 9813 zalan RnJvbSA2ODJjODBmODU3MTI1OTgzZWU3YmQyNjUxZGEwNDRjZmUzZThhZjcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMTggQXVnIDIwMjMgMDg6NDg6MzYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBE byBub3QgY29uc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlciB3aGVuIGNhbmRpZGF0ZQogY29udGVu dCBmaXRzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjAzODcKClJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKfjYlIHByb2dyZXNzaW9uIG9uIFBlcmZvcm1hbmNl VGVzdHMvTGF5b3V0L2xpbmUtbGF5b3V0Lmh0bWwKCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgooV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc0lubGluZUNvbnRlbnQpOgoq IFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmhhbmRsZUlubGlu ZUNvbnRlbnQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpUZXh0 T25seVNpbXBsZUxpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVUZXh0Q29udGVudCk6Ci0tLQogLi4u L2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgICAgICAgICAgIHwgIDkgKy0tLQogLi4u L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAgIHwgNDQgKysrKysrKysr Ky0tLS0tLS0tLQogLi4uL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcCAgICAg IHwgMTMgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDMzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApp bmRleCAxNzljNmZlNmVmMDkuLjNiMmNiMTNmMDkwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApAQCAtMTExLDEzICsxMTEsOCBAQCBzdGF0aWMgaW5s aW5lIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBmaXJzdFRleHRSdW5JbmRleChjb25zdCBJbmxpbmVD b250ZW50QnJlYWtlcgogSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50 QnJlYWtlcjo6cHJvY2Vzc0lubGluZUNvbnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNh bmRpZGF0ZUNvbnRlbnQsIGNvbnN0IExpbmVTdGF0dXMmIGxpbmVTdGF0dXMpCiB7CiAgICAgQVNT RVJUKCFzdGQ6OmlzbmFuKGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpKTsKLSAgICBhdXRvIHBy b2Nlc3NDYW5kaWRhdGVDb250ZW50ID0gWyZdIHsKLSAgICAgICAgaWYgKGNhbmRpZGF0ZUNvbnRl bnQubG9naWNhbFdpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkKLSAgICAgICAg ICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCB9OwotICAgICAgICByZXR1 cm4gcHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjYW5kaWRhdGVDb250ZW50LCBsaW5lU3RhdHVz KTsKLSAgICB9OwotCi0gICAgYXV0byByZXN1bHQgPSBwcm9jZXNzQ2FuZGlkYXRlQ29udGVudCgp OworICAgIEFTU0VSVChjYW5kaWRhdGVDb250ZW50LmxvZ2ljYWxXaWR0aCgpID4gbGluZVN0YXR1 cy5hdmFpbGFibGVXaWR0aCk7CisgICAgYXV0byByZXN1bHQgPSBwcm9jZXNzT3ZlcmZsb3dpbmdD b250ZW50KGNhbmRpZGF0ZUNvbnRlbnQsIGxpbmVTdGF0dXMpOwogICAgIGlmIChyZXN1bHQuYWN0 aW9uID09IFJlc3VsdDo6QWN0aW9uOjpXcmFwICYmIGxpbmVTdGF0dXMudHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGggJiYgaGFzTGVhZGluZ1RleHRDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQpKSB7CiAg ICAgICAgIC8vIEEgdHJhaWxpbmcgc29mdCBoeXBoZW4gd2l0aCBhIHdyYXBwZWQgdGV4dCBjb250 ZW50IHR1cm5zIGludG8gYSB2aXNpYmxlIGh5cGhlbi4KICAgICAgICAgLy8gTGV0J3MgY2hlY2sg aWYgdGhlcmUncyBlbm91Z2ggc3BhY2UgZm9yIHRoZSBoeXBoZW4gY2hhcmFjdGVyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDdkY2IyMmYyNzRhNS4uYTEy NDVmN2U5NGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBA IC05NTQsMzEgKzk1NCwxMSBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5k bGVJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5bwogICAgICAgICBBU1NF UlQoaW5saW5lQ29udGVudC50cmFpbGluZ0xpbmVCcmVhaygpIHx8IGlubGluZUNvbnRlbnQudHJh aWxpbmdXb3JkQnJlYWtPcHBvcnR1bml0eSgpKTsKICAgICAgICAgcmV0dXJuIHsgaW5saW5lQ29u dGVudC50cmFpbGluZ0xpbmVCcmVhaygpID8gSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZM aW5lOjpZZXMgOiBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vIH07CiAgICAg fQotICAgIG1faW5saW5lQ29udGVudEJyZWFrZXIuc2V0SHlwaGVuYXRpb25EaXNhYmxlZChzaG91 bGREaXNhYmxlSHlwaGVuYXRpb24ocm9vdCgpLnN0eWxlKCksIG1fc3VjY2Vzc2l2ZUh5cGhlbmF0 ZWRMaW5lQ291bnQpKTsKLSAgICBtX2lubGluZUNvbnRlbnRCcmVha2VyLnNldElzSW5JbnRyaW5z aWNXaWR0aE1vZGUoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgpKTsKIAogICAgIC8vIFdoaWxlIHRo ZSBmbG9hdHMgYXJlIG5vdCBjb25zaWRlcmVkIHRvIGJlIG9uIHRoZSBsaW5lLCB0aGV5IG1ha2Ug dGhlIGxpbmUgY29udGVudGZ1bCBmb3IgbGluZSBicmVha2luZy4KICAgICBhdXRvIFtsaW5lUmVj dEFkanV0ZWRXaXRoQ2FuZGlkYXRlQ29udGVudCwgY2FuZGlkYXRlQ29udGVudElzQ29uc3RyYWlu ZWRCeUZsb2F0XSA9IGFkanVzdGVkTGluZVJlY3RXaXRoQ2FuZGlkYXRlSW5saW5lQ29udGVudChs aW5lQ2FuZGlkYXRlKTsKICAgICAvLyBOb3RlIHRoYXQgYWRqdXN0ZWQgbGluZSBoZWlnaHQgbmV2 ZXIgc2hyaW5rcy4KICAgICBtX2NhbmRpZGF0ZUlubGluZUNvbnRlbnRFbmNsb3NpbmdIZWlnaHQg PSBsaW5lUmVjdEFkanV0ZWRXaXRoQ2FuZGlkYXRlQ29udGVudC5oZWlnaHQoKTsKLQotICAgIC8v IElmIHdpZHRoIGNvbnN0cmFpbnQgb3ZlcnJpZGVzIGV4aXN0LCBtb2RpZnkgdGhlIGF2YWlsYWJs ZSB3aWR0aCBhY2NvcmRpbmdseS4KLSAgICBhdXRvIGxpbmVJbmRleCA9IG1fcHJldmlvdXNMaW5l ID8gKG1fcHJldmlvdXNMaW5lLT5saW5lSW5kZXggKyAxKSA6IDBsdTsKLSAgICBjb25zdCBhdXRv JiBhdmFpbGFibGVMaW5lV2lkdGhPdmVycmlkZSA9IG1faW5saW5lTGF5b3V0U3RhdGUuYXZhaWxh YmxlTGluZVdpZHRoT3ZlcnJpZGUoKTsKLSAgICBhdXRvIHdpZHRoT3ZlcnJpZGUgPSBhdmFpbGFi bGVMaW5lV2lkdGhPdmVycmlkZS5hdmFpbGFibGVMaW5lV2lkdGhPdmVycmlkZUZvckxpbmUobGlu ZUluZGV4KTsKLSAgICBhdXRvIGF2YWlsYWJsZVRvdGFsV2lkdGhGb3JDb250ZW50ID0gd2lkdGhP dmVycmlkZSA/IElubGluZUxheW91dFVuaXQgeyB3aWR0aE92ZXJyaWRlLnZhbHVlKCkgfSAtIG1f bGluZU1hcmdpblN0YXJ0IDogbGluZVJlY3RBZGp1dGVkV2l0aENhbmRpZGF0ZUNvbnRlbnQud2lk dGgoKTsKLQotICAgIGF1dG8gYXZhaWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50ID0gYXZh aWxhYmxlV2lkdGgoaW5saW5lQ29udGVudCwgbV9saW5lLCBhdmFpbGFibGVUb3RhbFdpZHRoRm9y Q29udGVudCk7Ci0gICAgYXV0byBsaW5lSXNDb25zaWRlcmVkQ29udGVudGZ1bCA9IG1fbGluZS5o YXNDb250ZW50T3JMaXN0TWFya2VyKCkgfHwgbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfHwg Y2FuZGlkYXRlQ29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OwotICAgIGF1dG8gbGluZVN0YXR1 cyA9IElubGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsKLSAgICAgICAgbV9saW5lLmNv bnRlbnRMb2dpY2FsUmlnaHQoKSwKLSAgICAgICAgYXZhaWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVD b250ZW50LAotICAgICAgICBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLAotICAgICAg ICBtX2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwKLSAgICAgICAgbV9saW5lLmlzVHJh aWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLAotICAgICAgICBsaW5lSXNDb25zaWRlcmVkQ29udGVu dGZ1bCwKLSAgICAgICAgIW1fd3JhcE9wcG9ydHVuaXR5TGlzdC5pc0VtcHR5KCkKLSAgICB9Owog ICAgIGF1dG8gdG9MaW5lQnVpbGRlclJlc3VsdCA9IFsmXShhdXRvJiBsaW5lQnJlYWtpbmdSZXN1 bHQpIC0+IExpbmVCdWlsZGVyOjpSZXN1bHQgewogICAgICAgICBhdXRvJiBjYW5kaWRhdGVSdW5z ID0gY29udGludW91c0lubGluZUNvbnRlbnQucnVucygpOwogICAgIApAQCAtMTA2OCw3ICsxMDQ4 LDI5IEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRl bnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvCiAgICAgICAgIHJldHVybiB7IElubGluZUNv bnRlbnRCcmVha2VyOjpJc0VuZE9mTGluZTo6Tm8gfTsKICAgICB9OwogCi0gICAgYXV0byBsaW5l QnJlYWtpbmdSZXN1bHQgPSBtX2lubGluZUNvbnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250 ZW50KGNvbnRpbnVvdXNJbmxpbmVDb250ZW50LCBsaW5lU3RhdHVzKTsKKyAgICAvLyBJZiB3aWR0 aCBjb25zdHJhaW50IG92ZXJyaWRlcyBleGlzdCwgbW9kaWZ5IHRoZSBhdmFpbGFibGUgd2lkdGgg YWNjb3JkaW5nbHkuCisgICAgYXV0byBsaW5lSW5kZXggPSBtX3ByZXZpb3VzTGluZSA/IChtX3By ZXZpb3VzTGluZS0+bGluZUluZGV4ICsgMSkgOiAwbHU7CisgICAgY29uc3QgYXV0byYgYXZhaWxh YmxlTGluZVdpZHRoT3ZlcnJpZGUgPSBtX2lubGluZUxheW91dFN0YXRlLmF2YWlsYWJsZUxpbmVX aWR0aE92ZXJyaWRlKCk7CisgICAgYXV0byB3aWR0aE92ZXJyaWRlID0gYXZhaWxhYmxlTGluZVdp ZHRoT3ZlcnJpZGUuYXZhaWxhYmxlTGluZVdpZHRoT3ZlcnJpZGVGb3JMaW5lKGxpbmVJbmRleCk7 CisgICAgYXV0byBhdmFpbGFibGVUb3RhbFdpZHRoRm9yQ29udGVudCA9IHdpZHRoT3ZlcnJpZGUg PyBJbmxpbmVMYXlvdXRVbml0IHsgd2lkdGhPdmVycmlkZS52YWx1ZSgpIH0gLSBtX2xpbmVNYXJn aW5TdGFydCA6IGxpbmVSZWN0QWRqdXRlZFdpdGhDYW5kaWRhdGVDb250ZW50LndpZHRoKCk7Cisg ICAgYXV0byBhdmFpbGFibGVXaWR0aEZvckNhbmRpZGF0ZUNvbnRlbnQgPSBhdmFpbGFibGVXaWR0 aChpbmxpbmVDb250ZW50LCBtX2xpbmUsIGF2YWlsYWJsZVRvdGFsV2lkdGhGb3JDb250ZW50KTsK KworICAgIGF1dG8gbGluZUJyZWFraW5nUmVzdWx0ID0gSW5saW5lQ29udGVudEJyZWFrZXI6OlJl c3VsdCB7IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgSW5saW5l Q29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpObywgeyB9LCB7IH0gfTsKKyAgICBpZiAoY29u dGludW91c0lubGluZUNvbnRlbnQubG9naWNhbFdpZHRoKCkgPiBhdmFpbGFibGVXaWR0aEZvckNh bmRpZGF0ZUNvbnRlbnQpIHsKKyAgICAgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkQ29udGVudGZ1 bCA9IG1fbGluZS5oYXNDb250ZW50T3JMaXN0TWFya2VyKCkgfHwgbV9saW5lSXNDb25zdHJhaW5l ZEJ5RmxvYXQgfHwgY2FuZGlkYXRlQ29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OworICAgICAg ICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7Cisg ICAgICAgICAgICBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLAorICAgICAgICAgICAgYXZh aWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50LAorICAgICAgICAgICAgbV9saW5lLnRyaW1t YWJsZVRyYWlsaW5nV2lkdGgoKSwKKyAgICAgICAgICAgIG1fbGluZS50cmFpbGluZ1NvZnRIeXBo ZW5XaWR0aCgpLAorICAgICAgICAgICAgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJs ZSgpLAorICAgICAgICAgICAgbGluZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwsCisgICAgICAgICAg ICAhbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmlzRW1wdHkoKQorICAgICAgICB9OworICAgICAgICBt X2lubGluZUNvbnRlbnRCcmVha2VyLnNldEh5cGhlbmF0aW9uRGlzYWJsZWQoc2hvdWxkRGlzYWJs ZUh5cGhlbmF0aW9uKHJvb3QoKS5zdHlsZSgpLCBtX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNv dW50KSk7CisgICAgICAgIG1faW5saW5lQ29udGVudEJyZWFrZXIuc2V0SXNJbkludHJpbnNpY1dp ZHRoTW9kZShpc0luSW50cmluc2ljV2lkdGhNb2RlKCkpOworICAgICAgICBsaW5lQnJlYWtpbmdS ZXN1bHQgPSBtX2lubGluZUNvbnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnRp bnVvdXNJbmxpbmVDb250ZW50LCBsaW5lU3RhdHVzKTsKKyAgICB9CiAgICAgYXV0byBsaW5lR2Fp bnNOZXdDb250ZW50ID0gbGluZUJyZWFraW5nUmVzdWx0LmFjdGlvbiA9PSBJbmxpbmVDb250ZW50 QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OktlZXAgfHwgbGluZUJyZWFraW5nUmVzdWx0LmFjdGlv biA9PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OkJyZWFrOyAKICAgICBp ZiAobGluZUdhaW5zTmV3Q29udGVudCkgewogICAgICAgICAvLyBTb21ldGltZXMgaW4gb3JkZXIg dG8gcHV0IHRoaXMgY29udGVudCBvbiB0aGUgbGluZSwgd2UgaGF2ZSB0byBhdm9pZCBhZGRpdGlv bmFsIGZsb2F0IGJveGVzICh3aGVuIHRoZSBuZXcgY29udGVudCBpcyB0YWxsZXIgdGhhbiBhbnkg cHJldmlvdXMgY29udGVudCBhbmQgd2UgaGF2ZSB2ZXJ0aWNhbGx5IHN0YWNrZWQgZmxvYXRzIG9u IHRoaXMgbGluZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5l QnVpbGRlci5jcHAKaW5kZXggZmUwYzI2OGQ5NDJlLi40NjhjNzI3ZTM0OTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5 U2ltcGxlTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL1RleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIuY3BwCkBAIC0yNDUs MTMgKzI0NSwxNiBAQCBJbmxpbmVJdGVtUG9zaXRpb24gVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRl cjo6cGxhY2VOb25XcmFwcGluZ0lubGluZVRleHRDb250ZW50KAogCiBUZXh0T25seUxpbmVCcmVh a1Jlc3VsdCBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVUZXh0Q29udGVu dChjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQmIGNhbmRpZGF0 ZUNvbnRlbnQsIGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UpCiB7CisgICAgQVNT RVJUKCFjYW5kaWRhdGVDb250ZW50LnJ1bnMoKS5pc0VtcHR5KCkpOworCiAgICAgYXV0byBjb250 ZW50TG9naWNhbFJpZ2h0ID0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKICAgICBhdXRv IGF2YWlsYWJsZVdpZHRoID0gKG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkgKyBMYXlvdXRVbml0 OjplcHNpbG9uKCkpIC0gKCFzdGQ6OmlzbmFuKGNvbnRlbnRMb2dpY2FsUmlnaHQpID8gY29udGVu dExvZ2ljYWxSaWdodCA6IDAuZik7Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVu dEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFp bGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWls aW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUo KSwgbV9saW5lLmhhc0NvbnRlbnRPckxpc3RNYXJrZXIoKSwgIW1fd3JhcE9wcG9ydHVuaXR5TGlz dC5pc0VtcHR5KCkgfTsKLSAgICBtX2lubGluZUNvbnRlbnRCcmVha2VyLnNldElzSW5JbnRyaW5z aWNXaWR0aE1vZGUoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgpKTsKLSAgICBhdXRvIGxpbmVCcmVh a2luZ1Jlc3VsdCA9IG1faW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQo Y2FuZGlkYXRlQ29udGVudCwgbGluZVN0YXR1cyk7Ci0KLSAgICBBU1NFUlQoIWNhbmRpZGF0ZUNv bnRlbnQucnVucygpLmlzRW1wdHkoKSk7CisgICAgYXV0byBsaW5lQnJlYWtpbmdSZXN1bHQgPSBJ bmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IHsgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3Vs dDo6QWN0aW9uOjpLZWVwLCBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vLCB7 IH0sIHsgfSB9OworICAgIGlmIChjYW5kaWRhdGVDb250ZW50LmxvZ2ljYWxXaWR0aCgpID4gYXZh aWxhYmxlV2lkdGgpIHsKKyAgICAgICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJy ZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFpbGFi bGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5n U29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwg bV9saW5lLmhhc0NvbnRlbnRPckxpc3RNYXJrZXIoKSwgIW1fd3JhcE9wcG9ydHVuaXR5TGlzdC5p c0VtcHR5KCkgfTsKKyAgICAgICAgbV9pbmxpbmVDb250ZW50QnJlYWtlci5zZXRJc0luSW50cmlu c2ljV2lkdGhNb2RlKGlzSW5JbnRyaW5zaWNXaWR0aE1vZGUoKSk7CisgICAgICAgIGxpbmVCcmVh a2luZ1Jlc3VsdCA9IG1faW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQo Y2FuZGlkYXRlQ29udGVudCwgbGluZVN0YXR1cyk7CisgICAgfQogCiAgICAgaWYgKGxpbmVCcmVh a2luZ1Jlc3VsdC5hY3Rpb24gPT0gSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6QWN0aW9u OjpLZWVwKSB7CiAgICAgICAgIGF1dG8mIGNvbW1pdHRlZFJ1bnMgPSBjYW5kaWRhdGVDb250ZW50 LnJ1bnMoKTsK