216905 2020-09-23 16:17:50 -0700 [LFC][Integration] Line layout logic should consult LayoutState whether remove trailing letter spacing. 2020-09-23 20:16:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1691307 0 zalan 2020-09-23 16:17:50 -0700 ssia 1691358 1 409526 zalan 2020-09-23 19:37:00 -0700 Created attachment 409526 Patch 1691363 2 409527 zalan 2020-09-23 19:50:18 -0700 Created attachment 409527 Patch 1691364 3 zalan 2020-09-23 19:50:50 -0700 Thanks Sam! 1691371 4 ews-feeder 2020-09-23 20:15:06 -0700 Committed r267515: <https://trac.webkit.org/changeset/267515> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409527. 1691372 5 webkit-bug-importer 2020-09-23 20:16:15 -0700 <rdar://problem/69476308> 409526 2020-09-23 19:37:00 -0700 2020-09-23 19:50:17 -0700 Patch bug-216905-20200923193659.patch text/plain 7692 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FjNWRhNjU2Y2NhYWE5 MDZmOTMyMmRhNzdjNTQ0NGJmZTdiMTMyYS4uMWIwZTQyMDFkZTg5ZDAzZWUzODRlZmMwYjE3NTk2 ZGRkZmY5YWFiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IExpbmUgbGF5b3V0IGxvZ2ljIHNob3VsZCBjb25zdWx0IExheW91dFN0YXRlIHdoZXRoZXIgcmVt b3ZlIHRyYWlsaW5nIGxldHRlciBzcGFjaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBwcmVwYXJhdGlvbiBmb3IgY29tcGxldGVseSBt b3ZpbmcgYXdheSBmcm9tIHRoZSBSdW50aW1lRW5hYmxlZEZlYXR1cmVzIGNoZWNrLiAKKworICAg ICAgICAqIGxheW91dC9MYXlvdXRTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxheW91dFN0YXRlOjpzaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9MYXlvdXRTdGF0ZS5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjpMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4dENvbnRl bnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFw cGVuZElubGluZUl0ZW0pOgorCiAyMDIwLTA5LTIzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUgY29sbGFwc2libGUgdHJhaWxpbmcg d2hpdGVzcGFjZSB3aGVuIGl0IGlzIGZvbGxvd2VkIGJ5IGEgaGFyZCBsaW5lIGJyZWFrCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcAppbmRleCA4YzVjNTVjNjYyMDlkNDllZDJhNGZm NzAyOWEzYjAwYmQ3MGI5Mzg4Li5iODMyYWZmYWFjZjExMGNjZWZjNmQ2NjdhZDExOWY0YTM2NTky ZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5jcHAKQEAgLTIzOSw2ICsyMzks MTEgQEAgdm9pZCBMYXlvdXRTdGF0ZTo6c2V0SXNJbnRlZ3JhdGVkUm9vdEJveEZpcnN0Q2hpbGQo Ym9vbCB2YWx1ZSkKICAgICBtX2lzSW50ZWdyYXRlZFJvb3RCb3hGaXJzdENoaWxkID0gdmFsdWUg PyBJc0ludGVncmF0ZWRSb290Qm94Rmlyc3RDaGlsZDo6WWVzIDogSXNJbnRlZ3JhdGVkUm9vdEJv eEZpcnN0Q2hpbGQ6Ok5vOwogfQogCitib29sIExheW91dFN0YXRlOjpzaG91bGRJZ25vcmVUcmFp bGluZ0xldHRlclNwYWNpbmcoKSBjb25zdAoreworICAgIHJldHVybiBSdW50aW1lRW5hYmxlZEZl YXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRp b25FbmFibGVkKCk7Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0xheW91dFN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuaApp bmRleCAxMDQyMmE3MTU2NjAxMDc1MmU3OThlMjYwNWQ1NWJiY2E3MmVlYjQ4Li5kOTAyMjcxYjhk NjFkYTUzOWU2M2JlMjE3OWM5Nzc4Njk4M2JiMmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0 U3RhdGUuaApAQCAtOTIsNiArOTIsNyBAQCBwdWJsaWM6CiAgICAgZW51bSBJc0ludGVncmF0ZWRS b290Qm94Rmlyc3RDaGlsZCB7IFllcywgTm8sIE5vdEFwcGxpY2FibGUgfTsKICAgICBJc0ludGVn cmF0ZWRSb290Qm94Rmlyc3RDaGlsZCBpc0ludGVncmF0ZWRSb290Qm94Rmlyc3RDaGlsZCgpIGNv bnN0IHsgcmV0dXJuIG1faXNJbnRlZ3JhdGVkUm9vdEJveEZpcnN0Q2hpbGQ7IH0KICAgICB2b2lk IHNldElzSW50ZWdyYXRlZFJvb3RCb3hGaXJzdENoaWxkKGJvb2wpOworICAgIGJvb2wgc2hvdWxk SWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nKCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgdm9p ZCBzZXRRdWlya3NNb2RlKFF1aXJrc01vZGUgcXVpcmtzTW9kZSkgeyBtX3F1aXJrc01vZGUgPSBx dWlya3NNb2RlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGMzNWQwNDk0OGIxMGQ4NTdkNDRlYWUyMzE1ODUy NjNiNWZjYzNiYzIuLmYxYjU0MzYyMTFhOTNhYTM1YjkxYjg5NDM2ZmI2YmUzNDA0ZjMyZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuY3BwCkBAIC0zMSw3ICszMSw2IEBACiAjaW5jbHVkZSAiSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaCIKICNpbmNsdWRlICJJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbS5oIgogI2luY2x1ZGUg IkxheW91dEJveEdlb21ldHJ5LmgiCi0jaW5jbHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5o IgogI2luY2x1ZGUgIlRleHRGbGFncy5oIgogI2luY2x1ZGUgIlRleHRVdGlsLmgiCiAjaW5jbHVk ZSA8d3RmL0lzb01hbGxvY0lubGluZXMuaD4KQEAgLTQ4LDcgKzQ3LDYgQEAgc3RhdGljIGlubGlu ZSBib29sIGlzV2hpdGVzcGFjZVByZXNlcnZlZChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiBM aW5lOjpMaW5lKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5n Q29udGV4dCkKICAgICA6IG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGlu Z0NvbnRleHQpCiAgICAgLCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudChtX3J1bnMpCi0gICAg LCBtX3Nob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZyhSdW50aW1lRW5hYmxlZEZlYXR1 cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25F bmFibGVkKCkpCiB7CiB9CiAKQEAgLTMwMiw3ICszMDAsNyBAQCB2b2lkIExpbmU6OmFwcGVuZFRl eHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5 b3V0VQogICAgIH0KICAgICAvLyBBbnkgbm9uLXdoaXRlc3BhY2UsIG5vLXRyaW1tYWJsZSBjb250 ZW50IHJlc2V0cyB0aGUgZXhpc3RpbmcgdHJpbW1hYmxlLgogICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LnJlc2V0KCk7Ci0gICAgaWYgKCFtX3Nob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVy U3BhY2luZyAmJiAhaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgaW5saW5lVGV4dEl0 ZW0uc3R5bGUoKS5sZXR0ZXJTcGFjaW5nKCkgPiAwKQorICAgIGlmICghZm9ybWF0dGluZ0NvbnRl eHQoKS5sYXlvdXRTdGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpICYm ICFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBpbmxpbmVUZXh0SXRlbS5zdHlsZSgp LmxldHRlclNwYWNpbmcoKSA+IDApCiAgICAgICAgIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50 LmFkZFBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGxvZ2ljYWxX aWR0aCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuaAppbmRleCAyZTk1YTdjNzFlNGM1NGU5MTJjYTQ0ZDJmODQ2ZDgwMzEx N2U0ZDE3Li4xNDIzMmUzY2FlMjcwMGM4ZThkZDMwOThmZTJjYTA3MDVkN2YwMWI0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5o CkBAIC0xODEsNyArMTgxLDYgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVMYXlvdXRVbml0IG1fY29u dGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICBib29sIG1faXNWaXN1YWxseUVtcHR5IHsgdHJ1 ZSB9OwogICAgIE9wdGlvbmFsPGJvb2w+IG1fbGluZUlzVmlzdWFsbHlFbXB0eUJlZm9yZVRyaW1t YWJsZVRyYWlsaW5nQ29udGVudDsKLSAgICBib29sIG1fc2hvdWxkSWdub3JlVHJhaWxpbmdMZXR0 ZXJTcGFjaW5nIHsgZmFsc2UgfTsKIH07CiAKIGlubGluZSB2b2lkIExpbmU6OlRyaW1tYWJsZVRy YWlsaW5nQ29udGVudDo6cmVzZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDBmZjlk ZjcwZDBmMGM4ZWNjOGMyZjhkYWZmODY1MzNhODQ2ZjM0NmMuLmJjZGU0OTNmNzU0ZTg5OTJlNmU4 YzdiOTNiZmRmOTNjNWMxOTc1NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTMzLDcg KzMzLDYgQEAKICNpbmNsdWRlICJMYXlvdXRCb3guaCIKICNpbmNsdWRlICJMYXlvdXRCb3hHZW9t ZXRyeS5oIgogI2luY2x1ZGUgIkxheW91dFN0YXRlLmgiCi0jaW5jbHVkZSAiUnVudGltZUVuYWJs ZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlRleHRVdGlsLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKQEAgLTE3Nyw5ICsxNzYsMTMgQEAgc3RhdGljIGlubGluZSBzaXplX3QgbmV4dFdyYXBPcHBv cnR1bml0eShjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgc2l6ZV8KIH0KIAogc3Ry dWN0IExpbmVDYW5kaWRhdGUgeworICAgIExpbmVDYW5kaWRhdGUoYm9vbCBpZ25vcmVUcmFpbGlu Z0xldHRlclNwYWNpbmcpOworCiAgICAgdm9pZCByZXNldCgpOwogCiAgICAgc3RydWN0IElubGlu ZUNvbnRlbnQgeworICAgICAgICBJbmxpbmVDb250ZW50KGJvb2wgaWdub3JlVHJhaWxpbmdMZXR0 ZXJTcGFjaW5nKTsKKwogICAgICAgICBjb25zdCBMaW5lQnJlYWtlcjo6UnVuTGlzdCYgcnVucygp IGNvbnN0IHsgcmV0dXJuIG1faW5saW5lUnVuczsgfQogICAgICAgICBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fTG9naWNhbFdpZHRoOyB9CiAgICAgICAg IElubGluZUxheW91dFVuaXQgY29sbGFwc2libGVUcmFpbGluZ1dpZHRoKCkgY29uc3QgeyByZXR1 cm4gbV9jb2xsYXBzaWJsZVRyYWlsaW5nV2lkdGg7IH0KQEAgLTE5Miw2ICsxOTUsNyBAQCBzdHJ1 Y3QgTGluZUNhbmRpZGF0ZSB7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRUcmFpbGlu Z0xpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJiBsaW5lQnJlYWtJdGVtKSB7IG1fdHJhaWxpbmdM aW5lQnJlYWsgPSAmbGluZUJyZWFrSXRlbTsgfQogCisgICAgICAgIGJvb2wgbV9pZ25vcmVUcmFp bGluZ0xldHRlclNwYWNpbmcgeyBmYWxzZSB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1f TG9naWNhbFdpZHRoIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fY29sbGFwc2li bGVUcmFpbGluZ1dpZHRoIHsgMCB9OwogICAgICAgICBMaW5lQnJlYWtlcjo6UnVuTGlzdCBtX2lu bGluZVJ1bnM7CkBAIC0yMjEsNiArMjI1LDE2IEBAIHN0cnVjdCBMaW5lQ2FuZGlkYXRlIHsKICAg ICBGbG9hdENvbnRlbnQgZmxvYXRDb250ZW50OwogfTsKIAorTGluZUNhbmRpZGF0ZTo6TGluZUNh bmRpZGF0ZShib29sIGlnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZykKKyAgICA6IGlubGluZUNv bnRlbnQoaWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nKQoreworfQorCitMaW5lQ2FuZGlkYXRl OjpJbmxpbmVDb250ZW50OjpJbmxpbmVDb250ZW50KGJvb2wgaWdub3JlVHJhaWxpbmdMZXR0ZXJT cGFjaW5nKQorICAgIDogbV9pZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoaWdub3JlVHJhaWxp bmdMZXR0ZXJTcGFjaW5nKQoreworfQorCiBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlOjpJbmxp bmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0s IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewogICAgIG1fTG9naWNhbFdpZHRoICs9 IGxvZ2ljYWxXaWR0aDsKQEAgLTI0MSw3ICsyNTUsNyBAQCBpbmxpbmUgdm9pZCBMaW5lQ2FuZGlk YXRlOjpJbmxpbmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKGNvbnN0IElubGluZUl0ZW0mIGlu bAogICAgIH0KIAogICAgIGF1dG8gcGFydGlhbGx5Q29sbGFwc2libGVUcmFpbGluZ1dpZHRoID0g WyZdKCkgLT4gSW5saW5lTGF5b3V0VW5pdCB7Ci0gICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZl YXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRp b25FbmFibGVkKCkpCisgICAgICAgIGlmIChtX2lnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZykK ICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIGlmICghaW5saW5lSXRlbS5pc1RleHQo KSkKICAgICAgICAgICAgIHJldHVybiB7IH07CkBAIC0zNjMsNyArMzc3LDcgQEAgdm9pZCBMaW5l QnVpbGRlcjo6aW5pdGlhbGl6ZShjb25zdCBVc2VkQ29uc3RyYWludHMmIGxpbmVDb25zdHJhaW50 cykKIAogTGluZUJ1aWxkZXI6OkNvbW1pdHRlZENvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5s aW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIE9wdGlv bmFsPHVuc2lnbmVkPiBwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgpCiB7Ci0gICAgYXV0byBs aW5lQ2FuZGlkYXRlID0gTGluZUNhbmRpZGF0ZSB7IH07CisgICAgYXV0byBsaW5lQ2FuZGlkYXRl ID0gTGluZUNhbmRpZGF0ZSB7IGxheW91dFN0YXRlKCkuc2hvdWxkSWdub3JlVHJhaWxpbmdMZXR0 ZXJTcGFjaW5nKCkgfTsKICAgICBhdXRvIGxpbmVCcmVha2VyID0gTGluZUJyZWFrZXIgeyB9Owog CiAgICAgYXV0byBjdXJyZW50SXRlbUluZGV4ID0gbmVlZHNMYXlvdXRSYW5nZS5zdGFydDsK 409527 2020-09-23 19:50:18 -0700 2020-09-23 20:15:06 -0700 Patch bug-216905-20200923195018.patch text/plain 7687 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI1ZWY4MmYxNzgxMDM3 NmFjYzU2Y2EwMzc3MGM2NTcyNmE0NjUyYS4uZDQ3MjEwZWE2MjlkMDA0MTRlZGIxMjM4ZWRhOTU0 ZmI1YTdmYzkyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IExpbmUgbGF5b3V0IGxvZ2ljIHNob3VsZCBjb25zdWx0IExheW91dFN0YXRlIHdoZXRoZXIgcmVt b3ZlIHRyYWlsaW5nIGxldHRlciBzcGFjaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdl aW5pZy4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBjb21wbGV0ZWx5IG1v dmluZyBhd2F5IGZyb20gdGhlIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMgY2hlY2suIAorCisgICAg ICAgICogbGF5b3V0L0xheW91dFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGF5b3V0U3RhdGU6OnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZyBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L0xheW91dFN0YXRlLmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6 OkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRUZXh0Q29udGVu dCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVudDo6YXBw ZW5kSW5saW5lSXRlbSk6CisKIDIwMjAtMDktMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQyBEaXNwbGF5XSBBZGQgdGhlIGJlZ2lubmluZ3Mg b2YgYSBDU1MgZGlzcGxheSBib3ggaGllcmFyY2h5IGFuZCBDU1MgcGFpbnRlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9MYXlvdXRTdGF0ZS5jcHAKaW5kZXggOGM1YzU1YzY2MjA5ZDQ5ZWQyYTRmZjcwMjlh M2IwMGJkNzBiOTM4OC4uYjgzMmFmZmFhY2YxMTBjY2VmYzZkNjY3YWQxMTlmNGEzNjU5MmYwNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCkBAIC0yMzksNiArMjM5LDExIEBA IHZvaWQgTGF5b3V0U3RhdGU6OnNldElzSW50ZWdyYXRlZFJvb3RCb3hGaXJzdENoaWxkKGJvb2wg dmFsdWUpCiAgICAgbV9pc0ludGVncmF0ZWRSb290Qm94Rmlyc3RDaGlsZCA9IHZhbHVlID8gSXNJ bnRlZ3JhdGVkUm9vdEJveEZpcnN0Q2hpbGQ6OlllcyA6IElzSW50ZWdyYXRlZFJvb3RCb3hGaXJz dENoaWxkOjpObzsKIH0KIAorYm9vbCBMYXlvdXRTdGF0ZTo6c2hvdWxkSWdub3JlVHJhaWxpbmdM ZXR0ZXJTcGFjaW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gUnVudGltZUVuYWJsZWRGZWF0dXJl czo6c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5h YmxlZCgpOworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9M YXlvdXRTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmgKaW5kZXgg MTA0MjJhNzE1NjYwMTA3NTJlNzk4ZTI2MDVkNTViYmNhNzJlZWI0OC4uZDkwMjI3MWI4ZDYxZGE1 MzllNjNiZTIxNzljOTc3ODY5ODNiYjJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0xheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRl LmgKQEAgLTkyLDYgKzkyLDcgQEAgcHVibGljOgogICAgIGVudW0gSXNJbnRlZ3JhdGVkUm9vdEJv eEZpcnN0Q2hpbGQgeyBZZXMsIE5vLCBOb3RBcHBsaWNhYmxlIH07CiAgICAgSXNJbnRlZ3JhdGVk Um9vdEJveEZpcnN0Q2hpbGQgaXNJbnRlZ3JhdGVkUm9vdEJveEZpcnN0Q2hpbGQoKSBjb25zdCB7 IHJldHVybiBtX2lzSW50ZWdyYXRlZFJvb3RCb3hGaXJzdENoaWxkOyB9CiAgICAgdm9pZCBzZXRJ c0ludGVncmF0ZWRSb290Qm94Rmlyc3RDaGlsZChib29sKTsKKyAgICBib29sIHNob3VsZElnbm9y ZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHZvaWQgc2V0 UXVpcmtzTW9kZShRdWlya3NNb2RlIHF1aXJrc01vZGUpIHsgbV9xdWlya3NNb2RlID0gcXVpcmtz TW9kZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmNwcAppbmRleCAzNzAxNTAxNDQ2ZmY5ZDIzYTI2MDY5MWNhODA2ZjAwMzk2 OWI2M2Q3Li5lZDQ4OGQyYjUyNTQxNWU5MTE5OTJlMzI1ZWFlMGVmYzRiODRkOTgwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l LmNwcApAQCAtMzEsNyArMzEsNiBAQAogI2luY2x1ZGUgIklubGluZUZvcm1hdHRpbmdDb250ZXh0 LmgiCiAjaW5jbHVkZSAiSW5saW5lU29mdExpbmVCcmVha0l0ZW0uaCIKICNpbmNsdWRlICJMYXlv dXRCb3hHZW9tZXRyeS5oIgotI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNp bmNsdWRlICJUZXh0RmxhZ3MuaCIKICNpbmNsdWRlICJUZXh0VXRpbC5oIgogI2luY2x1ZGUgPHd0 Zi9Jc29NYWxsb2NJbmxpbmVzLmg+CkBAIC00OCw3ICs0Nyw2IEBAIHN0YXRpYyBpbmxpbmUgYm9v bCBpc1doaXRlc3BhY2VQcmVzZXJ2ZWQoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogTGluZTo6 TGluZShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRl eHQpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGluZUZvcm1hdHRpbmdDb250 ZXh0KQogICAgICwgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQobV9ydW5zKQotICAgICwgbV9z aG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6 c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxl ZCgpKQogewogfQogCkBAIC0zMTcsNyArMzE1LDcgQEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29u dGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFUK ICAgICB9CiAgICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBuby10cmltbWFibGUgY29udGVudCBy ZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29u dGVudC5yZXNldCgpOwotICAgIGlmICghbV9zaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNp bmcgJiYgIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpICYmIGlubGluZVRleHRJdGVtLnN0 eWxlKCkubGV0dGVyU3BhY2luZygpID4gMCkKKyAgICBpZiAoIWZvcm1hdHRpbmdDb250ZXh0KCku bGF5b3V0U3RhdGUoKS5zaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKSAmJiAhaW5s aW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgaW5saW5lVGV4dEl0ZW0uc3R5bGUoKS5sZXR0 ZXJTcGFjaW5nKCkgPiAwKQogICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRQ YXJ0aWFsbHlUcmltbWFibGVDb250ZW50KG1fcnVucy5zaXplKCkgLSAxLCBsb2dpY2FsV2lkdGgp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmgKaW5kZXggMmU5NWE3YzcxZTRjNTRlOTEyY2E0NGQyZjg0NmQ4MDMxMTdlNGQx Ny4uMTQyMzJlM2NhZTI3MDBjOGU4ZGQzMDk4ZmUyY2EwNzA1ZDdmMDFiNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAt MTgxLDcgKzE4MSw2IEBAIHByaXZhdGU6CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRM b2dpY2FsV2lkdGggeyAwIH07CiAgICAgYm9vbCBtX2lzVmlzdWFsbHlFbXB0eSB7IHRydWUgfTsK ICAgICBPcHRpb25hbDxib29sPiBtX2xpbmVJc1Zpc3VhbGx5RW1wdHlCZWZvcmVUcmltbWFibGVU cmFpbGluZ0NvbnRlbnQ7Ci0gICAgYm9vbCBtX3Nob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3Bh Y2luZyB7IGZhbHNlIH07CiB9OwogCiBpbmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQ6OnJlc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAwZmY5ZGY3MGQw ZjBjOGVjYzhjMmY4ZGFmZjg2NTMzYTg0NmYzNDZjLi5iY2RlNDkzZjc1NGU4OTkyZTZlOGM3Yjkz YmZkZjkzYzVjMTk3NTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zMyw3ICszMyw2 IEBACiAjaW5jbHVkZSAiTGF5b3V0Qm94LmgiCiAjaW5jbHVkZSAiTGF5b3V0Qm94R2VvbWV0cnku aCIKICNpbmNsdWRlICJMYXlvdXRTdGF0ZS5oIgotI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVh dHVyZXMuaCIKICNpbmNsdWRlICJUZXh0VXRpbC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBA IC0xNzcsOSArMTc2LDEzIEBAIHN0YXRpYyBpbmxpbmUgc2l6ZV90IG5leHRXcmFwT3Bwb3J0dW5p dHkoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIHNpemVfCiB9CiAKIHN0cnVjdCBM aW5lQ2FuZGlkYXRlIHsKKyAgICBMaW5lQ2FuZGlkYXRlKGJvb2wgaWdub3JlVHJhaWxpbmdMZXR0 ZXJTcGFjaW5nKTsKKwogICAgIHZvaWQgcmVzZXQoKTsKIAogICAgIHN0cnVjdCBJbmxpbmVDb250 ZW50IHsKKyAgICAgICAgSW5saW5lQ29udGVudChib29sIGlnbm9yZVRyYWlsaW5nTGV0dGVyU3Bh Y2luZyk7CisKICAgICAgICAgY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmIHJ1bnMoKSBjb25z dCB7IHJldHVybiBtX2lubGluZVJ1bnM7IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX0xvZ2ljYWxXaWR0aDsgfQogICAgICAgICBJbmxp bmVMYXlvdXRVbml0IGNvbGxhcHNpYmxlVHJhaWxpbmdXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1f Y29sbGFwc2libGVUcmFpbGluZ1dpZHRoOyB9CkBAIC0xOTIsNiArMTk1LDcgQEAgc3RydWN0IExp bmVDYW5kaWRhdGUgewogICAgIHByaXZhdGU6CiAgICAgICAgIHZvaWQgc2V0VHJhaWxpbmdMaW5l QnJlYWsoY29uc3QgSW5saW5lSXRlbSYgbGluZUJyZWFrSXRlbSkgeyBtX3RyYWlsaW5nTGluZUJy ZWFrID0gJmxpbmVCcmVha0l0ZW07IH0KIAorICAgICAgICBib29sIG1faWdub3JlVHJhaWxpbmdM ZXR0ZXJTcGFjaW5nIHsgZmFsc2UgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX0xvZ2lj YWxXaWR0aCB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbGxhcHNpYmxlVHJh aWxpbmdXaWR0aCB7IDAgfTsKICAgICAgICAgTGluZUJyZWFrZXI6OlJ1bkxpc3QgbV9pbmxpbmVS dW5zOwpAQCAtMjIxLDYgKzIyNSwxNiBAQCBzdHJ1Y3QgTGluZUNhbmRpZGF0ZSB7CiAgICAgRmxv YXRDb250ZW50IGZsb2F0Q29udGVudDsKIH07CiAKK0xpbmVDYW5kaWRhdGU6OkxpbmVDYW5kaWRh dGUoYm9vbCBpZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcpCisgICAgOiBpbmxpbmVDb250ZW50 KGlnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZykKK3sKK30KKworTGluZUNhbmRpZGF0ZTo6SW5s aW5lQ29udGVudDo6SW5saW5lQ29udGVudChib29sIGlnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2lu ZykKKyAgICA6IG1faWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nKGlnbm9yZVRyYWlsaW5nTGV0 dGVyU3BhY2luZykKK3sKK30KKwogaW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6SW5saW5lQ29u dGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKICAgICBtX0xvZ2ljYWxXaWR0aCArPSBsb2dp Y2FsV2lkdGg7CkBAIC0yNDEsNyArMjU1LDcgQEAgaW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6 SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmwKICAg ICB9CiAKICAgICBhdXRvIHBhcnRpYWxseUNvbGxhcHNpYmxlVHJhaWxpbmdXaWR0aCA9IFsmXSgp IC0+IElubGluZUxheW91dFVuaXQgewotICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJl czo6c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5h YmxlZCgpKQorICAgICAgICBpZiAobV9pZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcpCiAgICAg ICAgICAgICByZXR1cm4geyB9OwogICAgICAgICBpZiAoIWlubGluZUl0ZW0uaXNUZXh0KCkpCiAg ICAgICAgICAgICByZXR1cm4geyB9OwpAQCAtMzYzLDcgKzM3Nyw3IEBAIHZvaWQgTGluZUJ1aWxk ZXI6OmluaXRpYWxpemUoY29uc3QgVXNlZENvbnN0cmFpbnRzJiBsaW5lQ29uc3RyYWludHMpCiAK IExpbmVCdWlsZGVyOjpDb21taXR0ZWRDb250ZW50IExpbmVCdWlsZGVyOjpwbGFjZUlubGluZUNv bnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBPcHRpb25hbDx1 bnNpZ25lZD4gcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoKQogewotICAgIGF1dG8gbGluZUNh bmRpZGF0ZSA9IExpbmVDYW5kaWRhdGUgeyB9OworICAgIGF1dG8gbGluZUNhbmRpZGF0ZSA9IExp bmVDYW5kaWRhdGUgeyBsYXlvdXRTdGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3Bh Y2luZygpIH07CiAgICAgYXV0byBsaW5lQnJlYWtlciA9IExpbmVCcmVha2VyIHsgfTsKIAogICAg IGF1dG8gY3VycmVudEl0ZW1JbmRleCA9IG5lZWRzTGF5b3V0UmFuZ2Uuc3RhcnQ7Cg==