218410 2020-10-30 18:22:53 -0700 [LFC][IFC] Rename ContainerStart/End to InlineBoxStart/End 2020-10-31 05:19: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 1703282 0 zalan 2020-10-30 18:22:53 -0700 spec terms 1703283 1 412821 zalan 2020-10-30 18:27:11 -0700 Created attachment 412821 Patch 1703323 2 ews-feeder 2020-10-31 05:18:38 -0700 Committed r269222: <https://trac.webkit.org/changeset/269222> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412821. 1703324 3 webkit-bug-importer 2020-10-31 05:19:20 -0700 <rdar://problem/70914276> 412821 2020-10-30 18:27:11 -0700 2020-10-31 05:18:39 -0700 Patch bug-218410-20201030182710.patch text/plain 22912 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFiYzM5NTU5MTg1ODk4 ZDFkODZlOWQ4Yjc0OGEzMTUyYWZkOTA2ZC4uN2Y2ZDBjZmUxMjBiYjNkOTBhYWM5YmE5MzdkOGE2 ZDg5MmFiOWU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDIwLTEwLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg Q29udGFpbmVyU3RhcnQvRW5kIHRvIElubGluZUJveFN0YXJ0L0VuZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4NDEwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udGFpbmVyU3RhcnQvRW5kIGlubGlu ZSBpdGVtcyBhcmUgdHJpZ2dlcmVkIGJ5IGlubGluZSBib3hlcy4KKworICAgICAgICAiQW4gaW5s aW5lIGJveCBpcyBvbmUgdGhhdCBpcyBib3RoIGlubGluZS1sZXZlbCBhbmQgd2hvc2UgY29udGVu dHMgcGFydGljaXBhdGUgaW4gaXRzIGNvbnRhaW5pbmcgaW5saW5lIGZvcm1hdHRpbmcgY29udGV4 dC4iCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJl YWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzVGV4dENvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzTm9uQ29udGVudFJ1bnNPbmx5KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxv d2luZ1RleHRDb250ZW50IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudElmTmVlZGVkKToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y29sbGVjdEhhbmdpbmdU cmFpbGluZ1doaXRlc3BhY2VDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lSXRlbTo6aXNJbmxpbmVCb3hTdGFydCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUl0ZW06OmlzSW5saW5lQm94RW5kIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lSXRlbTo6aXNDb250YWluZXJTdGFydCBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW06OmlzQ29udGFpbmVyRW5k IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6dmlzdWFsbHlDb2xs YXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjphcHBlbmQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRJbmxp bmVCb3hTdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZElubGlu ZUJveEVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNSdW5WaXN1YWxseU5vbkVt cHR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6VHJpbW1hYmxlVHJh aWxpbmdDb250ZW50OjpyZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjph cHBlbmRJbmxpbmVDb250YWluZXJTdGFydCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmU6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZCk6IERlbGV0ZWQuCisgICAgICAg ICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpSdW46OmlzSW5saW5lQm94U3RhcnQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OmlzSW5saW5lQm94RW5kIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc0NvbnRhaW5lclN0YXJ0IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc0NvbnRhaW5l ckVuZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2Fu ZGlkYXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmlubGluZUl0ZW1XaWR0aCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpuZXh0Q29udGVudEZvckxpbmUpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bmV4dFdyYXBPcHBvcnR1bml0eSBj b25zdCk6CisKIDIwMjAtMTAtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gSW1wbGVtZW50IG91dHB1dExpbmVUcmVlQW5kTWFy ayBmb3IgSUZDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKaW5kZXggNDU3NmExNzllZTYy ZWYxNDg4YzU5YzBkZTA4ODg4NjYwMGUwOTA3MC4uZDdkM2YxMGRkNTFjN2EzMDU5ZWUxNzdhMjAw ZTdiMGFkMWE1NDQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApAQCAtNDMsNyAr NDMsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNUZXh0Q29udGVudChjb25zdCBJbmxpbmVDb250 ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQmCiAgICAgLy8gRHVlIHRvIGNvbW1pdCBib3Vu ZGFyeSBydWxlcywgd2UganVzdCBuZWVkIHRvIGNoZWNrIHRoZSBmaXJzdCBub24tdHlwZWxlc3Mg aW5saW5lIGl0ZW0gKGNhbid0IGhhdmUgYm90aCBbaW1nXSBhbmQgW3RleHRdKQogICAgIGZvciAo YXV0byYgcnVuIDogY29udGludW91c0NvbnRlbnQucnVucygpKSB7CiAgICAgICAgIGF1dG8mIGlu bGluZUl0ZW0gPSBydW4uaW5saW5lSXRlbTsKLSAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNDb250 YWluZXJTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKKyAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hF bmQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICByZXR1cm4gaW5saW5lSXRlbS5p c1RleHQoKTsKICAgICB9CkBAIC01OCw3ICs1OCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1Zp c3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb25zdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6 CiAgICAgZm9yIChhdXRvJiBydW4gOiBjb250aW51b3VzQ29udGVudC5ydW5zKCkpIHsKICAgICAg ICAgYXV0byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVtOwogICAgICAgICAvLyBGSVhNRTog Y2hlY2sgZm9yIHBhZGRpbmcgYm9yZGVyIGV0Yy4KLSAgICAgICAgaWYgKGlubGluZUl0ZW0uaXND b250YWluZXJTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKKyAgICAgICAg aWYgKGlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVC b3hFbmQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICByZXR1cm4gaW5saW5lSXRl bS5pc1RleHQoKSAmJiBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSkuaXNXaGl0 ZXNwYWNlKCk7CiAgICAgfQpAQCAtNzAsNyArNzAsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNO b25Db250ZW50UnVuc09ubHkoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXND bwogICAgIC8vIDxzcGFuPjwvc3Bhbj4gPC0gbm9uIGNvbnRlbnQgcnVucy4KICAgICBmb3IgKGF1 dG8mIHJ1biA6IGNvbnRpbnVvdXNDb250ZW50LnJ1bnMoKSkgewogICAgICAgICBhdXRvJiBpbmxp bmVJdGVtID0gcnVuLmlubGluZUl0ZW07Ci0gICAgICAgIGlmIChpbmxpbmVJdGVtLmlzQ29udGFp bmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpCisgICAgICAgIGlmIChp bmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5k KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K QEAgLTI1Miw3ICsyNTIsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNv bnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogT3B0aW9uYWw8VHJh aWxpbmdUZXh0Q29udGVudD4gSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2lu Z1RleHRDb250ZW50KGNvbnN0IENvbnRpbnVvdXNDb250ZW50JiBjb250aW51b3VzQ29udGVudCwg Y29uc3QgTGluZVN0YXR1cyYgbGluZVN0YXR1cykgY29uc3QKIHsKICAgICBhdXRvIGlzQnJlYWth YmxlUnVuID0gW10gKGF1dG8mIHJ1bikgewotICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0u aXNUZXh0KCkgfHwgcnVuLmlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pbmxp bmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpOworICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0u aXNUZXh0KCkgfHwgcnVuLmlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pbmxp bmVJdGVtLmlzSW5saW5lQm94RW5kKCkpOwogICAgICAgICBpZiAoIXJ1bi5pbmxpbmVJdGVtLmlz VGV4dCgpKSB7CiAgICAgICAgICAgICAvLyBDYW4ndCBicmVhayBob3Jpem9udGFsIHNwYWNpbmcg LT4gZS5nLiA8c3BhbiBzdHlsZT0icGFkZGluZy1yaWdodDogMTAwcHg7Ij50ZXh0Y29udGVudDwv c3Bhbj4sIGlmIHRoZSBbY29udGFpbmVyIGVuZF0gaXMgdGhlIG92ZXJmbG93biBpbmxpbmUgaXRl bQogICAgICAgICAgICAgLy8gd2UgbmVlZCB0byBjaGVjayBpZiB0aGVyZSdzIGFub3RoZXIgaW5s aW5lIGl0ZW0gYmV5b25kIHRoZSBbY29udGFpbmVyIGVuZF0gdG8gc3BsaXQuCkBAIC0yNjksNyAr MjY5LDcgQEAgT3B0aW9uYWw8VHJhaWxpbmdUZXh0Q29udGVudD4gSW5saW5lQ29udGVudEJyZWFr ZXI6OnByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW4KICAgICBzaXplX3QgaW5kZXggPSAwOwog ICAgIHdoaWxlIChpbmRleCA8IHJ1bnMuc2l6ZSgpKSB7CiAgICAgICAgIGF1dG8mIHJ1biA9IHJ1 bnNbaW5kZXhdOwotICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkgfHwgcnVu LmlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pbmxpbmVJdGVtLmlzQ29udGFp bmVyRW5kKCkpOworICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkgfHwgcnVu LmlubGluZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pbmxpbmVJdGVtLmlzSW5saW5l Qm94RW5kKCkpOwogICAgICAgICBpZiAoYWNjdW11bGF0ZWRSdW5XaWR0aCArIHJ1bi5sb2dpY2Fs V2lkdGggPiBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoICYmIGlzQnJlYWthYmxlUnVuKHJ1bikp IHsKICAgICAgICAgICAgIC8vIEF0IHRoaXMgcG9pbnQgdGhlIGF2YWlsYWJsZSB3aWR0aCBjYW4g dmVyeSB3ZWxsIGJlIG5lZ2F0aXZlIGUuZy4gd2hlbiBzb21lIHBhcnQgb2YgdGhlIGNvbnRpbnVv dXMgdGV4dCBjb250ZW50IGNhbiBub3QgYmUgYnJva2VuIGludG8gcGFydHMgLT4KICAgICAgICAg ICAgIC8vIDxzcGFuIHN0eWxlPSJ3b3JkLWJyZWFrOiBrZWVwLWFsbCI+dGV4dGNvbnRlbnR3aXRo bm9icmVhazwvc3Bhbj48c3Bhbj50ZXh0Y29udGVudHdpdGh5ZXNicmVhazwvc3Bhbj4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3ZDc1MWI1ODYyM2M4MjdiNzQxNjkw OTFiMGFjNjE5YzdjOTZjODkwLi42YjRlOTdiZDQ0ZWU0ZDAzNDA1NDhlODM4MjU1NzJmN2RiZjVi ZWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0zNjEsNyArMzYx LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRlbnRJ Zk5lZWRlZCgpCiAgICAgaWYgKCFmb3JtYXR0aW5nU3RhdGUuaW5saW5lSXRlbXMoKS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybjsKICAgICAvLyBUcmF2ZXJzZSB0aGUgdHJlZSBhbmQgY3JlYXRl IGlubGluZSBpdGVtcyBvdXQgb2YgY29udGFpbmVycyBhbmQgbGVhZiBub2Rlcy4gVGhpcyBlc3Nl bnRpYWxseSB0dXJucyB0aGUgdHJlZSBpbmxpbmUgc3RydWN0dXJlIGludG8gYSBmbGF0IG9uZS4K LSAgICAvLyA8c3Bhbj50ZXh0PHNwYW4+PC9zcGFuPjxpbWc+PC9zcGFuPiAtPiBbQ29udGFpbmVy U3RhcnRdW0lubGluZUJveF1bQ29udGFpbmVyU3RhcnRdW0NvbnRhaW5lckVuZF1bSW5saW5lQm94 XVtDb250YWluZXJFbmRdCisgICAgLy8gPHNwYW4+dGV4dDxzcGFuPjwvc3Bhbj48aW1nPjwvc3Bh bj4gLT4gW0lubGluZUJveFN0YXJ0XVtJbmxpbmVMZXZlbEJveF1bSW5saW5lQm94U3RhcnRdW0lu bGluZUJveEVuZF1bSW5saW5lTGV2ZWxCb3hdW0lubGluZUJveEVuZF0KICAgICBBU1NFUlQocm9v dCgpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKTsKICAgICBMYXlvdXRRdWV1ZSBsYXlvdXRR dWV1ZTsKICAgICBsYXlvdXRRdWV1ZS5hcHBlbmQocm9vdCgpLmZpcnN0SW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpOwpAQCAtMzcyLDcgKzM3Miw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbGxlY3RJbmxpbmVDb250ZW50SWZOZWVkZWQoKQogICAgICAgICAgICAgaWYgKCFpc0Jv eFdpdGhJbmxpbmVDb250ZW50KQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg Ly8gVGhpcyBpcyB0aGUgc3RhcnQgb2YgYW4gaW5saW5lIGJveCAoZS5nLiA8c3Bhbj4pLgotICAg ICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGlu ZUl0ZW06OlR5cGU6OkNvbnRhaW5lclN0YXJ0IH0pOworICAgICAgICAgICAgZm9ybWF0dGluZ1N0 YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OklubGluZUJv eFN0YXJ0IH0pOwogICAgICAgICAgICAgYXV0byYgaW5saW5lQm94V2l0aElubGluZUNvbnRlbnQg PSBkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAoIWlu bGluZUJveFdpdGhJbmxpbmVDb250ZW50Lmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQogICAg ICAgICAgICAgICAgIGJyZWFrOwpAQCAtMzkxLDcgKzM5MSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVDb250ZW50SWZOZWVkZWQoKQogICAgICAgICAgICAg ZWxzZSBpZiAobGF5b3V0Qm94LmlzSW5saW5lVGV4dEJveCgpKSB7CiAgICAgICAgICAgICAgICAg SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyhmb3JtYXR0aW5nU3RhdGUu aW5saW5lSXRlbXMoKSwgZG93bmNhc3Q8SW5saW5lVGV4dEJveD4obGF5b3V0Qm94KSk7CiAgICAg ICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC5pc0lubGluZUJveCgpKQotICAgICAgICAgICAg ICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtKHsgbGF5b3V0Qm94LCBJbmxpbmVJdGVt OjpUeXBlOjpDb250YWluZXJFbmQgfSk7CisgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRl LmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OklubGluZUJveEVu ZCB9KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCAwYmY5MWRmMDBhYzQ2ODJiY2IwNzY2YTI4ZDNkZTM2YmQ4ZmU5OTY1Li5mZjhiMjkw NmI0NWRhNDBlOWM5NGIxNTMxZDI3MjhlYjY3ODA1MDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtODcsNyArODcsNyBAQCBzdGF0aWMg SGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQgY29sbGVjdEhhbmdpbmdUcmFpbGluZ1do aXRlc3BhY2VDb250ZW50KAogICAgIGlmIChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpCiAg ICAgICAgIGhhbmdpbmdDb250ZW50LnNldElzQ29uZGl0aW9uYWwoKTsKICAgICBmb3IgKGF1dG8m IHJ1biA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UocnVucykpIHsKLSAgICAgICAgaWYgKHJ1bi5p c0NvbnRhaW5lclN0YXJ0KCkgfHwgcnVuLmlzQ29udGFpbmVyRW5kKCkpCisgICAgICAgIGlmIChy dW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pc0lubGluZUJveEVuZCgpKQogICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIGlmIChydW4uaXNMaW5lQnJlYWsoKSkgewogICAgICAgICAg ICAgaGFuZ2luZ0NvbnRlbnQuc2V0SXNDb25kaXRpb25hbCgpOwpAQCAtMjM0LDcgKzIzNCw3IEBA IHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYg bGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgIC8vIGUuZy4KICAgICAgICAgLy8gPHNw YW4+bm9ybWFsbHkgdGhlIGlubGluZSBib3ggY2xvc2luZyBmb3JtcyBhIGNvbnRpbnVvdXMgY29u dGVudDwvc3Bhbj4KICAgICAgICAgLy8gPHNwYW4+dW5sZXNzIGl0J3MgZm9yY2VkIHRvIHRoZSBu ZXh0IGxpbmU8YnI+PC9zcGFuPgotICAgICAgICBpZiAoaXNSb290Qm94KGZpcnN0UnVuUGFyZW50 TGF5b3V0Qm94KSAmJiAhZmlyc3RSdW4uaXNDb250YWluZXJFbmQoKSkKKyAgICAgICAgaWYgKGlz Um9vdEJveChmaXJzdFJ1blBhcmVudExheW91dEJveCkgJiYgIWZpcnN0UnVuLmlzSW5saW5lQm94 RW5kKCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGF1dG8qIGFuY2VzdG9yID0gJmZp cnN0UnVuUGFyZW50TGF5b3V0Qm94OwogICAgICAgICBWZWN0b3I8Y29uc3QgQm94Kj4gYW5jZXN0 b3JzV2l0aG91dElubGluZUJveGVzOwpAQCAtMjcwLDEzICsyNzAsMTMgQEAgdm9pZCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25z dCBMaW5lOjpSdW4KICAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KQogICAgICAgICAgICAg ICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7CiAgICAgICAgICAgICBs aW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsK LSAgICAgICAgfSBlbHNlIGlmIChydW4uaXNDb250YWluZXJTdGFydCgpKSB7CisgICAgICAgIH0g ZWxzZSBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBpbml0 aWFsTG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVm dCgpOwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CiAgICAg ICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJ bmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7CiAg ICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCppbmxpbmVCb3gpOwog ICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkp OwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc0NvbnRhaW5lckVuZCgpKSB7CisgICAgICAgIH0g ZWxzZSBpZiAocnVuLmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCB0 aGUgbG9naWNhbCB3aWR0aCB3aGVuIHRoZSBpbmxpbmUgbGV2ZWwgY29udGFpbmVyIGNsb3NlcyBv biB0aGlzIGxpbmUuCiAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3ggPSBsaW5lQm94LmlubGlu ZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5s aW5lQm94LmlzSW5saW5lQm94KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5oCmluZGV4IGY1ZTMxZjhiOTMwZWZhZDk5ZDFkYWJi ZGM5NWM2OTFjZWJiMGRiOTYuLjZjOWEzNTE5YzVlMTBjYTVmYzJhNDE0ZTYxNmFlZGEwM2ZjMzVk NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVJdGVtLmgKQEAgLTM1LDcgKzM1LDcgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIGNsYXNz IElubGluZUl0ZW0gewogcHVibGljOgotICAgIGVudW0gY2xhc3MgVHlwZSA6IHVpbnQ4X3QgeyBU ZXh0LCBIYXJkTGluZUJyZWFrLCBTb2Z0TGluZUJyZWFrLCBXb3JkQnJlYWtPcHBvcnR1bml0eSwg Qm94LCBGbG9hdCwgQ29udGFpbmVyU3RhcnQsIENvbnRhaW5lckVuZCB9OworICAgIGVudW0gY2xh c3MgVHlwZSA6IHVpbnQ4X3QgeyBUZXh0LCBIYXJkTGluZUJyZWFrLCBTb2Z0TGluZUJyZWFrLCBX b3JkQnJlYWtPcHBvcnR1bml0eSwgQm94LCBGbG9hdCwgSW5saW5lQm94U3RhcnQsIElubGluZUJv eEVuZCB9OwogICAgIElubGluZUl0ZW0oY29uc3QgQm94JiBsYXlvdXRCb3gsIFR5cGUpOwogCiAg ICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9CkBAIC00OSw4ICs0OSw4IEBA IHB1YmxpYzoKICAgICBib29sIGlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSBjb25zdCB7IHJldHVy biB0eXBlKCkgPT0gVHlwZTo6V29yZEJyZWFrT3Bwb3J0dW5pdHk7IH0KICAgICBib29sIGlzU29m dExpbmVCcmVhaygpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBlOjpTb2Z0TGluZUJyZWFr OyB9CiAgICAgYm9vbCBpc0hhcmRMaW5lQnJlYWsoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0g VHlwZTo6SGFyZExpbmVCcmVhazsgfQotICAgIGJvb2wgaXNDb250YWluZXJTdGFydCgpIGNvbnN0 IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBlOjpDb250YWluZXJTdGFydDsgfQotICAgIGJvb2wgaXND b250YWluZXJFbmQoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gVHlwZTo6Q29udGFpbmVyRW5k OyB9CisgICAgYm9vbCBpc0lubGluZUJveFN0YXJ0KCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09 IFR5cGU6OklubGluZUJveFN0YXJ0OyB9CisgICAgYm9vbCBpc0lubGluZUJveEVuZCgpIGNvbnN0 IHsgcmV0dXJuIHR5cGUoKSA9PSBUeXBlOjpJbmxpbmVCb3hFbmQ7IH0KIAogcHJpdmF0ZToKICAg ICBjb25zdCBCb3gqIG1fbGF5b3V0Qm94IHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCBjNThj Y2ExZjRmYmRlZTc4NzhhYWQ5ODNjNzk3MTM3NmY5Yzc5ZWI2Li4yMTg5NTRiNDEzMmFlOTllNjQx ODIxNGMyYmVlZTFlZTVjNjQ2ZjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtMTc0LDcgKzE3NCw3IEBAIHZv aWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQoKQogICAgICAg ICAgICAgLy8gV2UgYXJlIG9ubHkgaW50ZXJlc3RlZCBpbiBwcmUtd3JhcCB0cmFpbGluZyBjb250 ZW50LgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgYXV0byBwcmVXcmFw VmlzdWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0gPSBydW4uaXNDb250YWluZXJTdGFydCgpIHx8 IHJ1bi5pc0NvbnRhaW5lckVuZCgpIHx8IHJ1bi5oYXNUcmFpbGluZ1doaXRlc3BhY2UoKTsKKyAg ICAgICAgYXV0byBwcmVXcmFwVmlzdWFsbHlDb2xsYXBzaWJsZUlubGluZUl0ZW0gPSBydW4uaXNJ bmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pc0lubGluZUJveEVuZCgpIHx8IHJ1bi5oYXNUcmFpbGlu Z1doaXRlc3BhY2UoKTsKICAgICAgICAgaWYgKCFwcmVXcmFwVmlzdWFsbHlDb2xsYXBzaWJsZUlu bGluZUl0ZW0pCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgQVNTRVJUKCFydW4uaGFzQ29s bGFwc2libGVUcmFpbGluZ1doaXRlc3BhY2UoKSk7CkBAIC0yMTksMTAgKzIxOSwxMCBAQCB2b2lk IExpbmU6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCkKICAgICAgICAgYXBwZW5kTGluZUJyZWFrKGlubGluZUl0ZW0pOwog ICAgIGVsc2UgaWYgKGlubGluZUl0ZW0uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQogICAgICAg ICBhcHBlbmRXb3JkQnJlYWtPcHBvcnR1bml0eShpbmxpbmVJdGVtKTsKLSAgICBlbHNlIGlmIChp bmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSkKLSAgICAgICAgYXBwZW5kSW5saW5lQ29udGFp bmVyU3RhcnQoaW5saW5lSXRlbSwgbG9naWNhbFdpZHRoKTsKLSAgICBlbHNlIGlmIChpbmxpbmVJ dGVtLmlzQ29udGFpbmVyRW5kKCkpCi0gICAgICAgIGFwcGVuZElubGluZUNvbnRhaW5lckVuZChp bmxpbmVJdGVtLCBsb2dpY2FsV2lkdGgpOworICAgIGVsc2UgaWYgKGlubGluZUl0ZW0uaXNJbmxp bmVCb3hTdGFydCgpKQorICAgICAgICBhcHBlbmRJbmxpbmVCb3hTdGFydChpbmxpbmVJdGVtLCBs b2dpY2FsV2lkdGgpOworICAgIGVsc2UgaWYgKGlubGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSkK KyAgICAgICAgYXBwZW5kSW5saW5lQm94RW5kKGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CiAg ICAgZWxzZSBpZiAoaW5saW5lSXRlbS5sYXlvdXRCb3goKS5pc1JlcGxhY2VkQm94KCkpCiAgICAg ICAgIGFwcGVuZFJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CiAg ICAgZWxzZSBpZiAoaW5saW5lSXRlbS5pc0JveCgpKQpAQCAtMjQxLDcgKzI0MSw3IEBAIHZvaWQg TGluZTo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgSW5saW5lTGF5b3V0VW5pCiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9IGxvZ2ljYWxX aWR0aDsKIH0KIAotdm9pZCBMaW5lOjphcHBlbmRJbmxpbmVDb250YWluZXJTdGFydChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKK3Zv aWQgTGluZTo6YXBwZW5kSW5saW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7CiAgICAgLy8gVGhpcyBpcyByZWFs bHkganVzdCBhIHBsYWNlaG9sZGVyIHRvIG1hcmsgdGhlIHN0YXJ0IG9mIHRoZSBpbmxpbmUgbGV2 ZWwgY29udGFpbmVyIDxzcGFuPi4KICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdD b250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSk7CkBAIC0yNDks NyArMjQ5LDcgQEAgdm9pZCBMaW5lOjphcHBlbmRJbmxpbmVDb250YWluZXJTdGFydChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXQKICAgICBhcHBlbmROb25CcmVha2Fi bGVTcGFjZShpbmxpbmVJdGVtLCBhZGp1c3RlZFJ1blN0YXJ0LCBsb2dpY2FsV2lkdGgpOwogfQog Ci12b2lkIExpbmU6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJdGVtJiBp bmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKK3ZvaWQgTGluZTo6YXBw ZW5kSW5saW5lQm94RW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKQogewogICAgIC8vIFRoaXMgaXMgcmVhbGx5IGp1c3QgYSBwbGFj ZWhvbGRlciB0byBtYXJrIHRoZSBlbmQgb2YgdGhlIGlubGluZSBsZXZlbCBjb250YWluZXIgPC9z cGFuPi4KICAgICBhdXRvIHJlbW92ZVRyYWlsaW5nTGV0dGVyU3BhY2luZyA9IFsmXSB7CkBAIC0y ODIsNyArMjgyLDcgQEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVU ZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFUKICAgICAgICAgICAgIC8vIE5v dCB0aGF0IHdoZW4gdGhlIGlubGluZSBjb250YWluZXIgaGFzIHByZXNlcnZlIHdoaXRlc3BhY2Ug c3R5bGUsICI8c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IHByZSI+ICA8L3NwYW4+ICIgPC0gdGhp cyB3aGl0ZXNwYWNlIHN0YXlzIGFyb3VuZC4KICAgICAgICAgICAgIGlmIChydW4uaXNUZXh0KCkp CiAgICAgICAgICAgICAgICAgcmV0dXJuIHJ1bi5oYXNDb2xsYXBzaWJsZVRyYWlsaW5nV2hpdGVz cGFjZSgpOwotICAgICAgICAgICAgQVNTRVJUKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkgfHwgcnVu LmlzQ29udGFpbmVyRW5kKCkgfHwgcnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSk7CisgICAg ICAgICAgICBBU1NFUlQocnVuLmlzSW5saW5lQm94U3RhcnQoKSB8fCBydW4uaXNJbmxpbmVCb3hF bmQoKSB8fCBydW4uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKTsKICAgICAgICAgfQogICAgICAg ICAvLyBMZWFkaW5nIHdoaXRlc3BhY2UuCiAgICAgICAgIHJldHVybiAhaXNXaGl0ZXNwYWNlUHJl c2VydmVkKHN0eWxlKTsKQEAgLTM1OCwxMiArMzU4LDEyIEBAIGJvb2wgTGluZTo6aXNSdW5WaXN1 YWxseU5vbkVtcHR5KGNvbnN0IFJ1biYgcnVuKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGVjayB3aGV0aGVyIHRoZSBpbmxp bmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1wbHkgY2hlY2tzIGlmIHRoZSBjb250YWlu ZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgbm9uLWVtcHR5LgotICAgIGlmIChydW4uaXNDb250YWlu ZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRhaW5lckVuZCgpKSB7CisgICAgaWYgKHJ1bi5pc0lubGlu ZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5lQm94RW5kKCkpIHsKICAgICAgICAgaWYgKCFydW4u bG9naWNhbFdpZHRoKCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIC8vIE1h cmdpbiBkb2VzIG5vdCBtYWtlIHRoZSBjb250YWluZXIgdmlzdWFsbHkgbm9uLWVtcHR5LiBDaGVj ayBpZiBpdCBoYXMgYm9yZGVyIG9yIHBhZGRpbmcuCiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5 ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChydW4ubGF5b3V0Qm94KCkpOwot ICAgICAgICBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSkKKyAgICAgICAgaWYgKHJ1bi5pc0lu bGluZUJveFN0YXJ0KCkpCiAgICAgICAgICAgICByZXR1cm4gYm94R2VvbWV0cnkuYm9yZGVyTGVm dCgpIHx8IChib3hHZW9tZXRyeS5wYWRkaW5nTGVmdCgpICYmIGJveEdlb21ldHJ5LnBhZGRpbmdM ZWZ0KCkudmFsdWUoKSk7CiAgICAgICAgIHJldHVybiBib3hHZW9tZXRyeS5ib3JkZXJSaWdodCgp IHx8IChib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKSAmJiBib3hHZW9tZXRyeS5wYWRkaW5nUmln aHQoKS52YWx1ZSgpKTsKICAgICB9CkBAIC00NDUsNyArNDQ1LDcgQEAgSW5saW5lTGF5b3V0VW5p dCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6OnJlbW92ZSgpCiAgICAgLy8gbm90IHBy b2R1Y2UgYSBydW4gc2luY2UgaW4gOjphcHBlbmRUZXh0KCkgd2Ugc2VlIGl0IGFzIGEgZnVsbHkg Y29sbGFwc2libGUgcnVuLgogICAgIGZvciAoYXV0byBpbmRleCA9ICptX2ZpcnN0VHJpbW1hYmxl UnVuSW5kZXggKyAxOyBpbmRleCA8IG1fcnVucy5zaXplKCk7ICsraW5kZXgpIHsKICAgICAgICAg YXV0byYgcnVuID0gbV9ydW5zW2luZGV4XTsKLSAgICAgICAgQVNTRVJUKHJ1bi5pc0NvbnRhaW5l clN0YXJ0KCkgfHwgcnVuLmlzQ29udGFpbmVyRW5kKCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpOwor ICAgICAgICBBU1NFUlQocnVuLmlzSW5saW5lQm94U3RhcnQoKSB8fCBydW4uaXNJbmxpbmVCb3hF bmQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSk7CiAgICAgICAgIHJ1bi5tb3ZlSG9yaXpvbnRhbGx5 KC10cmltbWFibGVXaWR0aCk7CiAgICAgfQogICAgIGlmICghdHJpbW1hYmxlUnVuLnRleHRDb250 ZW50KCktPmxlbmd0aCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKaW5kZXggM2RiYTY4MTQxNDNjMGIzODYzZmM5Y2FjMDMy ZjQ0NTFiMWIwNDk4MS4uZjQ2MmQxYTJkNjFmZDkyMWI4ZmY4NjEyZGFjYmQ0NzE3ZjljMzIyOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuaApAQCAtNzEsOCArNzEsOCBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNTb2Z0TGlu ZUJyZWFrKCkgY29uc3QgIHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpTb2Z0 TGluZUJyZWFrOyB9CiAgICAgICAgIGJvb2wgaXNIYXJkTGluZUJyZWFrKCkgY29uc3QgeyByZXR1 cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWs7IH0KICAgICAgICAg Ym9vbCBpc1dvcmRCcmVha09wcG9ydHVuaXR5KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElu bGluZUl0ZW06OlR5cGU6OldvcmRCcmVha09wcG9ydHVuaXR5OyB9Ci0gICAgICAgIGJvb2wgaXND b250YWluZXJTdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBl OjpDb250YWluZXJTdGFydDsgfQotICAgICAgICBib29sIGlzQ29udGFpbmVyRW5kKCkgY29uc3Qg eyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OkNvbnRhaW5lckVuZDsgfQorICAg ICAgICBib29sIGlzSW5saW5lQm94U3RhcnQoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5s aW5lSXRlbTo6VHlwZTo6SW5saW5lQm94U3RhcnQ7IH0KKyAgICAgICAgYm9vbCBpc0lubGluZUJv eEVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVC b3hFbmQ7IH0KIAogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJu ICptX2xheW91dEJveDsgfQogICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUoKSBjb25z dCB7IHJldHVybiBtX2xheW91dEJveC0+c3R5bGUoKTsgfQpAQCAtMTQwLDggKzE0MCw4IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBhcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYs IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICB2b2lkIGFwcGVuZE5vblJlcGxh Y2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCk7CiAgICAgdm9pZCBhcHBlbmRSZXBsYWNlZElubGluZUJveChjb25zdCBJbmxpbmVJdGVt JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwotICAgIHZvaWQgYXBwZW5kSW5saW5l Q29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNh bFdpZHRoKTsKLSAgICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJ dGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworICAgIHZvaWQgYXBwZW5kSW5s aW5lQm94U3RhcnQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdp ZHRoKTsKKyAgICB2b2lkIGFwcGVuZElubGluZUJveEVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQgYXBwZW5kTGluZUJyZWFrKGNv bnN0IElubGluZUl0ZW0mKTsKICAgICB2b2lkIGFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNv bnN0IElubGluZUl0ZW0mKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGQxYzRjYmRk Y2EzZDQ4NjdhOTUyMzY2YTgxNGVmZDRjNDQ3MWVlMDguLjM5NjdmNzRkMDUxMDE4YTUxOTY5ODY4 ZWIxZWRlYTRlMzQyODA3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTE3NCw3ICsx NzQsNyBAQCBMaW5lQ2FuZGlkYXRlOjpJbmxpbmVDb250ZW50OjpJbmxpbmVDb250ZW50KGJvb2wg aWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nKQogCiBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRl OjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewotICAgIEFTU0VSVChpbmxp bmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSB8fCBpbmxpbmVJdGVtLmlzQ29u dGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpOworICAgIEFTU0VS VChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSB8fCBpbmxpbmVJdGVt LmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzSW5saW5lQm94RW5kKCkpOwogICAg IGF1dG8gY29sbGFwc2libGVXaWR0aCA9IFsmXSgpIC0+IE9wdGlvbmFsPElubGluZUxheW91dFVu aXQ+IHsKICAgICAgICAgaWYgKCFpbmxpbmVJdGVtLmlzVGV4dCgpKQogICAgICAgICAgICAgcmV0 dXJuIHsgfTsKQEAgLTI0MywxMCArMjQzLDEwIEBAIElubGluZUxheW91dFVuaXQgTGluZUJ1aWxk ZXI6OmlubGluZUl0ZW1XaWR0aChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpCiAg ICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkQm94KCkpCiAgICAgICAgIHJldHVybiBib3hHZW9t ZXRyeS5tYXJnaW5Cb3hXaWR0aCgpOwogCi0gICAgaWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJT dGFydCgpKQorICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSkKICAgICAgICAg cmV0dXJuIGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9tZXRyeS5ib3JkZXJMZWZ0 KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nTGVmdCgpLnZhbHVlT3IoMCk7CiAKLSAgICBpZiAoaW5s aW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQorICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94 RW5kKCkpCiAgICAgICAgIHJldHVybiBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKSArIGJveEdlb21l dHJ5LmJvcmRlclJpZ2h0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKS52YWx1ZU9yKDAp OwogCiAgICAgLy8gTm9uLXJlcGxhY2VkIGlubGluZSBib3ggKGUuZy4gaW5saW5lLWJsb2NrKQpA QCAtNDc0LDcgKzQ3NCw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6Om5leHRDb250ZW50Rm9yTGluZShM aW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgY3VycmVuCiAgICAgICAgICAgICBh Y2N1bXVsYXRlZFdpZHRoICs9IGZsb2F0V2lkdGg7CiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQotICAgICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSB8fCBpbmxpbmVJdGVtLmlz Q29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkgfHwgaW5saW5l SXRlbS5pc0JveCgpKSB7CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGlu ZUl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNJbmxpbmVCb3hFbmQoKSB8 fCBpbmxpbmVJdGVtLmlzQm94KCkpIHsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0g aW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0sIGN1cnJlbnRMb2dpY2FsUmlnaHQpOwogICAgICAg ICAgICAgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50LmFwcGVuZElubGluZUl0ZW0oaW5saW5l SXRlbSwgbG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGN1cnJlbnRMb2dpY2FsUmlnaHQgKz0g bG9naWNhbFdpZHRoOwpAQCAtNTE5LDcgKzUxOSw3IEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6bmV4 dFdyYXBPcHBvcnR1bml0eShzaXplX3Qgc3RhcnRJbmRleCwgY29uc3QgTGluZUJ1aWxkZXI6Oklu CiAgICAgICAgICAgICAvLyBbdGV4dF1bZmxvYXQgYm94XVt0ZXh0XSBpcyBlc3NlbnRpYWxseSBq dXN0IFt0ZXh0XVt0ZXh0XQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAg ICAgaWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNDb250 YWluZXJFbmQoKSkgeworICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0KCkg fHwgaW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSB7CiAgICAgICAgICAgICAvLyBUaGVyZSdz IG5vIHdyYXBwaW5nIG9wcG9ydHVuaXR5IGJldHdlZW4gPHNwYW4+dGV4dCwgPHNwYW4+PC9zcGFu PiBvciA8L3NwYW4+dGV4dC4gCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAt NTM0LDcgKzUzNCw3IEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6bmV4dFdyYXBPcHBvcnR1bml0eShz aXplX3Qgc3RhcnRJbmRleCwgY29uc3QgTGluZUJ1aWxkZXI6OkluCiAgICAgICAgICAgICAvLyBb ZXgtXVthbXBsZV0gdnMuIFtleC1dW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bYW1w bGVdCiAgICAgICAgICAgICAvLyB3aGVyZSBbZXgtXSBpcyBzdGFydENvbnRlbnQgYW5kIFthbXBs ZV0gaXMgdGhlIG5leHRDb250ZW50LgogICAgICAgICAgICAgZm9yIChhdXRvIGNhbmRpZGF0ZUlu ZGV4ID0gKnByZXZpb3VzSW5saW5lSXRlbUluZGV4ICsgMTsgY2FuZGlkYXRlSW5kZXggPCBpbmRl eDsgKytjYW5kaWRhdGVJbmRleCkgewotICAgICAgICAgICAgICAgIGlmIChtX2lubGluZUl0ZW1z W2NhbmRpZGF0ZUluZGV4XS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICBp ZiAobV9pbmxpbmVJdGVtc1tjYW5kaWRhdGVJbmRleF0uaXNJbmxpbmVCb3hTdGFydCgpKSB7CiAg ICAgICAgICAgICAgICAgICAgIC8vIGlubGluZSBjb250ZW50IGFuZCBbY29udGFpbmVyIHN0YXJ0 XSBhbmQgW2NvbnRhaW5lciBlbmRdIGZvcm0gdW5icmVha2FibGUgY29udGVudC4KICAgICAgICAg ICAgICAgICAgICAgLy8gZXgtPHNwYW4+PC9zcGFuPmFtcGxlICA6IHdyYXAgb3Bwb3J0dW5pdHkg aXMgYWZ0ZXIgImV4LSIuCiAgICAgICAgICAgICAgICAgICAgIC8vIGV4LTwvc3Bhbj48L3NwYW4+ YW1wbGUgOiB3cmFwIG9wcG9ydHVuaXR5IGlzIGFmdGVyICJleC08L3NwYW4+PC9zcGFuPiIuCg==