233233 2021-11-16 20:08:25 -0800 [LFC][IFC] LineBuilder should drive the trailing whitespace collapsing/trimming 2021-11-17 06:24:21 -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 1815795 0 zalan 2021-11-16 20:08:25 -0800 and not the line. 1815796 1 444470 zalan 2021-11-16 20:11:22 -0800 Created attachment 444470 Patch 1815798 2 444471 zalan 2021-11-16 20:16:48 -0800 Created attachment 444471 Patch 1815909 3 ews-feeder 2021-11-17 06:23:47 -0800 Committed r285926 (244335@main): <https://commits.webkit.org/244335@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444471. 1815910 4 webkit-bug-importer 2021-11-17 06:24:21 -0800 <rdar://problem/85501903> 444470 2021-11-16 20:11:22 -0800 2021-11-16 20:16:46 -0800 Patch bug-233233-20211116201121.patch text/plain 4856 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ4M2RiNWMzZTc4YzFi OGJiYmRkMThlNWRiOGNkMjJkYzYyZWVlMi4uNTM4MTIwY2E4MmZhMDAxNWE0ZDQ5ZDk1ZTNjZmRk YTk1NGY5NTZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCdWls ZGVyIHNob3VsZCBkcml2ZSB0aGUgdHJhaWxpbmcgd2hpdGVzcGFjZSBjb2xsYXBzaW5nL3RyaW1t aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgbWluL21heCBpbnRyaW5zaWMgaGFuZGxpbmcg dG8gdHJhaWxpbmcgd2hpdGVzcGFjZSBjb250ZW50LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmU6OnZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3dpbmdXaGl0ZXNwYWNl KTogVXNlIHNwZWMgdGVybS4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6cmVtb3Zl VHJpbW1hYmxlQ29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmU6OnZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3cpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisKIDIwMjEt MTEtMTYgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lG Q10gYnJlYWstd29yZCBpcyBub3QgY29uc2lkZXJlZCB3aGVuIGNhbGN1bGF0aW5nIG1pbi1jb250 ZW50IGludHJpbnNpYyBzaXplcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKaW5kZXggYWQy YWI0OWM2ZjI1YTBiNTRhZDQ5MTlmM2EyNmNkNGIwZDFlMjJhYy4uYjJhYTA1ZDk1NWMzODEyYTlj OTExMTU1MTg0YmZiMzg2ZGQ4ZjU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKQEAg LTkwLDEyICs5MCw2IEBAIHZvaWQgTGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQoKQogICAgIG1f dHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiB9CiAKLXZvaWQgTGluZTo6cmVtb3ZlVHJp bW1hYmxlQ29udGVudChJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkK LXsKLSAgICByZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKTsKLSAgICB2aXN1YWxseUNv bGxhcHNlSGFuZ2luZ092ZXJmbG93KGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7Ci19Ci0KIHZv aWQgTGluZTo6YXBwbHlSdW5FeHBhbnNpb24oSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQXZh aWxhYmxlU3BhY2UpCiB7CiAgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLnN0 eWxlKCkudGV4dEFsaWduKCkgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeSk7CkBAIC0yMDIsNyAr MTk2LDcgQEAgdm9pZCBMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQogICAg IG1fY29udGVudExvZ2ljYWxXaWR0aCAtPSBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZW1v dmUoKTsKIH0KIAotdm9pZCBMaW5lOjp2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElu bGluZUxheW91dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKQordm9pZCBMaW5lOjp2aXN1 YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93aW5nV2hpdGVzcGFjZShJbmxpbmVMYXlvdXRVbml0 IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkKIHsKICAgICBBU1NFUlQobV90cmltbWFibGVUcmFp bGluZ0NvbnRlbnQuaXNFbXB0eSgpKTsKICAgICAvLyBJZiB3aGl0ZS1zcGFjZSBpcyBzZXQgdG8g cHJlLXdyYXAsIHRoZSBVQSBtdXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKaW5kZXggYmFmYzIx YmM4ZjliMjY2ZjkyNmFhODUxMmQ4MDg2OWMwNTMzNmI4Zi4uMDkzMmFlODA0NjMxNDNmYjczODll YzAxYzEzMWVjNzEwZTcwMWU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtNjMsNyAr NjMsOCBAQCBwdWJsaWM6CiAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFp bGluZ1NvZnRIeXBoZW5XaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdTb2Z0SHlwaGVu V2lkdGg7IH0KICAgICB2b2lkIGFkZFRyYWlsaW5nSHlwaGVuKElubGluZUxheW91dFVuaXQgaHlw aGVuTG9naWNhbFdpZHRoKTsKIAotICAgIHZvaWQgcmVtb3ZlVHJpbW1hYmxlQ29udGVudChJbmxp bmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CisgICAgdm9pZCByZW1vdmVU cmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKTsKKyAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VIYW5n aW5nT3ZlcmZsb3dpbmdXaGl0ZXNwYWNlKElubGluZUxheW91dFVuaXQgaG9yaXpvbnRhbEF2YWls YWJsZVNwYWNlKTsKICAgICB2b2lkIGFwcGx5UnVuRXhwYW5zaW9uKElubGluZUxheW91dFVuaXQg aG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKIAogICAgIHN0cnVjdCBSdW4gewpAQCAtMTc4LDgg KzE3OSw2IEBAIHByaXZhdGU6CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IGFkZEJvcmRlckFuZFBh ZGRpbmdFbmRGb3JJbmxpbmVCb3hEZWNvcmF0aW9uQ2xvbmUoY29uc3QgSW5saW5lSXRlbSYgaW5s aW5lQm94U3RhcnRJdGVtKTsKICAgICBJbmxpbmVMYXlvdXRVbml0IHJlbW92ZUJvcmRlckFuZFBh ZGRpbmdFbmRGb3JJbmxpbmVCb3hEZWNvcmF0aW9uQ2xvbmUoY29uc3QgSW5saW5lSXRlbSYgaW5s aW5lQm94RW5kSXRlbSk7Ci0gICAgdm9pZCByZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQo KTsKLSAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpOwogCiAgICAgdm9pZCByZXNldFRyYWlsaW5n Q29udGVudCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5k ZXggNzY3NGI3NTZlNjc3Y2ViNDJhMWE3ZDYyNDk0MzZmM2MyMDc5NDAyMi4uMmRlNWZlYjJiNDll YjdiZjI4ZTE2ZThlNzk3NjIwYjkyYTIxMWQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCdWlsZGVyLmNwcApAQCAtNDU3LDcgKzQ1Nyw4IEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJ dGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNsb3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNM YXlvCiAgICAgICAgIHJldHVybiBsaW5lUmFuZ2U7CiAgICAgfQogICAgIGF1dG8gaG9yaXpvbnRh bEF2YWlsYWJsZVNwYWNlID0gbV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKTsKLSAgICBtX2xpbmUu cmVtb3ZlVHJpbW1hYmxlQ29udGVudChob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpOworICAgIG1f bGluZS5yZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKTsKKyAgICBtX2xpbmUudmlzdWFs bHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxvd2luZ1doaXRlc3BhY2UoaG9yaXpvbnRhbEF2YWlsYWJs ZVNwYWNlKTsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50 ZXh0QWxpZ24oKTsKICAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFs QWxpZ25tZW50ID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudChsaW5lUmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250 ZW50LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIGlmIChydW5zRXhwYW5kSG9y aXpvbnRhbGx5KQo= 444471 2021-11-16 20:16:48 -0800 2021-11-17 06:23:48 -0800 Patch bug-233233-20211116201648.patch text/plain 4844 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ4M2RiNWMzZTc4YzFi OGJiYmRkMThlNWRiOGNkMjJkYzYyZWVlMi4uNTM4MTIwY2E4MmZhMDAxNWE0ZDQ5ZDk1ZTNjZmRk YTk1NGY5NTZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCdWls ZGVyIHNob3VsZCBkcml2ZSB0aGUgdHJhaWxpbmcgd2hpdGVzcGFjZSBjb2xsYXBzaW5nL3RyaW1t aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgbWluL21heCBpbnRyaW5zaWMgaGFuZGxpbmcg dG8gdHJhaWxpbmcgd2hpdGVzcGFjZSBjb250ZW50LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmU6OnZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3dpbmdXaGl0ZXNwYWNl KTogVXNlIHNwZWMgdGVybS4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6cmVtb3Zl VHJpbW1hYmxlQ29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmU6OnZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3cpOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisKIDIwMjEt MTEtMTYgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lG Q10gYnJlYWstd29yZCBpcyBub3QgY29uc2lkZXJlZCB3aGVuIGNhbGN1bGF0aW5nIG1pbi1jb250 ZW50IGludHJpbnNpYyBzaXplcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKaW5kZXggYWQy YWI0OWM2ZjI1YTBiNTRhZDQ5MTlmM2EyNmNkNGIwZDFlMjJhYy4uYzE5YTM2ZWUyM2YzYmM4ODBh NGZjMDc0MGI2YTAyYTA4MWEzZGJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKQEAg LTkwLDEyICs5MCw2IEBAIHZvaWQgTGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQoKQogICAgIG1f dHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiB9CiAKLXZvaWQgTGluZTo6cmVtb3ZlVHJp bW1hYmxlQ29udGVudChJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSkK LXsKLSAgICByZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKTsKLSAgICB2aXN1YWxseUNv bGxhcHNlSGFuZ2luZ092ZXJmbG93KGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7Ci19Ci0KIHZv aWQgTGluZTo6YXBwbHlSdW5FeHBhbnNpb24oSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQXZh aWxhYmxlU3BhY2UpCiB7CiAgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLnN0 eWxlKCkudGV4dEFsaWduKCkgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeSk7CkBAIC0yMDIsNyAr MTk2LDcgQEAgdm9pZCBMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQogICAg IG1fY29udGVudExvZ2ljYWxXaWR0aCAtPSBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZW1v dmUoKTsKIH0KIAotdm9pZCBMaW5lOjp2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElu bGluZUxheW91dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKQordm9pZCBMaW5lOjp2aXN1 YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93aW5nR2x5cGhzKElubGluZUxheW91dFVuaXQgaG9y aXpvbnRhbEF2YWlsYWJsZVNwYWNlKQogewogICAgIEFTU0VSVChtX3RyaW1tYWJsZVRyYWlsaW5n Q29udGVudC5pc0VtcHR5KCkpOwogICAgIC8vIElmIHdoaXRlLXNwYWNlIGlzIHNldCB0byBwcmUt d3JhcCwgdGhlIFVBIG11c3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAppbmRleCBiYWZjMjFiYzhm OWIyNjZmOTI2YWE4NTEyZDgwODY5YzA1MzM2YjhmLi45ODdjMWM1Zjk0ODE2MzNlYjgwN2M3Zjc4 YjRiYWFhOGZhNGM5OTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCkBAIC02Myw3ICs2Myw4 IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHRyYWlsaW5n U29mdEh5cGhlbldpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0 aDsgfQogICAgIHZvaWQgYWRkVHJhaWxpbmdIeXBoZW4oSW5saW5lTGF5b3V0VW5pdCBoeXBoZW5M b2dpY2FsV2lkdGgpOwogCi0gICAgdm9pZCByZW1vdmVUcmltbWFibGVDb250ZW50KElubGluZUxh eW91dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKKyAgICB2b2lkIHJlbW92ZVRyYWls aW5nVHJpbW1hYmxlQ29udGVudCgpOworICAgIHZvaWQgdmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdP dmVyZmxvd2luZ0dseXBocyhJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFj ZSk7CiAgICAgdm9pZCBhcHBseVJ1bkV4cGFuc2lvbihJbmxpbmVMYXlvdXRVbml0IGhvcml6b250 YWxBdmFpbGFibGVTcGFjZSk7CiAKICAgICBzdHJ1Y3QgUnVuIHsKQEAgLTE3OCw4ICsxNzksNiBA QCBwcml2YXRlOgogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBhZGRCb3JkZXJBbmRQYWRkaW5nRW5k Rm9ySW5saW5lQm94RGVjb3JhdGlvbkNsb25lKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUJveFN0 YXJ0SXRlbSk7CiAgICAgSW5saW5lTGF5b3V0VW5pdCByZW1vdmVCb3JkZXJBbmRQYWRkaW5nRW5k Rm9ySW5saW5lQm94RGVjb3JhdGlvbkNsb25lKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUJveEVu ZEl0ZW0pOwotICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7Ci0gICAg dm9pZCB2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElubGluZUxheW91dFVuaXQgaG9y aXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKIAogICAgIHZvaWQgcmVzZXRUcmFpbGluZ0NvbnRlbnQo KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDc2NzRi NzU2ZTY3N2NlYjQyYTFhN2Q2MjQ5NDM2ZjNjMjA3OTQwMjIuLjkzMTYzOGRkN2ZlY2NlMmIxZjM2 MDZjZDZlYmQyM2ExNmJlZWMzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHAKQEAgLTQ1Nyw3ICs0NTcsOCBAQCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdl IExpbmVCdWlsZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5bwogICAg ICAgICByZXR1cm4gbGluZVJhbmdlOwogICAgIH0KICAgICBhdXRvIGhvcml6b250YWxBdmFpbGFi bGVTcGFjZSA9IG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCk7Ci0gICAgbV9saW5lLnJlbW92ZVRy aW1tYWJsZUNvbnRlbnQoaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKKyAgICBtX2xpbmUucmVt b3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7CisgICAgbV9saW5lLnZpc3VhbGx5Q29sbGFw c2VIYW5naW5nT3ZlcmZsb3dpbmdHbHlwaHMoaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKICAg ICBhdXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsK ICAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFsQWxpZ25tZW50ID09 IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudChs aW5lUmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxU cmFpbGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIGlmIChydW5zRXhwYW5kSG9yaXpvbnRhbGx5KQo=