217014 2020-09-26 13:00:31 -0700 [LFC][IFC] Add support for <wbr> 2020-09-26 14:32:20 -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 1692205 0 zalan 2020-09-26 13:00:31 -0700 word break opportunity 1692211 1 409790 zalan 2020-09-26 13:46:52 -0700 Created attachment 409790 Patch 1692212 2 409790 koivisto 2020-09-26 13:50:38 -0700 Comment on attachment 409790 Patch Can you also enable wbr in integration? 1692213 3 zalan 2020-09-26 14:27:10 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 409790 [details] > Patch > > Can you also enable wbr in integration? Absolutely! That was going to be a follow-up patch with the inline-box (box geometry) construction. 1692215 4 ews-feeder 2020-09-26 14:31:55 -0700 Committed r267637: <https://trac.webkit.org/changeset/267637> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409790. 1692216 5 webkit-bug-importer 2020-09-26 14:32:20 -0700 <rdar://problem/69634439> 409790 2020-09-26 13:46:52 -0700 2020-09-26 14:31:56 -0700 Patch bug-217014-20200926134651.patch text/plain 18202 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU0NmEyNjcxZDk4YWE3 ZmVhYWMwN2UyNmYzNDFlYzRiNDAzMjFkNy4uOTY4NzdmYzBiNmFiNmJhNGY5ZGFiMzU3Y2U0NTQ2 N2M0YmI1YmI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgPHdicj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNzAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEludHJvZHVjZSB0aGUgV29yZEJyZWFrT3Bwb3J0dW5pdHkgdHlwZSBvZiBJbmxpbmVJ dGVtIGFuZCB0YWtlIGl0IGludG8gYWNjb3VudCB3aGlsZSBzZWFyY2hpbmcgZm9yIHdvcmQgYnJl YWsgb3Bwb3J0dW5pdGllcy4KKyAgICAgICAgSXQgZ2VuZXJhdGVzIGFuIGVtcHR5IGxpbmUgcnVu IGJ1dCBpdCBkb2VzIG5vdCB5ZXQgaGF2ZSBnZW9tZXRyeSBpbmZvcm1hdGlvbi4KKworICAgICAg ICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3dici1zaW1wbGUuaHRtbAorCisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 Y29sbGVjdElubGluZUNvbnRlbnRJZk5lZWRlZCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lSXRlbS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJ dGVtOjppc1dvcmRCcmVha09wcG9ydHVuaXR5IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6YXBwZW5kV2l0aCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVu ZFRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kV29y ZEJyZWFrT3Bwb3J0dW5pdHkpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc1dvcmRC cmVha09wcG9ydHVuaXR5IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5leHRX cmFwT3Bwb3J0dW5pdHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRl OjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJ1aWxkZXI6OmlubGluZUl0ZW1XaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpuZXh0Q29udGVudEZvckxpbmUpOgorCiAyMDIwLTA5 LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBMaW5lIGNvbnRlbnQgbG9naWNhbCB3aWR0aCBleHBhbmRzIHdpdGggcnVuIGV4cGFuc2lvbnMg KHRleHQtYWxpZ246IGp1c3RpZnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAK aW5kZXggYmU5YWEzNjQ5YWQzZmM4Yzc3Nzg4MGE1M2Y1NTk4MWY3NzRjZjk2Yy4uMDAwNDlmNjJl MzRhOGU3ZjkyMDdjZGZlYjFkOTI0MzFmMjMxMGZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcApAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgIkxheW91dENvbnRleHQu aCIKICNpbmNsdWRlICJMYXlvdXRJbml0aWFsQ29udGFpbmluZ0Jsb2NrLmgiCiAjaW5jbHVkZSAi TGF5b3V0SW5saW5lVGV4dEJveC5oIgorI2luY2x1ZGUgIkxheW91dExpbmVCcmVha0JveC5oIgog I2luY2x1ZGUgIkxheW91dFJlcGxhY2VkQm94LmgiCiAjaW5jbHVkZSAiTGF5b3V0U3RhdGUuaCIK ICNpbmNsdWRlICJMb2dnaW5nLmgiCkBAIC0zNzAsOSArMzcxLDkgQEAgdm9pZCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRlbnRJZk5lZWRlZCgpCiAKICAgICAgICAg d2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGF1dG8mIGxheW91 dEJveCA9ICpsYXlvdXRRdWV1ZS50YWtlTGFzdCgpOwotICAgICAgICAgICAgaWYgKGxheW91dEJv eC5pc0xpbmVCcmVha0JveCgpKSB7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IFRyZWF0IDx3 YnI+IGFzIGEgd29yZCBicmVhayBvcHBvcnR1bml0eSBpbnN0ZWFkLgotICAgICAgICAgICAgICAg IGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKHsgbGF5b3V0Qm94LCBJbmxpbmVJdGVtOjpU eXBlOjpIYXJkTGluZUJyZWFrIH0pOworICAgICAgICAgICAgaWYgKGlzPExpbmVCcmVha0JveD4o bGF5b3V0Qm94KSkgeworICAgICAgICAgICAgICAgIGF1dG8mIGxpbmVCcmVha0JveCA9IGRvd25j YXN0PExpbmVCcmVha0JveD4obGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0aW5n U3RhdGUuYWRkSW5saW5lSXRlbSh7IGxheW91dEJveCwgbGluZUJyZWFrQm94LmlzT3B0aW9uYWwo KSA/IElubGluZUl0ZW06OlR5cGU6OldvcmRCcmVha09wcG9ydHVuaXR5IDogSW5saW5lSXRlbTo6 VHlwZTo6SGFyZExpbmVCcmVhayB9KTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94 LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRl LmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OkZsb2F0IH0pOwog ICAgICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0 ZW0uaAppbmRleCA3Mzg1MjA3YTIxOGNlYzMyNmVkZjhhOGY1ODI3M2I2OGM0NDA1NzhjLi5hNzJh NTAzYjc5ZGFhN2FhYzg5N2Y2NjlkNTJhNWUwYjdlYWZkY2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5oCkBAIC0zNSw3ICsz NSw3IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBjbGFzcyBJbmxpbmVJdGVtIHsKIHB1YmxpYzoK LSAgICBlbnVtIGNsYXNzIFR5cGUgOiB1aW50OF90IHsgVGV4dCwgSGFyZExpbmVCcmVhaywgU29m dExpbmVCcmVhaywgQm94LCBGbG9hdCwgQ29udGFpbmVyU3RhcnQsIENvbnRhaW5lckVuZCB9Owor ICAgIGVudW0gY2xhc3MgVHlwZSA6IHVpbnQ4X3QgeyBUZXh0LCBIYXJkTGluZUJyZWFrLCBTb2Z0 TGluZUJyZWFrLCBXb3JkQnJlYWtPcHBvcnR1bml0eSwgQm94LCBGbG9hdCwgQ29udGFpbmVyU3Rh cnQsIENvbnRhaW5lckVuZCB9OwogICAgIElubGluZUl0ZW0oY29uc3QgQm94JiBsYXlvdXRCb3gs IFR5cGUpOwogCiAgICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CkBAIC00 Niw2ICs0Niw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQm94KCkgY29uc3QgeyByZXR1cm4gdHlw ZSgpID09IFR5cGU6OkJveDsgfQogICAgIGJvb2wgaXNGbG9hdCgpIGNvbnN0IHsgcmV0dXJuIHR5 cGUoKSA9PSBUeXBlOjpGbG9hdDsgfQogICAgIGJvb2wgaXNMaW5lQnJlYWsoKSBjb25zdCB7IHJl dHVybiBpc1NvZnRMaW5lQnJlYWsoKSB8fCBpc0hhcmRMaW5lQnJlYWsoKTsgfQorICAgIGJvb2wg aXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBlOjpX b3JkQnJlYWtPcHBvcnR1bml0eTsgfQogICAgIGJvb2wgaXNTb2Z0TGluZUJyZWFrKCkgY29uc3Qg eyByZXR1cm4gdHlwZSgpID09IFR5cGU6OlNvZnRMaW5lQnJlYWs7IH0KICAgICBib29sIGlzSGFy ZExpbmVCcmVhaygpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBlOjpIYXJkTGluZUJyZWFr OyB9CiAgICAgYm9vbCBpc0NvbnRhaW5lclN0YXJ0KCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09 IFR5cGU6OkNvbnRhaW5lclN0YXJ0OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IDQyYWRmNzlmZWY5NzcwNjgz NzRlNDgzYTc4OGEyYTc4OWIzNTM5MGQuLjQxMmUxMTY5Mjg1YjNhNDYyNWM5ZDdjOGVlYzNkMDBj ODkzZmE4YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0yMjQsNiArMjI0LDggQEAgdm9pZCBMaW5lOjphcHBl bmRXaXRoKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IElubGluZVJ1bkRldGFp bHMmIGlubGkKICAgICAgICAgYXBwZW5kVGV4dENvbnRlbnQoZG93bmNhc3Q8SW5saW5lVGV4dEl0 ZW0+KGlubGluZUl0ZW0pLCBpbmxpbmVSdW5EZXRhaWxzLmxvZ2ljYWxXaWR0aCwgaW5saW5lUnVu RGV0YWlscy5uZWVkc0h5cGhlbik7CiAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVh aygpKQogICAgICAgICBhcHBlbmRMaW5lQnJlYWsoaW5saW5lSXRlbSk7CisgICAgZWxzZSBpZiAo aW5saW5lSXRlbS5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCisgICAgICAgIGFwcGVuZFdvcmRC cmVha09wcG9ydHVuaXR5KGlubGluZUl0ZW0pOwogICAgIGVsc2UgaWYgKGlubGluZUl0ZW0uaXND b250YWluZXJTdGFydCgpKQogICAgICAgICBhcHBlbmRJbmxpbmVDb250YWluZXJTdGFydChpbmxp bmVJdGVtLCBpbmxpbmVSdW5EZXRhaWxzLmxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZSBpZiAoaW5s aW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQpAQCAtMjg0LDcgKzI4Niw3IEBAIHZvaWQgTGluZTo6 YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJ bmxpbmVMYXlvdXRVCiAgICAgICAgICAgICAvLyBOb3QgdGhhdCB3aGVuIHRoZSBpbmxpbmUgY29u dGFpbmVyIGhhcyBwcmVzZXJ2ZSB3aGl0ZXNwYWNlIHN0eWxlLCAiPHNwYW4gc3R5bGU9IndoaXRl LXNwYWNlOiBwcmUiPiAgPC9zcGFuPiAiIDwtIHRoaXMgd2hpdGVzcGFjZSBzdGF5cyBhcm91bmQu CiAgICAgICAgICAgICBpZiAocnVuLmlzVGV4dCgpKQogICAgICAgICAgICAgICAgIHJldHVybiBy dW4uaGFzQ29sbGFwc2libGVUcmFpbGluZ1doaXRlc3BhY2UoKTsKLSAgICAgICAgICAgIEFTU0VS VChydW4uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRhaW5lckVuZCgpKTsKKyAgICAg ICAgICAgIEFTU0VSVChydW4uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRhaW5lckVu ZCgpIHx8IHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpOwogICAgICAgICB9CiAgICAgICAg IC8vIExlYWRpbmcgd2hpdGVzcGFjZS4KICAgICAgICAgcmV0dXJuICFpc1doaXRlc3BhY2VQcmVz ZXJ2ZWQoaW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7CkBAIC0zNDgsNiArMzUwLDExIEBAIHZvaWQg TGluZTo6YXBwZW5kTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCiAgICAg bV9ydW5zLmFwcGVuZCh7IGRvd25jYXN0PElubGluZVNvZnRMaW5lQnJlYWtJdGVtPihpbmxpbmVJ dGVtKSwgY29udGVudExvZ2ljYWxXaWR0aCgpIH0pOwogfQogCit2b2lkIExpbmU6OmFwcGVuZFdv cmRCcmVha09wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCit7CisgICAg bV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgMF9sdSB9 KTsKK30KKwogYm9vbCBMaW5lOjppc1J1blZpc3VhbGx5Tm9uRW1wdHkoY29uc3QgUnVuJiBydW4p IGNvbnN0CiB7CiAgICAgaWYgKHJ1bi5pc1RleHQoKSkKQEAgLTM3NCw2ICszODEsOSBAQCBib29s IExpbmU6OmlzUnVuVmlzdWFsbHlOb25FbXB0eShjb25zdCBSdW4mIHJ1bikgY29uc3QKICAgICAg ICAgcmV0dXJuIHJ1bi5sb2dpY2FsV2lkdGgoKTsKICAgICB9CiAKKyAgICBpZiAocnVuLmlzV29y ZEJyZWFrT3Bwb3J0dW5pdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDE0MjMyZTNj YWUyNzAwYzhlOGRkMzA5OGZlMmNhMDcwNWQ3ZjAxYjQuLmYyNmZhYWM5M2JmNDU1MjlhY2Q3ZDNm YWU3ZjhiM2ExYTYyZTY4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTY2LDYgKzY2LDcgQEAgcHVibGljOgogICAg ICAgICBib29sIGlzVGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpU eXBlOjpUZXh0OyB9CiAgICAgICAgIGJvb2wgaXNCb3goKSBjb25zdCB7IHJldHVybiBtX3R5cGUg PT0gSW5saW5lSXRlbTo6VHlwZTo6Qm94OyB9CiAgICAgICAgIGJvb2wgaXNMaW5lQnJlYWsoKSBj b25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVhayB8 fCBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6U29mdExpbmVCcmVhazsgfQorICAgICAgICBi b29sIGlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5s aW5lSXRlbTo6VHlwZTo6V29yZEJyZWFrT3Bwb3J0dW5pdHk7IH0KICAgICAgICAgYm9vbCBpc0Nv bnRhaW5lclN0YXJ0KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6 OkNvbnRhaW5lclN0YXJ0OyB9CiAgICAgICAgIGJvb2wgaXNDb250YWluZXJFbmQoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyRW5kOyB9CiAKQEAg LTE0Myw2ICsxNDQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwZW5kSW5saW5lQ29udGFpbmVy U3RhcnQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsK ICAgICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQgYXBwZW5kTGluZUJyZWFrKGNv bnN0IElubGluZUl0ZW0mKTsKKyAgICB2b2lkIGFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNv bnN0IElubGluZUl0ZW0mKTsKIAogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250 ZW50KCk7CiAgICAgdm9pZCB2aXN1YWxseUNvbGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDUxZDljYjY2MTVlMDQ3ZTU0NjcxZWFlZmY4 ZmFmYTVkMzFlMmQ0N2YuLjg1OGVhYTNjZGY2NWNhZWZkYWViOGFiOGZjNWI3ZmNhMzhmZjU0NzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTExMCw1NSArMTEwLDQxIEBAIHN0YXRpYyBp bmxpbmUgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBjdXJy ZW50LCBjb25zdCBJbmxpCiAKIHN0YXRpYyBpbmxpbmUgc2l6ZV90IG5leHRXcmFwT3Bwb3J0dW5p dHkoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIHNpemVfdCBzdGFydEluZGV4LCBj b25zdCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIGxheW91dFJhbmdlKQogewotICAgIC8v IDEuIEZpbmQgdGhlIHN0YXJ0IGNhbmRpZGF0ZSBieSBza2lwcGluZyBsZWFkaW5nIG5vbi1jb250 ZW50IGl0ZW1zIGUuZyA8c3Bhbj48c3Bhbj5zdGFydCA6IHNraXAgIjxzcGFuPjxzcGFuPiIKLSAg ICAvLyAyLiBGaW5kIHRoZSBlbmQgY2FuZGlkYXRlIGJ5IHNraXBwaW5nIG5vbi1jb250ZW50IGl0 ZW1zIGluYmV0d2VlbiBlLmcuIDxzcGFuPjxzcGFuPnN0YXJ0PC9zcGFuPmVuZDogc2tpcCAiPC9z cGFuPiIKKyAgICAvLyAxLiBGaW5kIHRoZSBzdGFydCBjYW5kaWRhdGUgYnkgc2tpcHBpbmcgbGVh ZGluZyBub24tY29udGVudCBpdGVtcyBlLmcgIjxzcGFuPjxzcGFuPnN0YXJ0Ii4gT3Bwb3J0dW5p dHkgaXMgYWZ0ZXIgIjxzcGFuPjxzcGFuPiIuCisgICAgLy8gMi4gRmluZCB0aGUgZW5kIGNhbmRp ZGF0ZSBieSBza2lwcGluZyBub24tY29udGVudCBpdGVtcyBpbmJldHdlZW4gZS5nLiAiPHNwYW4+ PHNwYW4+c3RhcnQ8L3NwYW4+ZW5kIi4gT3Bwb3J0dW5pdHkgaXMgYWZ0ZXIgIjwvc3Bhbj4iLgog ICAgIC8vIDMuIENoZWNrIGlmIHRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgYmV0d2Vl biB0aGUgMiBjYW5kaWRhdGUgaW5saW5lIGl0ZW1zIGFuZCByZXBlYXQuCi0gICAgLy8gNC4gQW55 IGZvcmNlIGxpbmUgYnJlYWsgaW5iZXR3ZWVuIGlzIGNvbnNpZGVyZWQgYXMgYSB3cmFwIG9wcG9y dHVuaXR5LgotCi0gICAgLy8gW2V4LV1bY29udGFpbmVyIHN0YXJ0XVtjb250YWluZXIgZW5kXVtm bG9hdF1bYW1wbGVdIChleC08c3Bhbj48L3NwYW4+PGRpdiBzdHlsZT0iZmxvYXQ6bGVmdCI+PC9k aXY+YW1wbGUpIDogd3JhcCBpbmRleCBpcyBhdCBbZXgtXS4KLSAgICAvLyBbZXhdW2NvbnRhaW5l ciBzdGFydF1bYW1wLV1bY29udGFpbmVyIHN0YXJ0XVtsZV0gKGV4PHNwYW4+YW1wLTxzcGFuPmFt cGxlKSA6IHdyYXAgaW5kZXggaXMgYXQgW2FtcC1dLgotICAgIC8vIFtleC1dW2NvbnRhaW5lciBz dGFydF1bbGluZSBicmVha11bYW1wbGVdIChleC08c3Bhbj48YnI+YW1wbGUpIDogd3JhcCBpbmRl eCBpcyBhZnRlciBbYnJdLgotICAgIGF1dG8gaXNBdExpbmVCcmVhayA9IGZhbHNlOwotCi0gICAg YXV0byBpbmxpbmVJdGVtSW5kZXhXaXRoQ29udGVudCA9IFsmXSAoYXV0byBpbmRleCkgewotICAg ICAgICAvLyBOb3RlIHRoYXQgZmxvYXRzIGFyZSBub3QgcGFydCBvZiB0aGUgaW5saW5lIGNvbnRl bnQuIFdlIHNob3VsZCB0cmVhdCB0aGVtIGFzIGlmIHRoZXkgd2VyZSBub3QgaGVyZSBhcyBmYXIg YXMgd3JhcCBvcHBvcnR1bml0aWVzIGFyZSBjb25jZXJuZWQuCi0gICAgICAgIC8vIFt0ZXh0XVtm bG9hdCBib3hdW3RleHRdIGlzIGVzc2VudGlhbGx5IGp1c3QgW3RleHRdW3RleHRdCi0gICAgICAg IGZvciAoOyBpbmRleCA8IGxheW91dFJhbmdlLmVuZDsgKytpbmRleCkgewotICAgICAgICAgICAg YXV0byYgaW5saW5lSXRlbSA9IGlubGluZUNvbnRlbnRbaW5kZXhdOwotICAgICAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0JveCgpKQotICAgICAgICAgICAg ICAgIHJldHVybiBpbmRleDsKLSAgICAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzTGluZUJyZWFr KCkpIHsKLSAgICAgICAgICAgICAgICBpc0F0TGluZUJyZWFrID0gdHJ1ZTsKLSAgICAgICAgICAg ICAgICByZXR1cm4gaW5kZXg7Ci0gICAgICAgICAgICB9CisgICAgLy8gNC4gQW55IGZvcmNlIGxp bmUgYnJlYWsvZXhwbGljaXQgd3JhcCBjb250ZW50IGluYmV0d2VlbiBpcyBjb25zaWRlcmVkIGFz IHdyYXAgb3Bwb3J0dW5pdHkuCisKKyAgICAvLyBbZXgtXVtjb250YWluZXIgc3RhcnRdW2NvbnRh aW5lciBlbmRdW2Zsb2F0XVthbXBsZV0gKGV4LTxzcGFuPjwvc3Bhbj48ZGl2IHN0eWxlPSJmbG9h dDpsZWZ0Ij48L2Rpdj5hbXBsZSkuIFdyYXAgaW5kZXggaXMgYXQgW2V4LV0uCisgICAgLy8gW2V4 XVtjb250YWluZXIgc3RhcnRdW2FtcC1dW2NvbnRhaW5lciBzdGFydF1bbGVdIChleDxzcGFuPmFt cC08c3Bhbj5hbXBsZSkuIFdyYXAgaW5kZXggaXMgYXQgW2FtcC1dLgorICAgIC8vIFtleC1dW2Nv bnRhaW5lciBzdGFydF1bbGluZSBicmVha11bYW1wbGVdIChleC08c3Bhbj48YnI+YW1wbGUpLiBX cmFwIGluZGV4IGlzIGFmdGVyIFticl0uCisgICAgYXV0byBwcmV2aW91c0lubGluZUl0ZW1JbmRl eCA9IE9wdGlvbmFsPHNpemVfdD4geyB9OworICAgIGZvciAoYXV0byBpbmRleCA9IHN0YXJ0SW5k ZXg7IGluZGV4IDwgbGF5b3V0UmFuZ2UuZW5kOyArK2luZGV4KSB7CisgICAgICAgIGF1dG8mIGlu bGluZUl0ZW0gPSBpbmxpbmVDb250ZW50W2luZGV4XTsKKyAgICAgICAgaWYgKGlubGluZUl0ZW0u aXNMaW5lQnJlYWsoKSB8fCBpbmxpbmVJdGVtLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkgewor ICAgICAgICAgICAgLy8gV2UgYWx3YXlzIHN0b3AgYXQgZXhwbGljaXQgd3JhcHBpbmcgb3Bwb3J0 dW5pdGllcyBlLmcuIDxicj4uIFRoZSB3cmFwIHBvc2l0aW9uIGlzIGFmdGVyIHRoZSBvcHBvcnR1 bml0eSBwb3NpdGlvbi4KKyAgICAgICAgICAgIHJldHVybiArK2luZGV4OwogICAgICAgICB9Ci0g ICAgICAgIHJldHVybiBsYXlvdXRSYW5nZS5lbmQ7Ci0gICAgfTsKLQotICAgIC8vIFN0YXJ0IGF0 IHRoZSBmaXJzdCBpbmxpbmUgaXRlbSB3aXRoIGNvbnRlbnQuCi0gICAgLy8gW2NvbnRhaW5lciBz dGFydF1bZXgtXSA6IHN0YXJ0IGF0IFtleC1dCi0gICAgYXV0byBzdGFydENvbnRlbnRJbmRleCA9 IGlubGluZUl0ZW1JbmRleFdpdGhDb250ZW50KHN0YXJ0SW5kZXgpOwotICAgIGlmIChpc0F0TGlu ZUJyZWFrKSB7Ci0gICAgICAgIC8vIENvbnRlbnQgc3RhcnRzIHdpdGggYSBsaW5lIGJyZWFrLiBU aGUgd3JhcCBwb3NpdGlvbiBpcyBhZnRlciB0aGUgbGluZSBicmVhay4KLSAgICAgICAgcmV0dXJu IHN0YXJ0Q29udGVudEluZGV4ICsgMTsKLSAgICB9Ci0KLSAgICB3aGlsZSAoc3RhcnRDb250ZW50 SW5kZXggPCBsYXlvdXRSYW5nZS5lbmQpIHsKLSAgICAgICAgLy8gMS4gRmluZCB0aGUgbmV4dCBp bmxpbmUgaXRlbSB3aXRoIGNvbnRlbnQuCi0gICAgICAgIC8vIDIuIENoZWNrIGlmIHRoZXJlJ3Mg YSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgYmV0d2VlbiB0aGUgc3RhcnQgYW5kIHRoZSBuZXh0IGlu bGluZSBpdGVtLgotICAgICAgICBhdXRvIG5leHRDb250ZW50SW5kZXggPSBpbmxpbmVJdGVtSW5k ZXhXaXRoQ29udGVudChzdGFydENvbnRlbnRJbmRleCArIDEpOwotICAgICAgICBpZiAobmV4dENv bnRlbnRJbmRleCA9PSBsYXlvdXRSYW5nZS5lbmQpCi0gICAgICAgICAgICByZXR1cm4gbmV4dENv bnRlbnRJbmRleDsKLSAgICAgICAgaWYgKGlzQXRMaW5lQnJlYWspIHsKLSAgICAgICAgICAgIC8v IFdlIGFsd2F5cyBzdG9wIGF0IGxpbmUgYnJlYWtzLiBUaGUgd3JhcCBwb3NpdGlvbiBpcyBhZnRl ciB0aGUgbGluZSBicmVhay4KLSAgICAgICAgICAgIHJldHVybiBuZXh0Q29udGVudEluZGV4ICsg MTsKKyAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNGbG9hdCgpKSB7CisgICAgICAgICAgICAvLyBG bG9hdHMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBpbmxpbmUgY29udGVudC4gV2UgaWdub3JlIHRoZW0g YXMgZmFyIGFzIHdyYXAgb3Bwb3J0dW5pdGllcyBhcmUgY29uY2VybmVkLgorICAgICAgICAgICAg Ly8gW3RleHRdW2Zsb2F0IGJveF1bdGV4dF0gaXMgZXNzZW50aWFsbHkganVzdCBbdGV4dF1bdGV4 dF0KKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChpbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpIHsK KyAgICAgICAgICAgIC8vIFRoZXJlJ3Mgbm8gd3JhcHBpbmcgb3Bwb3J0dW5pdHkgYmV0d2VlbiA8 c3Bhbj50ZXh0LCA8c3Bhbj48L3NwYW4+IG9yIDwvc3Bhbj50ZXh0LiAKKyAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGlmIChpc0F0U29mdFdyYXBPcHBvcnR1bml0eShp bmxpbmVDb250ZW50W3N0YXJ0Q29udGVudEluZGV4XSwgaW5saW5lQ29udGVudFtuZXh0Q29udGVu dEluZGV4XSkpIHsKLSAgICAgICAgICAgIC8vIFRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5p dHkgYmV0d2VlbiB0aGUgc3RhcnQgYW5kIHRoZSBuZXh0Q29udGVudC4KKyAgICAgICAgQVNTRVJU KGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0JveCgpKTsKKyAgICAgICAgaWYg KCFwcmV2aW91c0lubGluZUl0ZW1JbmRleCkgeworICAgICAgICAgICAgcHJldmlvdXNJbmxpbmVJ dGVtSW5kZXggPSBpbmRleDsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAg ICAgIGlmIChpc0F0U29mdFdyYXBPcHBvcnR1bml0eShpbmxpbmVDb250ZW50WypwcmV2aW91c0lu bGluZUl0ZW1JbmRleF0sIGlubGluZUNvbnRlbnRbaW5kZXhdKSkgeworICAgICAgICAgICAgLy8g VGhlcmUncyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVuICdwcmV2aW91c0lubGluZUl0 ZW1JbmRleCcgYW5kICdpbmRleCcuCiAgICAgICAgICAgICAvLyBOb3cgZm9yd2FyZC1maW5kIGZy b20gdGhlIHN0YXJ0IHBvc2l0aW9uIHRvIHNlZSB3aGVyZSB3ZSBjYW4gYWN0dWFsbHkgd3JhcC4K ICAgICAgICAgICAgIC8vIFtleC1dW2FtcGxlXSB2cy4gW2V4LV1bY29udGFpbmVyIHN0YXJ0XVtj b250YWluZXIgZW5kXVthbXBsZV0KICAgICAgICAgICAgIC8vIHdoZXJlIFtleC1dIGlzIHN0YXJ0 Q29udGVudCBhbmQgW2FtcGxlXSBpcyB0aGUgbmV4dENvbnRlbnQuCi0gICAgICAgICAgICBmb3Ig KGF1dG8gY2FuZGlkYXRlSW5kZXggPSBzdGFydENvbnRlbnRJbmRleCArIDE7IGNhbmRpZGF0ZUlu ZGV4IDwgbmV4dENvbnRlbnRJbmRleDsgKytjYW5kaWRhdGVJbmRleCkgeworICAgICAgICAgICAg Zm9yIChhdXRvIGNhbmRpZGF0ZUluZGV4ID0gKnByZXZpb3VzSW5saW5lSXRlbUluZGV4ICsgMTsg Y2FuZGlkYXRlSW5kZXggPCBpbmRleDsgKytjYW5kaWRhdGVJbmRleCkgewogICAgICAgICAgICAg ICAgIGlmIChpbmxpbmVDb250ZW50W2NhbmRpZGF0ZUluZGV4XS5pc0NvbnRhaW5lclN0YXJ0KCkp IHsKICAgICAgICAgICAgICAgICAgICAgLy8gaW5saW5lIGNvbnRlbnQgYW5kIFtjb250YWluZXIg c3RhcnRdIGFuZCBbY29udGFpbmVyIGVuZF0gZm9ybSB1bmJyZWFrYWJsZSBjb250ZW50LgogICAg ICAgICAgICAgICAgICAgICAvLyBleC08c3Bhbj48L3NwYW4+YW1wbGUgIDogd3JhcCBvcHBvcnR1 bml0eSBpcyBhZnRlciAiZXgtIi4KQEAgLTE2OCw5ICsxNTQsOSBAQCBzdGF0aWMgaW5saW5lIHNp emVfdCBuZXh0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50 LCBzaXplXwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2FuZGlkYXRlSW5kZXg7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIG5leHRDb250 ZW50SW5kZXg7CisgICAgICAgICAgICByZXR1cm4gaW5kZXg7CiAgICAgICAgIH0KLSAgICAgICAg c3RhcnRDb250ZW50SW5kZXggPSBuZXh0Q29udGVudEluZGV4OworICAgICAgICBwcmV2aW91c0lu bGluZUl0ZW1JbmRleCA9IGluZGV4OwogICAgIH0KICAgICByZXR1cm4gbGF5b3V0UmFuZ2UuZW5k OwogfQpAQCAtMjQ3LDcgKzIzMyw3IEBAIGlubGluZSB2b2lkIExpbmVDYW5kaWRhdGU6OklubGlu ZUNvbnRlbnQ6OmFwcGVuZElubGluZUl0ZW0oY29uc3QgSW5saW5lSXRlbSYgaW5sCiAgICAgICAg ICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxp bmVJdGVtKTsKICAgICAgICAgICAgIHJldHVybiBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2Uo KSAmJiAhVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlVHJhaWxpbmdXaGl0ZXNwYWNlKGlubGluZVRl eHRJdGVtLnN0eWxlKCkpOwogICAgICAgICB9Ci0gICAgICAgIGlmIChpbmxpbmVJdGVtLmlzQ29u dGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpCisgICAgICAgIGlm IChpbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVy RW5kKCkgfHwgaW5saW5lSXRlbS5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBy ZXR1cm4gdHJ1ZTsKQEAgLTMxMCw4ICsyOTYsOCBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCdWls ZGVyOjppbmxpbmVJdGVtV2lkdGgoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saQog ICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBpbmxpbmVUZXh0 SXRlbS5zdGFydCgpLCBlbmQsIGNvbnRlbnRMb2dpY2FsTGVmdCk7CiAgICAgfQogCi0gICAgaWYg KGlubGluZUl0ZW0uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKGlu bGluZUl0ZW0uaXNMaW5lQnJlYWsoKSB8fCBpbmxpbmVJdGVtLmlzV29yZEJyZWFrT3Bwb3J0dW5p dHkoKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIGF1dG8mIGxheW91dEJveCA9IGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCk7CiAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBtX2lubGluZUZvcm1h dHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CkBAIC01MzcsNyArNTIzLDcg QEAgdm9pZCBMaW5lQnVpbGRlcjo6bmV4dENvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxp bmVDYW5kaWRhdGUsIHVuc2lnbmVkIGN1cnIKICAgICAgICAgICAgIGFjY3VtdWxhdGVkV2lkdGgg Kz0gZmxvYXRXaWR0aDsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAg IGlmIChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgp IHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSB8fCBpbmxpbmVJdGVtLmlzQm94KCkpIHsK KyAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0NvbnRhaW5l clN0YXJ0KCkgfHwgaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpIHx8IGlubGluZUl0ZW0uaXNC b3goKSB8fCBpbmxpbmVJdGVtLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkgewogICAgICAgICAg ICAgYXV0byBpbmxpbmVJdGVubVdpZHRoID0gaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0sIGN1 cnJlbnRMb2dpY2FsUmlnaHQpOwogICAgICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250 ZW50LmFwcGVuZElubGluZUl0ZW0oaW5saW5lSXRlbSwgaW5saW5lSXRlbm1XaWR0aCk7CiAgICAg ICAgICAgICBjdXJyZW50TG9naWNhbFJpZ2h0ICs9IGlubGluZUl0ZW5tV2lkdGg7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZjA1ZDczOTAwMDZlMjQ4ZmVmZTgxMjE1MzEyM2M1ZTRhZDU4MGE0MS4uYmJhYmQ1OTFlNWMzMWIw OTBjZTQ4MTZjMGMzOTYwZjhhMjYxYmY2ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA5 LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZD XSBBZGQgc3VwcG9ydCBmb3IgPHdicj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNzAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC93YnItc2ltcGxl LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvd2JyLXNpbXBsZS5odG1sOiBBZGRlZC4KKwogMjAyMC0wOS0yNiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTGluZSBjb250ZW50IGxv Z2ljYWwgd2lkdGggZXhwYW5kcyB3aXRoIHJ1biBleHBhbnNpb25zICh0ZXh0LWFsaWduOiBqdXN0 aWZ5KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC93YnItc2ltcGxlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h dHRpbmdjb250ZXh0L3dici1zaW1wbGUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hYzYzN2M4 YmZjNGY2MWI5YzU1MjNhNzE3ZGQ2ZmNmNDk5NDNkODliCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC93YnItc2ltcGxlLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSw4IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1y dW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRl cm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0t PgorPHN0eWxlPgorZGl2IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxl PgorPGRpdiBzdHlsZT0id2lkdGg6IDMwMHB4OyBoZWlnaHQ6IDEwcHg7Ij48L2Rpdj4KKzxkaXYg c3R5bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0OiAyMHB4OyI+PC9kaXY+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3dici1zaW1wbGUuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvd2JyLXNpbXBsZS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmIxYmM0NzYyZmZlYTRiZWU1MTFmNDM2MzFiMjkyYjY0ZDc4MjQ0ZjkKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L3dici1zaW1wbGUuaHRtbApAQCAtMCwwICsxLDExIEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3 ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJs ZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxl ZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorZGl2IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47 CisgIGNvbG9yOiBncmVlbjsKKyAgZm9udC1mYW1pbHk6IEFoZW07CisgIGZvbnQtc2l6ZTogMTBw eDsKK30KKzwvc3R5bGU+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogMzAwcHg7Ij5vbmx5X29uZV9saW5l PHdicj5oZXJlPC9kaXY+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHgiPmZpcnN0X2xpbmU8d2Jy PnNlY29uZF9saW5lPC9kaXY+Cg==