203715 2019-10-31 19:28:54 -0700 [LFC][IFC] Add support for text-align: justify 2019-11-01 08:35:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1586215 0 zalan 2019-10-31 19:28:54 -0700 ssia 1586216 1 webkit-bug-importer 2019-10-31 19:29:17 -0700 <rdar://problem/56804607> 1586221 2 382541 zalan 2019-10-31 19:45:30 -0700 Created attachment 382541 Patch 1586367 3 382541 commit-queue 2019-11-01 08:35:50 -0700 Comment on attachment 382541 Patch Clearing flags on attachment: 382541 Committed r251917: <https://trac.webkit.org/changeset/251917> 1586368 4 commit-queue 2019-11-01 08:35:51 -0700 All reviewed patches have been landed. Closing bug. 382541 2019-10-31 19:45:30 -0700 2019-11-01 08:35:50 -0700 Patch bug-203715-20191031194529.patch text/plain 14697 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGZiMDU4MjI0YjNkY2I0 MGUzYjgwMjUyZTc4NmZiZDAyYjExYThkNC4uNGIyMWMxYjUwMDJkOGQ1Yzg4ZjE1MmRkNjY0YjUz OWQ3OWQ0MmI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE5LTEwLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgdGV4dC1hbGlnbjoganVzdGlmeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNzE1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Njgw NDYwNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgYmFzaWMgc3VwcG9ydCBmb3IgdGV4dC1hbGlnbjoganVzdGlmeS4gUmVnaXN0ZXIgZXhwYW5z aW9uIG9wcG9ydHVuaXRpZXMgYXMgdGhlIHRleHQgY29udGVudCBpcyBiZWluZworICAgICAgICBh cHBlbmRlZCB0byB0aGUgbGluZSAoTGluZTo6YXBwZW5kVGV4dENvbnRlbnQpIGFuZCBkaXN0cmli dXRlIHRoZSBleHRyYSBzcGFjZSB3aGVuIHRoZSBsaW5lIGlzIGJlaW5nIGNsb3NlZCAoTGluZTo6 Y2xvc2UpLgorICAgICAgICBOb3cgTEZDIHJlbmRlcmluZyBvZiBPcGVuU291cmNlL1BlcmZvcm1h bmNlVGVzdHMvTGF5b3V0L2xpbmUtbGF5b3V0LXNpbXBsZS5odG1sIHZpc3VhbGx5IG1hdGNoZXMg dHJ1bmsgcmVuZGVyaW5nLgorCisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlQ YWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OnBhaW50SW5saW5lQ29udGVu dCk6CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4uaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXk6OlJ1bjo6VGV4dENvbnRleHQ6OnJlc2V0RXhwYW5zaW9uKToKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpleHBhbmQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Omp1 c3RpZnlSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YWxpZ25Db250ZW50 SG9yaXpvbnRhbGx5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4 dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNUZXh0QWxpZ25KdXN0aWZ5IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpzZXRDb2xsYXBzZXNU b1plcm9BZHZhbmNlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46 OmFkanVzdEV4cGFuc2lvbkJlaGF2aW9yKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZTo6UnVuOjpleHBhbmQpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l TGF5b3V0OjpjbG9zZSk6CisKIDIwMTktMTAtMzEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFkZCBleHBhbnNpb24gY29udGV4dCB0byBMaW5l OjpSdW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNw bGF5UGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxh eVBhaW50ZXIuY3BwCmluZGV4IDA2MGIyNzM4ZmRhNTQ2N2EyM2YzMjNiNDkxYjVjNWQ0MDVjM2Zm ODcuLjFkY2FmMzRlN2JjY2UyY2U4YjVhNWRiYzE2MDc4YmJhYzAzOWM3MjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UGFpbnRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlQYWludGVyLmNwcApA QCAtMTI3LDcgKzEyNyw3IEBAIHN0YXRpYyB2b2lkIHBhaW50SW5saW5lQ29udGVudChHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEJveCYgcm9vdEFic29sdXRlCiAgICAgICAgICAgICBh dXRvJiBsaW5lQm94ID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hGb3JSdW4oKnJ1bik7CiAgICAg ICAgICAgICBhdXRvIGJhc2VsaW5lT2Zmc2V0ID0gcm9vdEFic29sdXRlRGlzcGxheUJveC50b3Ao KSArIGxpbmVCb3gubG9naWNhbFRvcCgpICsgbGluZUJveC5iYXNlbGluZU9mZnNldCgpOwogICAg ICAgICAgICAgaWYgKGF1dG8gZXhwYW5zaW9uQ29udGV4dCA9IHRleHRDb250ZXh0LT5leHBhbnNp b24oKSkKLSAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdUZXh0KHN0eWxlLmZvbnRDYXNjYWRl KCksIFRleHRSdW4geyB0ZXh0Q29udGV4dC0+Y29udGVudCgpLCBsb2dpY2FsTGVmdCwgZXhwYW5z aW9uQ29udGV4dC0+aG9yaXp0b250YWxFeHBhbnNpb24sIGV4cGFuc2lvbkNvbnRleHQtPmJlaGF2 aW9yIH0sIHsgbG9naWNhbExlZnQsIGJhc2VsaW5lT2Zmc2V0IH0pOworICAgICAgICAgICAgICAg IGNvbnRleHQuZHJhd1RleHQoc3R5bGUuZm9udENhc2NhZGUoKSwgVGV4dFJ1biB7IHRleHRDb250 ZXh0LT5jb250ZW50KCksIGxvZ2ljYWxMZWZ0LCBleHBhbnNpb25Db250ZXh0LT5ob3Jpem9udGFs RXhwYW5zaW9uLCBleHBhbnNpb25Db250ZXh0LT5iZWhhdmlvciB9LCB7IGxvZ2ljYWxMZWZ0LCBi YXNlbGluZU9mZnNldCB9KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBjb250 ZXh0LmRyYXdUZXh0KHN0eWxlLmZvbnRDYXNjYWRlKCksIFRleHRSdW4geyB0ZXh0Q29udGV4dC0+ Y29udGVudCgpLCBsb2dpY2FsTGVmdCB9LCB7IGxvZ2ljYWxMZWZ0LCBiYXNlbGluZU9mZnNldCB9 KTsKICAgICAgICAgfSBlbHNlIGlmIChhdXRvKiBjYWNoZWRJbWFnZSA9IHJ1bi0+aW1hZ2UoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlS dW4uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UnVuLmgKaW5k ZXggZmRlOWY0MTc3ZGJmZGY4YWJkNzZhZGI1MzA0Nzc4YTVjMTgwYWNiOC4uMWJiYzFiNjkzN2Yy OThlYzY3MWE3Y2E1ZTU0ZGQzZTc2NDdkMDFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oCkBAIC01Myw5ICs1MywxMCBAQCBzdHJ1Y3QgUnVu IHsKIAogICAgICAgICBzdHJ1Y3QgRXhwYW5zaW9uQ29udGV4dCB7CiAgICAgICAgICAgICBFeHBh bnNpb25CZWhhdmlvciBiZWhhdmlvcjsKLSAgICAgICAgICAgIExheW91dFVuaXQgaG9yaXp0b250 YWxFeHBhbnNpb247CisgICAgICAgICAgICBMYXlvdXRVbml0IGhvcml6b250YWxFeHBhbnNpb247 CiAgICAgICAgIH07CiAgICAgICAgIHZvaWQgc2V0RXhwYW5zaW9uKEV4cGFuc2lvbkNvbnRleHQg ZXhwYW5zaW9uQ29udGV4dCkgeyBtX2V4cGFuc2lvbkNvbnRleHQgPSBleHBhbnNpb25Db250ZXh0 OyB9CisgICAgICAgIHZvaWQgcmVzZXRFeHBhbnNpb24oKSB7IG1fZXhwYW5zaW9uQ29udGV4dCA9 IFdURjo6bnVsbG9wdDsgfQogICAgICAgICBPcHRpb25hbDxFeHBhbnNpb25Db250ZXh0PiBleHBh bnNpb24oKSBjb25zdCB7IHJldHVybiBtX2V4cGFuc2lvbkNvbnRleHQ7IH0KIAogICAgICAgICB2 b2lkIGV4cGFuZChjb25zdCBUZXh0Q29udGV4dCYgb3RoZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCBmOThm NjhlNzk5MGI0OTc0NzRmNGZiYjk5ODU2ZmQ5NTRjODA5MmY1Li5kZDNiOGFlMTZiM2VmNWNiNGU3 NjBmODY5NjFkYmJhYjRkZjkyNGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtNDYsNiArNDYsMzUgQEAgTGlu ZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgRGlzcGxheTo6 UnVuJiBkaXNwbGF5UnVuKQogewogfQogCit2b2lkIExpbmU6OlJ1bjo6ZXhwYW5kKGNvbnN0IFJ1 biYgb3RoZXIpCit7CisgICAgQVNTRVJUKGlzVGV4dCgpKTsKKyAgICBBU1NFUlQob3RoZXIuaXNU ZXh0KCkpOworICAgIEFTU0VSVCghaXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSk7Cisg ICAgQVNTRVJUKCFoYXNUcmFpbGluZ0NvbGxhcHNlZENvbnRlbnQoKSk7CisKKyAgICBhdXRvJiBv dGhlckRpc3BsYXlSdW4gPSBvdGhlci5kaXNwbGF5UnVuKCk7CisgICAgbV9kaXNwbGF5UnVuLmV4 cGFuZEhvcml6b250YWxseShvdGhlckRpc3BsYXlSdW4ubG9naWNhbFdpZHRoKCkpOworICAgIG1f ZGlzcGxheVJ1bi50ZXh0Q29udGV4dCgpLT5leHBhbmQoKm90aGVyRGlzcGxheVJ1bi50ZXh0Q29u dGV4dCgpKTsKKyAgICBtX2hhc1RyYWlsaW5nQ29sbGFwc2VkQ29udGVudCA9IG90aGVyLmlzQ29s bGFwc2VkKCk7CisgICAgbV9pc1doaXRlc3BhY2UgJj0gb3RoZXIuaXNXaGl0ZXNwYWNlKCk7Cisg ICAgbV9pc0NvbGxhcHNpYmxlID0gZmFsc2U7CisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBhIHZl cnkgc2ltcGxlIGV4cGFuc2lvbiBtZXJnZS4gV2Ugc2hvdWxkIGV2ZW50dWFsbHkgc3dpdGNoIG92 ZXIgdG8gRm9udENhc2NhZGU6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQuIAorICAgIGlmICho YXNFeHBhbnNpb25PcHBvcnR1bml0eSgpICYmIG90aGVyLmhhc0V4cGFuc2lvbk9wcG9ydHVuaXR5 KCkpIHsKKyAgICAgICAgLy8gUnVuIGlzIGV4cGFuZGVkIHdpdGggYSB3aGl0ZXNwYWNlIGNvbnRl bnQuCisgICAgICAgIGFkanVzdEV4cGFuc2lvbkJlaGF2aW9yKEZvcmJpZExlYWRpbmdFeHBhbnNp b24gfCBBbGxvd1RyYWlsaW5nRXhwYW5zaW9uKTsKKyAgICAgICAgbV9leHBhbnNpb25PcHBvcnR1 bml0eUNvdW50ID0gKm1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCArICpvdGhlci5leHBhbnNp b25PcHBvcnR1bml0eUNvdW50KCk7CisgICAgfSBlbHNlIGlmICghaGFzRXhwYW5zaW9uT3Bwb3J0 dW5pdHkoKSAmJiBvdGhlci5oYXNFeHBhbnNpb25PcHBvcnR1bml0eSgpKSB7CisgICAgICAgIC8v IE5vbndoaXRlc3BhY2UgcnVucyBpcyBleHBhbmRlZCB3aXRoIHdoaXRlc3BhY2UuCisgICAgICAg IHNldEhhc0V4cGFuc2lvbk9wcG9ydHVuaXR5KEZvcmJpZExlYWRpbmdFeHBhbnNpb24gfCBBbGxv d1RyYWlsaW5nRXhwYW5zaW9uKTsKKyAgICAgICAgbV9leHBhbnNpb25PcHBvcnR1bml0eUNvdW50 ID0gb3RoZXIuZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpOworICAgIH0gZWxzZSBpZiAoaGFz RXhwYW5zaW9uT3Bwb3J0dW5pdHkoKSAmJiAhb3RoZXIuaGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHko KSkgeworICAgICAgICAvLyBSdW4gaXMgZXhwYW5kZWQgd2l0aCBhIG5vbndoaXRlc3BhY2UgY29u dGVudC4KKyAgICAgICAgYWRqdXN0RXhwYW5zaW9uQmVoYXZpb3IoQWxsb3dMZWFkaW5nRXhwYW5z aW9uIHwgQWxsb3dUcmFpbGluZ0V4cGFuc2lvbik7CisgICAgfQorfQorCiBMaW5lOjpMaW5lKGNv bnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgY29u c3QgSW5pdGlhbENvbnN0cmFpbnRzJiBpbml0aWFsQ29uc3RyYWludHMsIE9wdGlvbmFsPFRleHRB bGlnbk1vZGU+IGhvcml6b250YWxBbGlnbm1lbnQsIFNraXBBbGlnbm1lbnQgc2tpcEFsaWdubWVu dCkKICAgICA6IG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGluZ0NvbnRl eHQpCiAgICAgLCBtX2luaXRpYWxTdHJ1dChpbml0aWFsQ29uc3RyYWludHMuaGVpZ2h0QW5kQmFz ZWxpbmUgPyBpbml0aWFsQ29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUtPnN0cnV0IDogV1RG OjpudWxsb3B0KQpAQCAtMTEyLDcgKzE0MSw3IEBAIGJvb2wgTGluZTo6aXNWaXN1YWxseUVtcHR5 KCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotTGluZTo6UnVuTGlzdCBMaW5lOjpjbG9z ZSgpCitMaW5lOjpSdW5MaXN0IExpbmU6OmNsb3NlKElzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu dCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpCiB7CiAgICAgcmVtb3ZlVHJhaWxpbmdUcmlt bWFibGVDb250ZW50KCk7CiAgICAgLy8gSm9pbiB0ZXh0IHJ1bnMgdG9nZXRoZXIgd2hlbiBwb3Nz aWJsZS4KQEAgLTE0NSw3ICsxNzQsNyBAQCBMaW5lOjpSdW5MaXN0IExpbmU6OmNsb3NlKCkKIAog ICAgIGlmICghbV9za2lwQWxpZ25tZW50KSB7CiAgICAgICAgIGFsaWduQ29udGVudFZlcnRpY2Fs bHkoKTsKLSAgICAgICAgYWxpZ25Db250ZW50SG9yaXpvbnRhbGx5KCk7CisgICAgICAgIGFsaWdu Q29udGVudEhvcml6b250YWxseShpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwogICAgIH0K IAogICAgIHJldHVybiBXVEZNb3ZlKG1fcnVuTGlzdCk7CkBAIC0yMjMsOSArMjUyLDUyIEBAIHZv aWQgTGluZTo6YWxpZ25Db250ZW50VmVydGljYWxseSgpCiAgICAgfQogfQogCi12b2lkIExpbmU6 OmFsaWduQ29udGVudEhvcml6b250YWxseSgpCit2b2lkIExpbmU6Omp1c3RpZnlSdW5zKCkKK3sK KyAgICBBU1NFUlQoIW1fcnVuTGlzdC5pc0VtcHR5KCkpOworICAgIEFTU0VSVChhdmFpbGFibGVX aWR0aCgpID4gMCk7CisgICAgLy8gTmVlZCB0byBmaXggdXAgdGhlIGxhc3QgcnVuIGZpcnN0Lgor ICAgIGF1dG8mIGxhc3RSdW4gPSBtX3J1bkxpc3QubGFzdCgpOworICAgIGlmIChsYXN0UnVuLT5o YXNFeHBhbnNpb25PcHBvcnR1bml0eSgpKQorICAgICAgICBsYXN0UnVuLT5hZGp1c3RFeHBhbnNp b25CZWhhdmlvcigqbGFzdFJ1bi0+ZXhwYW5zaW9uQmVoYXZpb3IoKSB8IEZvcmJpZFRyYWlsaW5n RXhwYW5zaW9uKTsKKyAgICAvLyBDb2xsZWN0IHRoZSBleHBhbnNpb24gb3Bwb3J0dW5pdHkgbnVt YmVycy4KKyAgICBhdXRvIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgPSAwOworICAgIGZvciAo YXV0byYgcnVuIDogbV9ydW5MaXN0KSB7CisgICAgICAgIGlmICghcnVuLT5oYXNFeHBhbnNpb25P cHBvcnR1bml0eSgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGV4cGFuc2lvbk9w cG9ydHVuaXR5Q291bnQgKz0gKnJ1bi0+ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpOworICAg IH0KKyAgICAvLyBOb3RoaW5nIHRvIGRpc3RyaWJ1dGU/CisgICAgaWYgKCFleHBhbnNpb25PcHBv cnR1bml0eUNvdW50KQorICAgICAgICByZXR1cm47CisgICAgLy8gRGlzdHJpYnV0ZSB0aGUgZXh0 cmEgc3BhY2UuCisgICAgYXV0byBleHBhbnNpb25Ub0Rpc3RyaWJ1dGUgPSBhdmFpbGFibGVXaWR0 aCgpIC8gZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudDsKKyAgICBMYXlvdXRVbml0IGFjY3VtdWxh dGVkRXhwYW5zaW9uOworICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5MaXN0KSB7CisgICAgICAg IC8vIEV4cGFuZCBhbmQgbW92ZXMgcnVucyBieSB0aGUgYWNjdW11bGF0ZWQgZXhwYW5zaW9uLgor ICAgICAgICBpZiAoIXJ1bi0+aGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHkoKSkgeworICAgICAgICAg ICAgcnVuLT5tb3ZlSG9yaXpvbnRhbGx5KGFjY3VtdWxhdGVkRXhwYW5zaW9uKTsKKyAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGF1dG8gY29tcHV0ZWRFeHBhbnNpb24g PSBleHBhbnNpb25Ub0Rpc3RyaWJ1dGUgKiAqcnVuLT5leHBhbnNpb25PcHBvcnR1bml0eUNvdW50 KCk7CisgICAgICAgIHJ1bi0+c2V0Q29tcHV0ZWRIb3Jpem9udGFsRXhwYW5zaW9uKGNvbXB1dGVk RXhwYW5zaW9uKTsKKyAgICAgICAgcnVuLT5tb3ZlSG9yaXpvbnRhbGx5KGFjY3VtdWxhdGVkRXhw YW5zaW9uKTsKKyAgICAgICAgYWNjdW11bGF0ZWRFeHBhbnNpb24gKz0gY29tcHV0ZWRFeHBhbnNp b247CisgICAgfQorfQorCit2b2lkIExpbmU6OmFsaWduQ29udGVudEhvcml6b250YWxseShJc0xh c3RMaW5lV2l0aElubGluZUNvbnRlbnQgbGFzdExpbmUpCiB7CiAgICAgQVNTRVJUKCFtX3NraXBB bGlnbm1lbnQpOworICAgIGlmIChtX3J1bkxpc3QuaXNFbXB0eSgpIHx8IGF2YWlsYWJsZVdpZHRo KCkgPD0gMCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGlzVGV4dEFsaWduSnVzdGlmeSgp KSB7CisgICAgICAgIC8vIERvIG5vdCBqdXN0aWZ5IGFsaWduIHRoZSBsYXN0IGxpbmUuCisgICAg ICAgIGlmIChsYXN0TGluZSA9PSBJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQ6Ok5vKQorICAg ICAgICAgICAganVzdGlmeVJ1bnMoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIGF1 dG8gYWRqdXN0bWVudEZvckFsaWdubWVudCA9IFsmXSgpIC0+IE9wdGlvbmFsPExheW91dFVuaXQ+ IHsKICAgICAgICAgc3dpdGNoICgqbV9ob3Jpem9udGFsQWxpZ25tZW50KSB7CkBAIC0zODIsNiAr NDU0LDEyIEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhCiAgICAgYXV0byB0ZXh0Q29udGVudCA9 IGlubGluZUl0ZW0ubGF5b3V0Qm94KCkudGV4dENvbnRlbnQoKS5zdWJzdHJpbmcoY29udGVudFN0 YXJ0LCBjb250ZW50TGVuZ3RoKTsKICAgICBhdXRvIGxpbmVSdW4gPSBtYWtlVW5pcXVlPFJ1bj4o aW5saW5lSXRlbSwgRGlzcGxheTo6UnVuIHsgaW5saW5lSXRlbS5zdHlsZSgpLCBsb2dpY2FsUmVj dCwgRGlzcGxheTo6UnVuOjpUZXh0Q29udGV4dCB7IGNvbnRlbnRTdGFydCwgY29udGVudExlbmd0 aCwgdGV4dENvbnRlbnQgfSB9KTsKIAorICAgIGlmIChpc1RleHRBbGlnbkp1c3RpZnkoKSkgewor ICAgICAgICAvLyBSZWdpc3RlciBleHBhbnNpb24gb3Bwb3J0dW5pdHkgZm9yIHdoaXRlc3BhY2Ug cnVucy4KKyAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNXaGl0ZXNwYWNlKCkpCisgICAgICAgICAg ICBsaW5lUnVuLT5zZXRIYXNFeHBhbnNpb25PcHBvcnR1bml0eShEZWZhdWx0RXhwYW5zaW9uKTsK KyAgICB9CisKICAgICBhdXRvIGNvbGxhcHNlc1RvWmVyb0FkdmFuY2VXaWR0aCA9IHdpbGxDb2xs YXBzZUNvbXBsZXRlbHkoKTsKICAgICBpZiAoY29sbGFwc2VzVG9aZXJvQWR2YW5jZVdpZHRoKQog ICAgICAgICBsaW5lUnVuLT5zZXRDb2xsYXBzZXNUb1plcm9BZHZhbmNlV2lkdGgoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApp bmRleCBkNTY3NThhNjgxZmY0MmM0ZDIzNzdkYzQwMzZlZjRkYjAxZjUyMGEzLi4xZTllYjg2MjUz Nzg5ODQ3MDIzNDMyNWQwNDk2MzJlOWY4ZTMwM2FhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC05Nyw2ICs5Nyw3IEBA IHB1YmxpYzoKICAgICAgICAgYm9vbCBoYXNFeHBhbnNpb25PcHBvcnR1bml0eSgpIGNvbnN0IHsg cmV0dXJuIG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudC5oYXNWYWx1ZSgpOyB9CiAgICAgICAg IE9wdGlvbmFsPEV4cGFuc2lvbkJlaGF2aW9yPiBleHBhbnNpb25CZWhhdmlvcigpIGNvbnN0Owog ICAgICAgICBPcHRpb25hbDx1bnNpZ25lZD4gZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudDsgfQorICAgICAgICB2b2lk IGFkanVzdEV4cGFuc2lvbkJlaGF2aW9yKEV4cGFuc2lvbkJlaGF2aW9yKTsKICAgICAgICAgdm9p ZCBzZXRDb21wdXRlZEhvcml6b250YWxFeHBhbnNpb24oTGF5b3V0VW5pdCBsb2dpY2FsRXhwYW5z aW9uKTsKIAogICAgICAgICBib29sIGlzQ29sbGFwc2libGUoKSBjb25zdCB7IHJldHVybiBtX2lz Q29sbGFwc2libGU7IH0KQEAgLTExNCw3ICsxMTUsOCBAQCBwdWJsaWM6CiAgICAgICAgIE9wdGlv bmFsPHVuc2lnbmVkPiBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQ7CiAgICAgfTsKICAgICB1 c2luZyBSdW5MaXN0ID0gVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxSdW4+PjsKLSAgICBSdW5MaXN0 IGNsb3NlKCk7CisgICAgZW51bSBjbGFzcyBJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgeyBO bywgWWVzIH07CisgICAgUnVuTGlzdCBjbG9zZShJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQg PSBJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQ6Ok5vKTsKIAogICAgIHN0YXRpYyBMaW5lQm94 OjpCYXNlbGluZSBoYWxmTGVhZGluZ01ldHJpY3MoY29uc3QgRm9udE1ldHJpY3MmLCBMYXlvdXRV bml0IGxpbmVMb2dpY2FsSGVpZ2h0KTsKIApAQCAtMTQxLDEzICsxNDMsMTYgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGFwcGVuZExpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJik7CiAKICAgICB2b2lk IHJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpOwotICAgIHZvaWQgYWxpZ25Db250ZW50 SG9yaXpvbnRhbGx5KCk7CisgICAgdm9pZCBhbGlnbkNvbnRlbnRIb3Jpem9udGFsbHkoSXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50KTsKICAgICB2b2lkIGFsaWduQ29udGVudFZlcnRpY2FsbHko KTsKIAogICAgIHZvaWQgYWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IElubGluZUl0 ZW0mKTsKICAgICBMYXlvdXRVbml0IGlubGluZUl0ZW1Db250ZW50SGVpZ2h0KGNvbnN0IElubGlu ZUl0ZW0mKSBjb25zdDsKICAgICBib29sIGlzVmlzdWFsbHlFbXB0eSgpIGNvbnN0OwogCisgICAg Ym9vbCBpc1RleHRBbGlnbkp1c3RpZnkoKSBjb25zdCB7IHJldHVybiBtX2hvcml6b250YWxBbGln bm1lbnQgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeTsgfTsKKyAgICB2b2lkIGp1c3RpZnlSdW5z KCk7CisKICAgICBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25zdDsKICAgICBjb25zdCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdDsgCiAKQEAg LTE2MiwyMSArMTY3LDYgQEAgcHJpdmF0ZToKICAgICBMaW5lQm94IG1fbGluZUJveDsKIH07CiAK LWlubGluZSB2b2lkIExpbmU6OlJ1bjo6ZXhwYW5kKGNvbnN0IFJ1biYgb3RoZXIpCi17Ci0gICAg QVNTRVJUKGlzVGV4dCgpKTsKLSAgICBBU1NFUlQob3RoZXIuaXNUZXh0KCkpOwotICAgIEFTU0VS VCghaXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSk7Ci0gICAgQVNTRVJUKCFoYXNUcmFp bGluZ0NvbGxhcHNlZENvbnRlbnQoKSk7Ci0KLSAgICBhdXRvJiBvdGhlckRpc3BsYXlSdW4gPSBv dGhlci5kaXNwbGF5UnVuKCk7Ci0gICAgbV9kaXNwbGF5UnVuLmV4cGFuZEhvcml6b250YWxseShv dGhlckRpc3BsYXlSdW4ubG9naWNhbFdpZHRoKCkpOwotICAgIG1fZGlzcGxheVJ1bi50ZXh0Q29u dGV4dCgpLT5leHBhbmQoKm90aGVyRGlzcGxheVJ1bi50ZXh0Q29udGV4dCgpKTsKLSAgICBtX2hh c1RyYWlsaW5nQ29sbGFwc2VkQ29udGVudCA9IG90aGVyLmlzQ29sbGFwc2VkKCk7Ci0gICAgbV9p c1doaXRlc3BhY2UgJj0gb3RoZXIuaXNXaGl0ZXNwYWNlKCk7Ci0gICAgbV9pc0NvbGxhcHNpYmxl ID0gZmFsc2U7Ci19Ci0KIGlubGluZSB2b2lkIExpbmU6OlJ1bjo6c2V0SXNDb2xsYXBzZWQoKQog ewogICAgIEFTU0VSVChpc1doaXRlc3BhY2UoKSk7CkBAIC0xOTUsNiArMTg1LDggQEAgaW5saW5l IHZvaWQgTGluZTo6UnVuOjpzZXRDb2xsYXBzZXNUb1plcm9BZHZhbmNlV2lkdGgoKQogICAgIHNl dElzQ29sbGFwc2VkKCk7CiAgICAgbV9jb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGggPSB0cnVl OwogICAgIG1fZGlzcGxheVJ1bi5zZXRMb2dpY2FsV2lkdGgoeyB9KTsKKyAgICBtX2V4cGFuc2lv bk9wcG9ydHVuaXR5Q291bnQgPSB7IH07CisgICAgbV9kaXNwbGF5UnVuLnRleHRDb250ZXh0KCkt PnJlc2V0RXhwYW5zaW9uKCk7CiB9CiAKIGlubGluZSBPcHRpb25hbDxFeHBhbnNpb25CZWhhdmlv cj4gTGluZTo6UnVuOjpleHBhbnNpb25CZWhhdmlvcigpIGNvbnN0CkBAIC0yMTMsNiArMjA1LDEz IEBAIGlubGluZSB2b2lkIExpbmU6OlJ1bjo6c2V0SGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHkoRXhw YW5zaW9uQmVoYXZpb3IgZXhwYW5zaW9uQmVoCiAgICAgbV9kaXNwbGF5UnVuLnRleHRDb250ZXh0 KCktPnNldEV4cGFuc2lvbih7IGV4cGFuc2lvbkJlaGF2aW9yLCB7IH0gfSk7CiB9CiAKK2lubGlu ZSB2b2lkIExpbmU6OlJ1bjo6YWRqdXN0RXhwYW5zaW9uQmVoYXZpb3IoRXhwYW5zaW9uQmVoYXZp b3IgZXhwYW5zaW9uQmVoYXZpb3IpCit7CisgICAgQVNTRVJUKGlzVGV4dCgpKTsKKyAgICBBU1NF UlQoaGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHkoKSk7CisgICAgbV9kaXNwbGF5UnVuLnRleHRDb250 ZXh0KCktPnNldEV4cGFuc2lvbih7IGV4cGFuc2lvbkJlaGF2aW9yLCBtX2Rpc3BsYXlSdW4udGV4 dENvbnRleHQoKS0+ZXhwYW5zaW9uKCktPmhvcml6b250YWxFeHBhbnNpb24gfSk7Cit9CisKIGlu bGluZSB2b2lkIExpbmU6OlJ1bjo6c2V0Q29tcHV0ZWRIb3Jpem9udGFsRXhwYW5zaW9uKExheW91 dFVuaXQgbG9naWNhbEV4cGFuc2lvbikKIHsKICAgICBBU1NFUlQoaXNUZXh0KCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxh eW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lTGF5b3V0LmNwcAppbmRleCBiYjM1Yzc5YzA0NjU1NDc0OGFjZTkzNTIyODRlYTBjMmMzOTBj OWJmLi5jN2RkMDQ5ZDA4NmM0MGNkYTlkNTBiM2U1NDc0NjE2OGI1Njk0NzNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lTGF5b3V0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lTGF5b3V0LmNwcApAQCAtMTQzLDcgKzE0MywyMSBAQCBMaW5lTGF5b3V0OjpMaW5lQ29udGVu dCBMaW5lTGF5b3V0OjpjbG9zZSgpCiAgICAgaWYgKG1fb3ZlcmZsb3dUZXh0TGVuZ3RoKQogICAg ICAgICBvdmVyZmxvd0NvbnRlbnQgPSBQYXJ0aWFsQ29udGVudCB7ICptX292ZXJmbG93VGV4dExl bmd0aCB9OwogICAgIGF1dG8gdHJhaWxpbmdJbmxpbmVJdGVtSW5kZXggPSBtX2xpbmVJbnB1dC5s ZWFkaW5nSW5saW5lSXRlbUluZGV4ICsgbV9jb21taXR0ZWRJbmxpbmVJdGVtQ291bnQgLSAxOwot ICAgIHJldHVybiBMaW5lQ29udGVudCB7IHRyYWlsaW5nSW5saW5lSXRlbUluZGV4LCBvdmVyZmxv d0NvbnRlbnQsIFdURk1vdmUobV9mbG9hdHMpLCBtX2xpbmUuY2xvc2UoKSwgbV9saW5lLmxpbmVC b3goKSB9OworCisgICAgYXV0byBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQgPSBbJl0gewor ICAgICAgICBpZiAob3ZlcmZsb3dDb250ZW50KQorICAgICAgICAgICAgcmV0dXJuIExpbmU6Oklz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudDo6Tm87CisgICAgICAgIC8vIFNraXAgZmxvYXRzIGJh Y2t3YXJkcyB0byBzZWUgaWYgdGhpcyBpcyBnb2luZyB0byBiZSB0aGUgbGFzdCBsaW5lIHdpdGgg aW5saW5lIGNvbnRlbnQuCisgICAgICAgIGZvciAoYXV0byBpID0gbV9saW5lSW5wdXQuaW5saW5l SXRlbXMuc2l6ZSgpOyBpLS07KSB7CisgICAgICAgICAgICBpZiAoIW1fbGluZUlucHV0LmlubGlu ZUl0ZW1zW2ldLT5pc0Zsb2F0KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGkgPT0gdHJhaWxp bmdJbmxpbmVJdGVtSW5kZXggPyBMaW5lOjpJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQ6Olll cyA6IExpbmU6OklzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudDo6Tm87CisgICAgICAgIH0KKyAg ICAgICAgLy8gVGhlcmUgaGFzIHRvIGJlIGF0IGxlYXN0IG9uZSBub24tZmxvYXQgaXRlbS4KKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBMaW5lOjpJc0xhc3RM aW5lV2l0aElubGluZUNvbnRlbnQ6Ok5vOworICAgIH07CisKKyAgICByZXR1cm4gTGluZUNvbnRl bnQgeyB0cmFpbGluZ0lubGluZUl0ZW1JbmRleCwgb3ZlcmZsb3dDb250ZW50LCBXVEZNb3ZlKG1f ZmxvYXRzKSwgbV9saW5lLmNsb3NlKGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCgpKSwgbV9s aW5lLmxpbmVCb3goKSB9OwogfQogCiBMaW5lTGF5b3V0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0 OjpwbGFjZUlubGluZUl0ZW0oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkK