206428 2020-01-17 10:31:59 -0800 [LFC][IFC] Do not construct a dedicated run for the trailing (fully) collapsed whitespace. 2020-01-19 11:06:21 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED InRadar P2 Normal --- 206472 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1608063 0 zalan 2020-01-17 10:31:59 -0800 ssia 1608064 1 webkit-bug-importer 2020-01-17 10:32:16 -0800 <rdar://problem/58687058> 1608067 2 388056 zalan 2020-01-17 10:35:11 -0800 Created attachment 388056 Patch 1608093 3 388064 zalan 2020-01-17 10:57:17 -0800 Created attachment 388064 Patch 1608302 4 388064 commit-queue 2020-01-17 16:42:37 -0800 Comment on attachment 388064 Patch Clearing flags on attachment: 388064 Committed r254780: <https://trac.webkit.org/changeset/254780> 1608303 5 commit-queue 2020-01-17 16:42:38 -0800 All reviewed patches have been landed. Closing bug. 1608428 6 commit-queue 2020-01-18 05:57:25 -0800 Re-opened since this is blocked by bug 206472 1608600 7 zalan 2020-01-19 11:06:21 -0800 This got redone at r254805 388056 2020-01-17 10:35:11 -0800 2020-01-17 10:48:23 -0800 Patch bug-206428-20200117103510.patch text/plain 7522 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQwZjU0MzU3Y2YyNmQ0 Njg4Nzk1ZjY2NDdkODZkZDFhNTBkNTZmMi4uM2NhM2U4NGFhNWE4NTkxYzFhNjY5YTJhYmYzM2I5 YzRjYjY4ZDQ1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAxLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg Y29uc3RydWN0IGEgZGVkaWNhdGVkIHJ1biBmb3IgdGhlIHRyYWlsaW5nIChmdWxseSkgY29sbGFw c2VkIHdoaXRlc3BhY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDY0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4Njg3MDU4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVk dWNlcyB0aGUgZmluYWwgcnVuIGNvdW50IG9uIGEgbGluZSBmcm9tIDIgdG8gMSBpbiB0aGUgY29t bW9uIGNhc2VzIHdoZXJlIHRoZSBsaW5lIGVuZHMgaW4gYSBjb2xsYXBzZWQgdHJhaWxpbmcgd2hp dGVzcGFjZS4gCisgICAgICAgIH4zJSBwcm9ncmVzc2lvbiBvbiBQZXJmb3JtYW5jZVRlc3RzL0xh eW91dC9saW5lLWxheW91dC1zaW1wbGUuaHRtbC4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2Nl bnROZWVkc0NvbGxhcHNpbmcgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50Ojppc0VsaWdpYmxlIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50OjpleHBhbmQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YWxpZ25Db250ZW50VmVydGljYWxseSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpydW5Db250ZW50SGVpZ2h0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OkNvbGxhcHNp YmxlQ29udGVudDo6Y29sbGFwc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZCk6IERlbGV0ZWQuCisKIDIwMjAtMDEtMTcg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE9w dGltaXplIExpbmVCdWlsZGVyOjphcHBlbmRUZXh0Q29udGVudCBmb3IgdGhlIG1vc3QgY29tbW9u IGlubGluZSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJr cy5jcHAKaW5kZXggMDg5Njk3MjU5ODhlODhiOTc0NmQ2OGI2NmYzZjkwZGRiYTg5ZTQyNC4uMDU0 YjVkYzRkZWYyMjAzZjFlZjljMGIyYTAzNmM5MzMyMmZhZWJlZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNDcsMTMgKzQ3LDE1IEBAIGJvb2wg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2NlbnROZWVkc0NvbGxhcHNp bmcoY29uc3QgTGluZUJ1aWxkCiAgICAgICAgIGlmIChydW4uaXNDb250YWluZXJFbmQoKSB8fCBs YXlvdXRCb3guc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCkgIT0gVmVydGljYWxBbGlnbjo6QmFzZWxp bmUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAocnVuLmlzTGluZUJyZWFr KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkp IHsKICAgICAgICAgICAgIGlmICghcnVuLmlzQ29sbGFwc2VkVG9WaXN1YWxseUVtcHR5KCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KKworICAgICAgICBpZiAocnVuLmlzTGluZUJyZWFrKCkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKICAgICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKICAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZv ckJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgaWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxC b3JkZXIoKSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRy eS5ob3Jpem9udGFsUGFkZGluZygpLnZhbHVlKCkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmlu ZGV4IDdhYmY0MjYwODRjNzY4YzM3MDAzOTcxMDdhMDg2NjhiNDFkYjg4YjcuLjRiNWM5ZmY3N2Nl YWMyMzk0ZTRjZTYyNzNkNGIyNjE2YjhhMzI0OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAK QEAgLTY5LDcgKzY5LDcgQEAgcHVibGljOgogICAgIENvbnRpbnVvdXNDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SdW4mLCBib29sIHRleHRJc0FsaWduSnVzdGlmeSk7CiAKICAgICBib29sIGlzRWxp Z2libGUoY29uc3QgSW5saW5lSXRlbVJ1biYpIGNvbnN0OwotICAgIHZvaWQgYXBwZW5kKGNvbnN0 IElubGluZUl0ZW1SdW4mKTsKKyAgICB2b2lkIGV4cGFuZChjb25zdCBJbmxpbmVJdGVtUnVuJik7 CiAgICAgTGluZUJ1aWxkZXI6OlJ1biBjbG9zZSgpOwogCiAgICAgc3RhdGljIGJvb2wgY2FuSW5s aW5lSXRlbVJ1bkJlRXhwYW5kZWQoY29uc3QgSW5saW5lSXRlbVJ1biYgcnVuKSB7IHJldHVybiBy dW4uaXNUZXh0KCkgJiYgIXJ1bi5pc0NvbGxhcHNlZCgpICYmICFydW4uaXNDb2xsYXBzZWRUb1pl cm9BZHZhbmNlV2lkdGgoKTsgfQpAQCAtOTYsMTEgKzk2LDEwIEBAIGJvb2wgTGluZUJ1aWxkZXI6 OkNvbnRpbnVvdXNDb250ZW50Ojppc0VsaWdpYmxlKGNvbnN0IElubGluZUl0ZW1SdW4mIGlubGlu ZUl0ZW1SCiB7CiAgICAgaWYgKCFtX3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCkKICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIC8vIE9ubHkgbm9uLWNvbGxhcHNlZCB0ZXh0IHJ1bnMgd2l0aCB0 aGUgc2FtZSBsYXlvdXQgYm94IGNhbiBiZSBhZGRlZCBhcyBjb250aW51b3VzIGNvbnRlbnQuCi0g ICAgcmV0dXJuIGlubGluZUl0ZW1SdW4uaXNUZXh0KCkgJiYgIWlubGluZUl0ZW1SdW4uaXNDb2xs YXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSAmJiAmbV9pbml0aWFsSW5saW5lUnVuLmxheW91dEJv eCgpID09ICZpbmxpbmVJdGVtUnVuLmxheW91dEJveCgpOworICAgIHJldHVybiBpbmxpbmVJdGVt UnVuLmlzVGV4dCgpICYmICZtX2luaXRpYWxJbmxpbmVSdW4ubGF5b3V0Qm94KCkgPT0gJmlubGlu ZUl0ZW1SdW4ubGF5b3V0Qm94KCk7CiB9CiAKLXZvaWQgTGluZUJ1aWxkZXI6OkNvbnRpbnVvdXND b250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lSXRlbVJ1biYgaW5saW5lSXRlbVJ1bikKK3ZvaWQg TGluZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50OjpleHBhbmQoY29uc3QgSW5saW5lSXRlbVJ1 biYgaW5saW5lSXRlbVJ1bikKIHsKICAgICAvLyBNZXJnZWQgY29udGVudCBuZWVkcyB0byBiZSBj b250aW51b3VzLgogICAgIEFTU0VSVChpc0VsaWdpYmxlKGlubGluZUl0ZW1SdW4pKTsKQEAgLTIz OCw4ICsyMzcsNyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNM YXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQogICAgIHZpc3VhbGx5Q29sbGFw c2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KCk7CiAgICAgYXV0byBoYW5naW5nQ29udGVudCA9IGNv bGxlY3RIYW5naW5nQ29udGVudChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwogCi0gICAg YXV0byBtZXJnZWRJbmxpbmVJdGVtUnVucyA9IFsmXSB7Ci0gICAgICAgIFJ1bkxpc3QgcnVuTGlz dDsKKyAgICBhdXRvIG1lcmdlZElubGluZUl0ZW1SdW5zID0gWyZdIChhdXRvJiBydW5MaXN0KSB7 CiAgICAgICAgIHVuc2lnbmVkIHJ1bkluZGV4ID0gMDsKICAgICAgICAgd2hpbGUgKHJ1bkluZGV4 IDwgbV9pbmxpbmVJdGVtUnVucy5zaXplKCkpIHsKICAgICAgICAgICAgIC8vIE1lcmdlIGVsaWdp YmxlIHJ1bnMuCkBAIC0yNTEsMTMgKzI0OSwxMyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5l QnVpbGRlcjo6Y2xvc2UoSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQog ICAgICAgICAgICAgfQogICAgICAgICAgICAgYXV0byBtZXJnZWRSdW5zID0gQ29udGludW91c0Nv bnRlbnQgeyBpbmxpbmVJdGVtUnVuLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9OwogICAgICAgICAg ICAgZm9yIChydW5JbmRleCA9IHJ1bkluZGV4ICsgMTsgcnVuSW5kZXggPCBtX2lubGluZUl0ZW1S dW5zLnNpemUoKSAmJiBtZXJnZWRSdW5zLmlzRWxpZ2libGUobV9pbmxpbmVJdGVtUnVuc1tydW5J bmRleF0pOyArK3J1bkluZGV4KQotICAgICAgICAgICAgICAgIG1lcmdlZFJ1bnMuYXBwZW5kKG1f aW5saW5lSXRlbVJ1bnNbcnVuSW5kZXhdKTsKKyAgICAgICAgICAgICAgICBtZXJnZWRSdW5zLmV4 cGFuZChtX2lubGluZUl0ZW1SdW5zW3J1bkluZGV4XSk7CiAgICAgICAgICAgICBydW5MaXN0LmFw cGVuZChtZXJnZWRSdW5zLmNsb3NlKCkpOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBydW5M aXN0OwogICAgIH07CiAKLSAgICBhdXRvIHJ1bkxpc3QgPSBtZXJnZWRJbmxpbmVJdGVtUnVucygp OworICAgIFJ1bkxpc3QgcnVuTGlzdDsKKyAgICBtZXJnZWRJbmxpbmVJdGVtUnVucyhydW5MaXN0 KTsKICAgICBpZiAoIW1faXNJbnRyaW5zaWNTaXppbmcpIHsKICAgICAgICAgZm9yIChhdXRvJiBy dW4gOiBydW5MaXN0KSB7CiAgICAgICAgICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQo cnVuKTsKQEAgLTM0Niw3ICszNDQsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphbGlnbkNvbnRlbnRW ZXJ0aWNhbGx5KFJ1bkxpc3QmIHJ1bkxpc3QpCiAKICAgICAgICAgc3dpdGNoICh2ZXJ0aWNhbEFs aWduKSB7CiAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6Ci0gICAgICAgICAg ICBpZiAocnVuLmlzTGluZUJyZWFrKCkgfHwgcnVuLmlzVGV4dCgpKQorICAgICAgICAgICAgaWYg KHJ1bi5pc1RleHQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkKICAgICAgICAgICAgICAgICBsb2dp Y2FsVG9wID0gYmFzZWxpbmVPZmZzZXQoKSAtIGFzY2VudDsKICAgICAgICAgICAgIGVsc2UgaWYg KHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9t ZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKQEAg LTc5MSw3ICs3ODksNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVI ZWlnaHQoY29uc3QgUnVuJiBydW4pCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKLUlu bGluZUxheW91dFVuaXQgTGluZUJ1aWxkZXI6OnJ1bkNvbnRlbnRIZWlnaHQoY29uc3QgUnVuJiBy dW4pIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6cnVuQ29udGVu dEhlaWdodChjb25zdCBSdW4mIHJ1bikgY29uc3QKIHsKICAgICBBU1NFUlQoIW1faXNJbnRyaW5z aWNTaXppbmcpOwogICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gcnVuLnN0eWxlKCkuZm9udE1ldHJp Y3MoKTsKQEAgLTkwMSwxNCArODk5LDEwIEBAIElubGluZUxheW91dFVuaXQgTGluZUJ1aWxkZXI6 OkNvbGxhcHNpYmxlQ29udGVudDo6Y29sbGFwc2UoKQogICAgIGZvciAoYXV0byBpbmRleCA9ICpt X2ZpcnN0UnVuSW5kZXg7IGluZGV4IDwgbV9pbmxpbmVpdGVtUnVuTGlzdC5zaXplKCk7ICsraW5k ZXgpIHsKICAgICAgICAgYXV0byYgcnVuID0gbV9pbmxpbmVpdGVtUnVuTGlzdFtpbmRleF07CiAg ICAgICAgIHJ1bi5tb3ZlSG9yaXpvbnRhbGx5KC1hY2N1bXVsYXRlZENvbGxhcHNlZFdpZHRoKTsK LSAgICAgICAgaWYgKCFydW4uaXNUZXh0KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVChydW4uaXND b250YWluZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRhaW5lckVuZCgpIHx8IHJ1bi5pc0xpbmVCcmVh aygpKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAgICAgICAgIGlmIChydW4u aXNXaGl0ZXNwYWNlKCkpIHsKICAgICAgICAgICAgIGFjY3VtdWxhdGVkQ29sbGFwc2VkV2lkdGgg Kz0gcnVuLmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICAgICAgcnVuLnNldENvbGxhcHNlc1RvWmVy b0FkdmFuY2VXaWR0aCgpOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKHJ1 bi5pc1RleHQoKSkgewogICAgICAgICAgICAgQVNTRVJUKCFoYXNTZWVuTm9uV2hpdGVzcGFjZVRl eHRDb250ZW50KTsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgICAgICAgICAgaGFzU2Vlbk5vbldo aXRlc3BhY2VUZXh0Q29udGVudCA9IHRydWU7CkBAIC05MTgsNiArOTEyLDcgQEAgSW5saW5lTGF5 b3V0VW5pdCBMaW5lQnVpbGRlcjo6Q29sbGFwc2libGVDb250ZW50Ojpjb2xsYXBzZSgpCiAgICAg ICAgICAgICBhY2N1bXVsYXRlZENvbGxhcHNlZFdpZHRoICs9IHJ1bi50cmFpbGluZ0xldHRlclNw YWNpbmcoKTsKICAgICAgICAgICAgIHJ1bi5yZW1vdmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKTsK ICAgICAgICAgfQorICAgICAgICBBU1NFUlQocnVuLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBydW4u aXNDb250YWluZXJFbmQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSk7CiAgICAgfQogICAgIEFTU0VS VChhY2N1bXVsYXRlZENvbGxhcHNlZFdpZHRoID09IHdpZHRoKCkpOwogICAgIHJlc2V0KCk7Cg== 388064 2020-01-17 10:57:17 -0800 2020-01-17 16:42:37 -0800 Patch bug-206428-20200117105716.patch text/plain 7927 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQwZjU0MzU3Y2YyNmQ0 Njg4Nzk1ZjY2NDdkODZkZDFhNTBkNTZmMi4uYzcwN2U1ZTgxYWMyYWYxNjZmMDY5ZmJiNDZmMTZm NGVjNmIwZTY1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTAxLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg Y29uc3RydWN0IGEgZGVkaWNhdGVkIHJ1biBmb3IgdGhlIHRyYWlsaW5nIChmdWxseSkgY29sbGFw c2VkIHdoaXRlc3BhY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDY0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4Njg3MDU4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVk dWNlcyB0aGUgZmluYWwgcnVuIGNvdW50IG9uIGEgbGluZSBmcm9tIDIgdG8gMSBpbiB0aGUgY29t bW9uIGNhc2VzIHdoZXJlIHRoZSBsaW5lIGVuZHMgaW4gYSBjb2xsYXBzZWQgdHJhaWxpbmcgd2hp dGVzcGFjZS4gCisgICAgICAgIH4zJSBwcm9ncmVzc2lvbiBvbiBQZXJmb3JtYW5jZVRlc3RzL0xh eW91dC9saW5lLWxheW91dC1zaW1wbGUuaHRtbC4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2Nl bnROZWVkc0NvbGxhcHNpbmcgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50Ojppc0VsaWdpYmxlIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50OjpleHBhbmQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YWxpZ25Db250ZW50VmVydGljYWxseSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpydW5Db250ZW50SGVpZ2h0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OkNvbGxhcHNp YmxlQ29udGVudDo6Y29sbGFwc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZCk6IERlbGV0ZWQuCisKIDIwMjAtMDEtMTcg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE9w dGltaXplIExpbmVCdWlsZGVyOjphcHBlbmRUZXh0Q29udGVudCBmb3IgdGhlIG1vc3QgY29tbW9u IGlubGluZSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJr cy5jcHAKaW5kZXggMDg5Njk3MjU5ODhlODhiOTc0NmQ2OGI2NmYzZjkwZGRiYTg5ZTQyNC4uMDU0 YjVkYzRkZWYyMjAzZjFlZjljMGIyYTAzNmM5MzMyMmZhZWJlZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNDcsMTMgKzQ3LDE1IEBAIGJvb2wg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2NlbnROZWVkc0NvbGxhcHNp bmcoY29uc3QgTGluZUJ1aWxkCiAgICAgICAgIGlmIChydW4uaXNDb250YWluZXJFbmQoKSB8fCBs YXlvdXRCb3guc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCkgIT0gVmVydGljYWxBbGlnbjo6QmFzZWxp bmUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAocnVuLmlzTGluZUJyZWFr KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkp IHsKICAgICAgICAgICAgIGlmICghcnVuLmlzQ29sbGFwc2VkVG9WaXN1YWxseUVtcHR5KCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIH0KKworICAgICAgICBpZiAocnVuLmlzTGluZUJyZWFrKCkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKICAgICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKICAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZv ckJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgaWYgKGJveEdlb21ldHJ5Lmhvcml6b250YWxC b3JkZXIoKSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRy eS5ob3Jpem9udGFsUGFkZGluZygpLnZhbHVlKCkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmlu ZGV4IDdhYmY0MjYwODRjNzY4YzM3MDAzOTcxMDdhMDg2NjhiNDFkYjg4YjcuLjQ3OGY0ODRlMTIy ODc2YTBmYzk0YTkxZWVlOWViZmI2MTE5YjBlOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAK QEAgLTY5LDcgKzY5LDcgQEAgcHVibGljOgogICAgIENvbnRpbnVvdXNDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SdW4mLCBib29sIHRleHRJc0FsaWduSnVzdGlmeSk7CiAKICAgICBib29sIGlzRWxp Z2libGUoY29uc3QgSW5saW5lSXRlbVJ1biYpIGNvbnN0OwotICAgIHZvaWQgYXBwZW5kKGNvbnN0 IElubGluZUl0ZW1SdW4mKTsKKyAgICB2b2lkIGV4cGFuZChjb25zdCBJbmxpbmVJdGVtUnVuJik7 CiAgICAgTGluZUJ1aWxkZXI6OlJ1biBjbG9zZSgpOwogCiAgICAgc3RhdGljIGJvb2wgY2FuSW5s aW5lSXRlbVJ1bkJlRXhwYW5kZWQoY29uc3QgSW5saW5lSXRlbVJ1biYgcnVuKSB7IHJldHVybiBy dW4uaXNUZXh0KCkgJiYgIXJ1bi5pc0NvbGxhcHNlZCgpICYmICFydW4uaXNDb2xsYXBzZWRUb1pl cm9BZHZhbmNlV2lkdGgoKTsgfQpAQCAtOTYsMTggKzk2LDE4IEBAIGJvb2wgTGluZUJ1aWxkZXI6 OkNvbnRpbnVvdXNDb250ZW50Ojppc0VsaWdpYmxlKGNvbnN0IElubGluZUl0ZW1SdW4mIGlubGlu ZUl0ZW1SCiB7CiAgICAgaWYgKCFtX3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCkKICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIC8vIE9ubHkgbm9uLWNvbGxhcHNlZCB0ZXh0IHJ1bnMgd2l0aCB0 aGUgc2FtZSBsYXlvdXQgYm94IGNhbiBiZSBhZGRlZCBhcyBjb250aW51b3VzIGNvbnRlbnQuCi0g ICAgcmV0dXJuIGlubGluZUl0ZW1SdW4uaXNUZXh0KCkgJiYgIWlubGluZUl0ZW1SdW4uaXNDb2xs YXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSAmJiAmbV9pbml0aWFsSW5saW5lUnVuLmxheW91dEJv eCgpID09ICZpbmxpbmVJdGVtUnVuLmxheW91dEJveCgpOworICAgIHJldHVybiBpbmxpbmVJdGVt UnVuLmlzVGV4dCgpICYmICZtX2luaXRpYWxJbmxpbmVSdW4ubGF5b3V0Qm94KCkgPT0gJmlubGlu ZUl0ZW1SdW4ubGF5b3V0Qm94KCk7CiB9CiAKLXZvaWQgTGluZUJ1aWxkZXI6OkNvbnRpbnVvdXND b250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lSXRlbVJ1biYgaW5saW5lSXRlbVJ1bikKK3ZvaWQg TGluZUJ1aWxkZXI6OkNvbnRpbnVvdXNDb250ZW50OjpleHBhbmQoY29uc3QgSW5saW5lSXRlbVJ1 biYgaW5saW5lSXRlbVJ1bikKIHsKICAgICAvLyBNZXJnZWQgY29udGVudCBuZWVkcyB0byBiZSBj b250aW51b3VzLgogICAgIEFTU0VSVChpc0VsaWdpYmxlKGlubGluZUl0ZW1SdW4pKTsKICAgICBt X3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCA9IGNhbklubGluZUl0ZW1SdW5CZUV4cGFuZGVkKGlu bGluZUl0ZW1SdW4pOwogCiAgICAgQVNTRVJUKGlubGluZUl0ZW1SdW4uaXNUZXh0KCkpOwotICAg IG1fZXhwYW5kZWRMZW5ndGggKz0gaW5saW5lSXRlbVJ1bi50ZXh0Q29udGV4dCgpLT5sZW5ndGgo KTsKKyAgICBpZiAoIWlubGluZUl0ZW1SdW4uaXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgo KSkKKyAgICAgICAgbV9leHBhbmRlZExlbmd0aCArPSBpbmxpbmVJdGVtUnVuLnRleHRDb250ZXh0 KCktPmxlbmd0aCgpOwogICAgIG1fZXhwYW5kZWRXaWR0aCArPSBpbmxpbmVJdGVtUnVuLmxvZ2lj YWxXaWR0aCgpOwogCiAgICAgaWYgKG1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXMpIHsK QEAgLTIzOCw4ICsyMzgsNyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xv c2UoSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQogICAgIHZpc3VhbGx5 Q29sbGFwc2VQcmVXcmFwT3ZlcmZsb3dDb250ZW50KCk7CiAgICAgYXV0byBoYW5naW5nQ29udGVu dCA9IGNvbGxlY3RIYW5naW5nQ29udGVudChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwog Ci0gICAgYXV0byBtZXJnZWRJbmxpbmVJdGVtUnVucyA9IFsmXSB7Ci0gICAgICAgIFJ1bkxpc3Qg cnVuTGlzdDsKKyAgICBhdXRvIG1lcmdlZElubGluZUl0ZW1SdW5zID0gWyZdIChhdXRvJiBydW5M aXN0KSB7CiAgICAgICAgIHVuc2lnbmVkIHJ1bkluZGV4ID0gMDsKICAgICAgICAgd2hpbGUgKHJ1 bkluZGV4IDwgbV9pbmxpbmVJdGVtUnVucy5zaXplKCkpIHsKICAgICAgICAgICAgIC8vIE1lcmdl IGVsaWdpYmxlIHJ1bnMuCkBAIC0yNTEsMTMgKzI1MCwxMyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlz dCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExp bmVXaQogICAgICAgICAgICAgfQogICAgICAgICAgICAgYXV0byBtZXJnZWRSdW5zID0gQ29udGlu dW91c0NvbnRlbnQgeyBpbmxpbmVJdGVtUnVuLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9OwogICAg ICAgICAgICAgZm9yIChydW5JbmRleCA9IHJ1bkluZGV4ICsgMTsgcnVuSW5kZXggPCBtX2lubGlu ZUl0ZW1SdW5zLnNpemUoKSAmJiBtZXJnZWRSdW5zLmlzRWxpZ2libGUobV9pbmxpbmVJdGVtUnVu c1tydW5JbmRleF0pOyArK3J1bkluZGV4KQotICAgICAgICAgICAgICAgIG1lcmdlZFJ1bnMuYXBw ZW5kKG1faW5saW5lSXRlbVJ1bnNbcnVuSW5kZXhdKTsKKyAgICAgICAgICAgICAgICBtZXJnZWRS dW5zLmV4cGFuZChtX2lubGluZUl0ZW1SdW5zW3J1bkluZGV4XSk7CiAgICAgICAgICAgICBydW5M aXN0LmFwcGVuZChtZXJnZWRSdW5zLmNsb3NlKCkpOwogICAgICAgICB9Ci0gICAgICAgIHJldHVy biBydW5MaXN0OwogICAgIH07CiAKLSAgICBhdXRvIHJ1bkxpc3QgPSBtZXJnZWRJbmxpbmVJdGVt UnVucygpOworICAgIFJ1bkxpc3QgcnVuTGlzdDsKKyAgICBtZXJnZWRJbmxpbmVJdGVtUnVucyhy dW5MaXN0KTsKICAgICBpZiAoIW1faXNJbnRyaW5zaWNTaXppbmcpIHsKICAgICAgICAgZm9yIChh dXRvJiBydW4gOiBydW5MaXN0KSB7CiAgICAgICAgICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVI ZWlnaHQocnVuKTsKQEAgLTM0Niw3ICszNDUsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphbGlnbkNv bnRlbnRWZXJ0aWNhbGx5KFJ1bkxpc3QmIHJ1bkxpc3QpCiAKICAgICAgICAgc3dpdGNoICh2ZXJ0 aWNhbEFsaWduKSB7CiAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6Ci0gICAg ICAgICAgICBpZiAocnVuLmlzTGluZUJyZWFrKCkgfHwgcnVuLmlzVGV4dCgpKQorICAgICAgICAg ICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkKICAgICAgICAgICAgICAg ICBsb2dpY2FsVG9wID0gYmFzZWxpbmVPZmZzZXQoKSAtIGFzY2VudDsKICAgICAgICAgICAgIGVs c2UgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvJiBi b3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94 KTsKQEAgLTc5MSw3ICs3OTAsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphZGp1c3RCYXNlbGluZUFu ZExpbmVIZWlnaHQoY29uc3QgUnVuJiBydW4pCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9 CiAKLUlubGluZUxheW91dFVuaXQgTGluZUJ1aWxkZXI6OnJ1bkNvbnRlbnRIZWlnaHQoY29uc3Qg UnVuJiBydW4pIGNvbnN0CitpbmxpbmUgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6cnVu Q29udGVudEhlaWdodChjb25zdCBSdW4mIHJ1bikgY29uc3QKIHsKICAgICBBU1NFUlQoIW1faXNJ bnRyaW5zaWNTaXppbmcpOwogICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gcnVuLnN0eWxlKCkuZm9u dE1ldHJpY3MoKTsKQEAgLTkwMSwxNCArOTAwLDEwIEBAIElubGluZUxheW91dFVuaXQgTGluZUJ1 aWxkZXI6OkNvbGxhcHNpYmxlQ29udGVudDo6Y29sbGFwc2UoKQogICAgIGZvciAoYXV0byBpbmRl eCA9ICptX2ZpcnN0UnVuSW5kZXg7IGluZGV4IDwgbV9pbmxpbmVpdGVtUnVuTGlzdC5zaXplKCk7 ICsraW5kZXgpIHsKICAgICAgICAgYXV0byYgcnVuID0gbV9pbmxpbmVpdGVtUnVuTGlzdFtpbmRl eF07CiAgICAgICAgIHJ1bi5tb3ZlSG9yaXpvbnRhbGx5KC1hY2N1bXVsYXRlZENvbGxhcHNlZFdp ZHRoKTsKLSAgICAgICAgaWYgKCFydW4uaXNUZXh0KCkpIHsKLSAgICAgICAgICAgIEFTU0VSVChy dW4uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRhaW5lckVuZCgpIHx8IHJ1bi5pc0xp bmVCcmVhaygpKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CiAgICAgICAgIGlm IChydW4uaXNXaGl0ZXNwYWNlKCkpIHsKICAgICAgICAgICAgIGFjY3VtdWxhdGVkQ29sbGFwc2Vk V2lkdGggKz0gcnVuLmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICAgICAgcnVuLnNldENvbGxhcHNl c1RvWmVyb0FkdmFuY2VXaWR0aCgpOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2Ug aWYgKHJ1bi5pc1RleHQoKSkgewogICAgICAgICAgICAgQVNTRVJUKCFoYXNTZWVuTm9uV2hpdGVz cGFjZVRleHRDb250ZW50KTsKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgICAgICAgICAgaGFzU2Vl bk5vbldoaXRlc3BhY2VUZXh0Q29udGVudCA9IHRydWU7CkBAIC05MTgsNiArOTEzLDcgQEAgSW5s aW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6Q29sbGFwc2libGVDb250ZW50Ojpjb2xsYXBzZSgp CiAgICAgICAgICAgICBhY2N1bXVsYXRlZENvbGxhcHNlZFdpZHRoICs9IHJ1bi50cmFpbGluZ0xl dHRlclNwYWNpbmcoKTsKICAgICAgICAgICAgIHJ1bi5yZW1vdmVUcmFpbGluZ0xldHRlclNwYWNp bmcoKTsKICAgICAgICAgfQorICAgICAgICBBU1NFUlQocnVuLmlzQ29udGFpbmVyU3RhcnQoKSB8 fCBydW4uaXNDb250YWluZXJFbmQoKSB8fCBydW4uaXNMaW5lQnJlYWsoKSk7CiAgICAgfQogICAg IEFTU0VSVChhY2N1bXVsYXRlZENvbGxhcHNlZFdpZHRoID09IHdpZHRoKCkpOwogICAgIHJlc2V0 KCk7Cg==