202300 2019-09-26 21:12:27 -0700 [LFC][IFC] Remove redundant Line::TextContext member variables 2019-09-27 08:31:08 -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 1574723 0 zalan 2019-09-26 21:12:27 -0700 This is in preparation for using Display::Run in Line::Run instead of Line::Run::m_displayRect and TextContext. 1574724 1 webkit-bug-importer 2019-09-26 21:12:49 -0700 <rdar://problem/55769916> 1574725 2 379711 zalan 2019-09-26 21:14:36 -0700 Created attachment 379711 Patch 1574817 3 379711 commit-queue 2019-09-27 08:31:06 -0700 Comment on attachment 379711 Patch Clearing flags on attachment: 379711 Committed r250423: <https://trac.webkit.org/changeset/250423> 1574818 4 commit-queue 2019-09-27 08:31:08 -0700 All reviewed patches have been landed. Closing bug. 379711 2019-09-26 21:14:36 -0700 2019-09-27 08:31:06 -0700 Patch bug-202300-20190926211434.patch text/plain 11496 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ5NmUxYzExYzhmZDMw MzkxZmVhZGZmYWY5ZDUxZTJmMzYwOWQ3Mi4uMDgzZTZhNTk3Yjc3MTQwNTQ2OTUzMGFjMzM2M2Yy ODlkNWU1YTVkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg cmVkdW5kYW50IExpbmU6OlRleHRDb250ZXh0IG1lbWJlciB2YXJpYWJsZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjMwMAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTU3Njk5MTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdXNpbmcgRGlzcGxheTo6 UnVuIGluIExpbmU6OlJ1biBpbnN0ZWFkIG9mIERpc3BsYXk6OlJlY3QgKyBUZXh0Q29udGV4dC4K KworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpR dWlya3M6OmxpbmVEZXNjZW50TmVlZHNDb2xsYXBzaW5nIGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZTo6UnVuOjppc1doaXRlc3BhY2UgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lOjpSdW46OmNhbkJlRXh0ZW5kZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjppc1Zpc3VhbGx5RW1wdHkgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjp0cmFpbGluZ1RyaW1tYWJsZVdpZHRoIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjppc1Zpc3VhbGx5RW1wdHkgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnNldFZpc3VhbGx5SXNFbXB0eSk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6c2V0VGV4dElzQ29sbGFwc2VkKTogRGVs ZXRlZC4KKwogMjAxOS0wOS0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gTGluZTo6UnVuIHNob3VsZCBoYXZlIGEgcmVmZXJlbmNlIHRvIHRo ZSBhc3NvY2lhdGVkIElubGluZUl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dExpbmVMYXlvdXQuY3BwCmluZGV4IDY3ZTI1YWE1YTFiYzJmNTQyZDM3YTE1Y2Q3MTJh OTk2YjY3NDM3ODguLmViZTYwZjI1NWFlM2RmZjdlNmVjNzIwNDg3YzkyMzc0YmMwNzlmZmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcApA QCAtMzk3LDExICszOTcsMTEgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5l TGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVucyhjb25zdCBMaW5lQ29udGVudCYKICAgICAgICAgaWYg KHJ1bi0+aXNUZXh0KCkpIHsKICAgICAgICAgICAgIC8vIENvbGxhcHNlZCBsaW5lIHJ1bnMgZG9u J3QgZ2VuZXJhdGUgZGlzcGxheSBydW5zLgogICAgICAgICAgICAgYXV0byB0ZXh0Q29udGV4dCA9 IHJ1bi0+dGV4dENvbnRleHQoKTsKLSAgICAgICAgICAgIGlmICh0ZXh0Q29udGV4dC0+aXNDb2xs YXBzZWQpCisgICAgICAgICAgICBpZiAocnVuLT5pc1Zpc3VhbGx5RW1wdHkoKSkKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIC8vIFRyeSB0byBqb2luIG11bHRpcGxlIHRl eHQgcnVucyB3aGVuIHBvc3NpYmxlLgogICAgICAgICAgICAgY29uc3QgTGluZTo6UnVuKiBwcmV2 aW91c1J1biA9ICFpbmRleCA/IG51bGxwdHIgOiBsaW5lUnVuc1tpbmRleCAtIDFdLmdldCgpOwot ICAgICAgICAgICAgYXV0byBwcmV2aW91c1J1bkNhbkJlRXh0ZW5kZWQgPSBwcmV2aW91c1J1biAm JiBwcmV2aW91c1J1bi0+dGV4dENvbnRleHQoKSA/IHByZXZpb3VzUnVuLT50ZXh0Q29udGV4dCgp LT5jYW5CZUV4dGVuZGVkIDogZmFsc2U7CisgICAgICAgICAgICBhdXRvIHByZXZpb3VzUnVuQ2Fu QmVFeHRlbmRlZCA9IHByZXZpb3VzUnVuICYmIHByZXZpb3VzUnVuLT5jYW5CZUV4dGVuZGVkKCk7 CiAgICAgICAgICAgICBhdXRvIGN1cnJlbnRSdW5DYW5CZU1lcmdlZFdpdGhQcmV2aW91cyA9ICFw cmV2aW91c1J1biB8fCAmcnVuLT5sYXlvdXRCb3goKSA9PSAmcHJldmlvdXNSdW4tPmxheW91dEJv eCgpOwogCiAgICAgICAgICAgICBpZiAocHJldmlvdXNSdW5DYW5CZUV4dGVuZGVkICYmIGN1cnJl bnRSdW5DYW5CZU1lcmdlZFdpdGhQcmV2aW91cykgewpAQCAtNDYxLDE4ICs0NjEsMTggQEAgdm9p ZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVu cyhjb25zdCBMaW5lQ29udGVudCYKIAogICAgICAgICAvLyBUZXh0IGNvbnRlbnQuIFRyeSB0byBq b2luIG11bHRpcGxlIHRleHQgcnVucyB3aGVuIHBvc3NpYmxlLgogICAgICAgICBpZiAobGluZVJ1 bi0+aXNUZXh0KCkpIHsKLSAgICAgICAgICAgIGF1dG8gdGV4dENvbnRleHQgPSBsaW5lUnVuLT50 ZXh0Q29udGV4dCgpOwogICAgICAgICAgICAgY29uc3QgTGluZTo6UnVuKiBwcmV2aW91c0xpbmVS dW4gPSAhaW5kZXggPyBudWxscHRyIDogbGluZVJ1bnNbaW5kZXggLSAxXS5nZXQoKTsKICAgICAg ICAgICAgIC8vIEZJWE1FIHRha2UgY29udGVudCBicmVha2luZyBpbnRvIGFjY291bnQgd2hlbiBw YXJ0IG9mIHRoZSBsYXlvdXQgYm94IGlzIG9uIHRoZSBwcmV2aW91cyBsaW5lLgogICAgICAgICAg ICAgYXV0byBmaXJzdElubGluZVJ1bkZvckxheW91dEJveCA9ICFwcmV2aW91c0xpbmVSdW4gfHwg JnByZXZpb3VzTGluZVJ1bi0+bGF5b3V0Qm94KCkgIT0gJmxheW91dEJveDsKKyAgICAgICAgICAg IGF1dG8gbG9naWNhbFdpZHRoID0gbGluZVJ1bi0+aXNWaXN1YWxseUVtcHR5KCkgPyBMYXlvdXRV bml0KCkgOiBsb2dpY2FsUmVjdC53aWR0aCgpOwogICAgICAgICAgICAgaWYgKGZpcnN0SW5saW5l UnVuRm9yTGF5b3V0Qm94KSB7CiAgICAgICAgICAgICAgICAgLy8gU2V0dXAgZGlzcGxheSBib3gg Zm9yIHRoZSBhc3NvY2lhdGVkIGxheW91dCBib3guCiAgICAgICAgICAgICAgICAgZGlzcGxheUJv eC5zZXRUb3BMZWZ0KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSk7Ci0gICAgICAgICAgICAgICAgZGlz cGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgodGV4dENvbnRleHQtPmlzQ29sbGFwc2VkID8gTGF5 b3V0VW5pdCgpIDogbG9naWNhbFJlY3Qud2lkdGgoKSk7CisgICAgICAgICAgICAgICAgZGlzcGxh eUJveC5zZXRDb250ZW50Qm94V2lkdGgobG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgICAgICBk aXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQobG9naWNhbFJlY3QuaGVpZ2h0KCkpOwotICAg ICAgICAgICAgfSBlbHNlIGlmICghdGV4dENvbnRleHQtPmlzQ29sbGFwc2VkKSB7CisgICAgICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIC8vIEZJWE1FIGZpeCBpdCBmb3IgbXVsdGly dW4vbXVsdGlsaW5lLgotICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveFdp ZHRoKGRpc3BsYXlCb3guY29udGVudEJveFdpZHRoKCkgKyBsb2dpY2FsUmVjdC53aWR0aCgpKTsK KyAgICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aChkaXNwbGF5Qm94 LmNvbnRlbnRCb3hXaWR0aCgpICsgbG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dFF1aXJrcy5jcHAKaW5kZXggNjVhMzc1ZDdhOGUyODhjOWZjMDY4ZDNjN2JjMTAxNmY1 YzczMmRjNi4uYzEyM2RlZTVkMDI0ZmJjOGQ3YWEzOGU3MWVmNDgzMGQ3NTVjODM0MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNTIsNyArNTIs NyBAQCBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVEZXNjZW50TmVl ZHNDb2xsYXBzaW5nKGNvbnN0IExpbmU6OlJ1bgogICAgICAgICBpZiAocnVuLT5pc0xpbmVCcmVh aygpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAocnVuLT5pc1RleHQo KSkgewotICAgICAgICAgICAgaWYgKCFydW4tPnRleHRDb250ZXh0KCkgfHwgIXJ1bi0+dGV4dENv bnRleHQoKS0+aXNDb2xsYXBzZWQpCisgICAgICAgICAgICBpZiAoIXJ1bi0+dGV4dENvbnRleHQo KSB8fCAhcnVuLT5pc1Zpc3VhbGx5RW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCAwYmEx YmE1MTk4MzRkZWRmMjc1MTc3MTc2MTA4ZmQ2M2ZjYTYwZDk4Li5jM2EzMmM1N2UwOTQwZDE5OTQ3 Y2I4NWMxMjU3MjExZTE5OTVmODJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtNTAsNiArNTAsMjAgQEAgTGlu ZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgVGV4dENvbnRl eHQmIHRleHRDb250ZXh0LCBjb24KIHsKIH0KIAorYm9vbCBMaW5lOjpSdW46OmlzV2hpdGVzcGFj ZSgpIGNvbnN0Cit7CisgICAgaWYgKCFpc1RleHQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIHJldHVybiBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4obV9pbmxpbmVJdGVtKS5pc1doaXRl c3BhY2UoKTsKK30KKworYm9vbCBMaW5lOjpSdW46OmNhbkJlRXh0ZW5kZWQoKSBjb25zdAorewor ICAgIGlmICghaXNUZXh0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gIWRv d25jYXN0PElubGluZVRleHRJdGVtPihtX2lubGluZUl0ZW0pLmlzQ29sbGFwc2VkKCkgJiYgIWlz VmlzdWFsbHlFbXB0eSgpOworfQorCiBMaW5lOjpMaW5lKGNvbnN0IElubGluZUZvcm1hdHRpbmdD b250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgY29uc3QgSW5pdGlhbENvbnN0cmFpbnRz JiBpbml0aWFsQ29uc3RyYWludHMsIFNraXBWZXJ0aWNhbEFsaWdtZW50IHNraXBWZXJ0aWNhbEFs aWdtZW50KQogICAgIDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5n Q29udGV4dCkKICAgICAsIG1faW5pdGlhbFN0cnV0KGluaXRpYWxDb25zdHJhaW50cy5oZWlnaHRB bmRCYXNlbGluZS5zdHJ1dCkKQEAgLTkwLDcgKzEwNCw3IEBAIGJvb2wgTGluZTo6aXNWaXN1YWxs eUVtcHR5KCkgY29uc3QKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBpZiAoIXJ1bi0+dGV4dENvbnRleHQoKSB8 fCAhcnVuLT50ZXh0Q29udGV4dCgpLT5pc0NvbGxhcHNlZCkKKyAgICAgICAgaWYgKCFydW4tPnRl eHRDb250ZXh0KCkgfHwgIXJ1bi0+aXNWaXN1YWxseUVtcHR5KCkpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwpAQCAtMTYxLDcgKzE3NSw3IEBAIHZv aWQgTGluZTo6cmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCkKICAgICBMYXlvdXRVbml0 IHRyaW1tYWJsZVdpZHRoOwogICAgIGZvciAoYXV0byogdHJpbW1hYmxlUnVuIDogbV90cmltbWFi bGVDb250ZW50KSB7CiAgICAgICAgIEFTU0VSVCh0cmltbWFibGVSdW4tPmlzVGV4dCgpKTsKLSAg ICAgICAgdHJpbW1hYmxlUnVuLT5zZXRUZXh0SXNDb2xsYXBzZWQoKTsKKyAgICAgICAgdHJpbW1h YmxlUnVuLT5zZXRWaXN1YWxseUlzRW1wdHkoKTsKICAgICAgICAgdHJpbW1hYmxlV2lkdGggKz0g dHJpbW1hYmxlUnVuLT5sb2dpY2FsUmVjdCgpLndpZHRoKCk7CiAgICAgfQogICAgIG1fbGluZUJv eC5zaHJpbmtIb3Jpem9udGFsbHkodHJpbW1hYmxlV2lkdGgpOwpAQCAtMTg2LDcgKzIwMCw3IEBA IExheW91dFVuaXQgTGluZTo6dHJhaWxpbmdUcmltbWFibGVXaWR0aCgpIGNvbnN0CiB7CiAgICAg TGF5b3V0VW5pdCB0cmltbWFibGVXaWR0aDsKICAgICBmb3IgKGF1dG8qIHRyaW1tYWJsZVJ1biA6 IG1fdHJpbW1hYmxlQ29udGVudCkgewotICAgICAgICBBU1NFUlQoIXRyaW1tYWJsZVJ1bi0+dGV4 dENvbnRleHQoKS0+aXNDb2xsYXBzZWQpOworICAgICAgICBBU1NFUlQoIXRyaW1tYWJsZVJ1bi0+ aXNWaXN1YWxseUVtcHR5KCkpOwogICAgICAgICB0cmltbWFibGVXaWR0aCArPSB0cmltbWFibGVS dW4tPmxvZ2ljYWxSZWN0KCkud2lkdGgoKTsKICAgICB9CiAgICAgcmV0dXJuIHRyaW1tYWJsZVdp ZHRoOwpAQCAtMjQwLDcgKzI1NCw3IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29u c3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhCiAgICAgaWYg KCFpc1RyaW1tYWJsZSkKICAgICAgICAgbV90cmltbWFibGVDb250ZW50LmNsZWFyKCk7CiAKLSAg ICBhdXRvIHNob3VsZENvbGxhcHNlQ29tcGxldGVseSA9IFsmXSB7CisgICAgYXV0byB3aWxsQ29s bGFwc2VDb21wbGV0ZWx5ID0gWyZdIHsKICAgICAgICAgLy8gRW1wdHkgcnVuLgogICAgICAgICBp ZiAoIWlubGluZUl0ZW0ubGVuZ3RoKCkpIHsKICAgICAgICAgICAgIEFTU0VSVCghbG9naWNhbFdp ZHRoKTsKQEAgLTI1NywxNiArMjcxLDEyIEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQo Y29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhCiAgICAg ICAgICAgICBpZiAocnVuLT5pc0JveCgpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgICAgIGlmIChydW4tPmlzVGV4dCgpKQotICAgICAgICAgICAgICAgIHJldHVybiBy dW4tPnRleHRDb250ZXh0KCktPmlzV2hpdGVzcGFjZSAmJiBydW4tPmxheW91dEJveCgpLnN0eWxl KCkuY29sbGFwc2VXaGl0ZVNwYWNlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHJ1bi0+aXNX aGl0ZXNwYWNlKCkgJiYgcnVuLT5sYXlvdXRCb3goKS5zdHlsZSgpLmNvbGxhcHNlV2hpdGVTcGFj ZSgpOwogICAgICAgICAgICAgQVNTRVJUKHJ1bi0+aXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi0+ aXNDb250YWluZXJFbmQoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg fTsKIAotICAgIC8vIENvbGxhcHNlZCBsaW5lIGl0ZW1zIGRvbid0IGNvbnRyaWJ1dGUgdG8gdGhl IGxpbmUgd2lkdGguCi0gICAgYXV0byBpc0NvbXBsZXRlbHlDb2xsYXBzZWQgPSBzaG91bGRDb2xs YXBzZUNvbXBsZXRlbHkoKTsKLSAgICBhdXRvIGNhbkJlRXh0ZW5kZWQgPSAhaXNDb21wbGV0ZWx5 Q29sbGFwc2VkICYmICFpbmxpbmVJdGVtLmlzQ29sbGFwc2VkKCk7Ci0gICAgCiAgICAgYXV0byBs b2dpY2FsUmVjdCA9IERpc3BsYXk6OlJlY3QgeyB9OwogICAgIGxvZ2ljYWxSZWN0LnNldExlZnQo Y29udGVudExvZ2ljYWxXaWR0aCgpKTsKICAgICBsb2dpY2FsUmVjdC5zZXRXaWR0aChsb2dpY2Fs V2lkdGgpOwpAQCAtMjc2LDEzICsyODYsMTcgQEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdCBsb2dpY2EKICAg ICAgICAgYWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGlubGluZUl0ZW0sIHJ1bkhlaWdodCk7 CiAgICAgfQogCi0gICAgYXV0byB0ZXh0Q29udGV4dCA9IFJ1bjo6VGV4dENvbnRleHQgeyBpbmxp bmVJdGVtLnN0YXJ0KCksIGlubGluZUl0ZW0uaXNDb2xsYXBzZWQoKSA/IDEgOiBpbmxpbmVJdGVt Lmxlbmd0aCgpLCBpc0NvbXBsZXRlbHlDb2xsYXBzZWQsIGlubGluZUl0ZW0uaXNXaGl0ZXNwYWNl KCksIGNhbkJlRXh0ZW5kZWQgfTsKKyAgICBhdXRvIHRleHRDb250ZXh0ID0gUnVuOjpUZXh0Q29u dGV4dCB7IGlubGluZUl0ZW0uc3RhcnQoKSwgaW5saW5lSXRlbS5pc0NvbGxhcHNlZCgpID8gMSA6 IGlubGluZUl0ZW0ubGVuZ3RoKCkgfTsKICAgICBhdXRvIGxpbmVJdGVtID0gbWFrZVVuaXF1ZTxS dW4+KGlubGluZUl0ZW0sIHRleHRDb250ZXh0LCBsb2dpY2FsUmVjdCk7Ci0gICAgaWYgKGlzVHJp bW1hYmxlICYmICFpc0NvbXBsZXRlbHlDb2xsYXBzZWQpCisgICAgYXV0byBpc1Zpc3VhbGx5RW1w dHkgPSB3aWxsQ29sbGFwc2VDb21wbGV0ZWx5KCk7CisgICAgaWYgKGlzVmlzdWFsbHlFbXB0eSkK KyAgICAgICAgbGluZUl0ZW0tPnNldFZpc3VhbGx5SXNFbXB0eSgpOworICAgIGVsc2UgaWYgKGlz VHJpbW1hYmxlKQogICAgICAgICBtX3RyaW1tYWJsZUNvbnRlbnQuYWRkKGxpbmVJdGVtLmdldCgp KTsKIAogICAgIG1fcnVuTGlzdC5hcHBlbmQoV1RGTW92ZShsaW5lSXRlbSkpOwotICAgIGlmICgh aXNDb21wbGV0ZWx5Q29sbGFwc2VkKQorICAgIC8vIENvbGxhcHNlZCBsaW5lIGl0ZW1zIGRvbid0 IGNvbnRyaWJ1dGUgdG8gdGhlIGxpbmUgd2lkdGguCisgICAgaWYgKCFpc1Zpc3VhbGx5RW1wdHkp CiAgICAgICAgIG1fbGluZUJveC5leHBhbmRIb3Jpem9udGFsbHkobG9naWNhbFdpZHRoKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5oCmluZGV4IDVhZjA5YjA4ZDRjZDgxYjUyN2U1OTk0MTAzMTk0ZWEzYjRjMDQxMDAuLjI1 ZmUwNmIzNjc3MTA1YzU4ZWEzMTMzNTI4ZWIyZGM5YTMxZDgyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTY5LDkg KzY5LDYgQEAgcHVibGljOgogICAgICAgICBzdHJ1Y3QgVGV4dENvbnRleHQgewogICAgICAgICAg ICAgdW5zaWduZWQgc3RhcnQgeyAwIH07CiAgICAgICAgICAgICB1bnNpZ25lZCBsZW5ndGggeyAw IH07Ci0gICAgICAgICAgICBib29sIGlzQ29sbGFwc2VkIHsgZmFsc2UgfTsKLSAgICAgICAgICAg IGJvb2wgaXNXaGl0ZXNwYWNlIHsgZmFsc2UgfTsKLSAgICAgICAgICAgIGJvb2wgY2FuQmVFeHRl bmRlZCB7IGZhbHNlIH07CiAgICAgICAgIH07CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVt JiwgY29uc3QgRGlzcGxheTo6UmVjdCYpOwogICAgICAgICBSdW4oY29uc3QgSW5saW5lSXRlbSYs IGNvbnN0IFRleHRDb250ZXh0JiwgY29uc3QgRGlzcGxheTo6UmVjdCYpOwpAQCAtODYsMTUgKzgz LDIwIEBAIHB1YmxpYzoKICAgICAgICAgYm9vbCBpc0NvbnRhaW5lclN0YXJ0KCkgY29uc3QgeyBy ZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKTsgfQogICAgICAgICBib29sIGlz Q29udGFpbmVyRW5kKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5k KCk7IH0KIAorICAgICAgICBib29sIGlzVmlzdWFsbHlFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1f aXNWaXN1YWxseUVtcHR5OyB9CisgICAgICAgIGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3Q7Cisg ICAgICAgIGJvb2wgY2FuQmVFeHRlbmRlZCgpIGNvbnN0OworCiAgICAgcHJpdmF0ZToKICAgICAg ICAgZnJpZW5kIGNsYXNzIExpbmU7CiAgICAgICAgIHZvaWQgYWRqdXN0TG9naWNhbFRvcChMYXlv dXRVbml0IGxvZ2ljYWxUb3ApIHsgbV9sb2dpY2FsUmVjdC5zZXRUb3AobG9naWNhbFRvcCk7IH0K ICAgICAgICAgdm9pZCBtb3ZlVmVydGljYWxseShMYXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2lj YWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KG9mZnNldCk7IH0KICAgICAgICAgdm9pZCBtb3ZlSG9yaXpv bnRhbGx5KExheW91dFVuaXQgb2Zmc2V0KSB7IG1fbG9naWNhbFJlY3QubW92ZUhvcml6b250YWxs eShvZmZzZXQpOyB9Ci0gICAgICAgIHZvaWQgc2V0VGV4dElzQ29sbGFwc2VkKCkgeyBtX3RleHRD b250ZXh0LT5pc0NvbGxhcHNlZCA9IHRydWU7IH0KKyAgICAgICAgdm9pZCBzZXRWaXN1YWxseUlz RW1wdHkoKSB7IG1faXNWaXN1YWxseUVtcHR5ID0gdHJ1ZTsgfQogCiAgICAgICAgIGNvbnN0IElu bGluZUl0ZW0mIG1faW5saW5lSXRlbTsKICAgICAgICAgRGlzcGxheTo6UmVjdCBtX2xvZ2ljYWxS ZWN0OworICAgICAgICBib29sIG1faXNWaXN1YWxseUVtcHR5IHsgZmFsc2UgfTsKICAgICAgICAg T3B0aW9uYWw8VGV4dENvbnRleHQ+IG1fdGV4dENvbnRleHQ7CiAgICAgfTsKICAgICB1c2luZyBS dW5MaXN0ID0gVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxSdW4+PjsK