217458 2020-10-07 16:48:01 -0700 [LFC][IFC] Using the mixture of LayoutUnit and InlineLayoutUnit types causes ASSERT(verticalGap >= 0) 2020-10-08 06:18:19 -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 1695746 0 zalan 2020-10-07 16:48:01 -0700 remove FIXME 1695748 1 410802 zalan 2020-10-07 16:58:42 -0700 Created attachment 410802 Patch 1695866 2 ews-feeder 2020-10-08 06:17:30 -0700 Committed r268179: <https://trac.webkit.org/changeset/268179> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410802. 1695867 3 webkit-bug-importer 2020-10-08 06:18:19 -0700 <rdar://problem/70090572> 410802 2020-10-07 16:58:42 -0700 2020-10-08 06:17:30 -0700 Patch bug-217458-20201007165842.patch text/plain 11184 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViODhiMTAwZjdhMTA4 MmY4NzY2M2RlYzA0ZGIwMmFkNzVkNzhkYy4uNzFhMjlmNjIxMTdhZWNkOTUzNjBhZjc4YjM5YmM1 YmVjNjM0MDJiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTEwLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2luZyB0 aGUgbWl4dHVyZSBvZiBMYXlvdXRVbml0IGFuZCBJbmxpbmVMYXlvdXRVbml0IHR5cGVzIGNhdXNl cyBBU1NFUlQodmVydGljYWxHYXAgPj0gMCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNzQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIExpbmUgZ2FwIGNvbXB1dGF0aW9uIGNhbiBwcm9kdWNlIGFuIGlu Y29ycmVjdCByZXN1bHQgd2hlbiB0aGUgTGF5b3V0VW5pdCBiYXNlZCBsaW5lTG9naWNhbFRvcAor ICAgICAgICBob2xkcyBMYXlvdXRVbml0OjptYXgoKSB2YWx1ZSB3aGlsZSBsaW5lTG9naWNhbFJl Y3QuYm90dG9tKCkgKGZsb2F0IGF0bSkgaG9sZHMgYSBsYXJnZXIgdmFsdWUuCisgICAgICAgIChU aGlzIGlzIGEgZ3JlYXQgb3Bwb3J0dW5pdHkgdG8gdHJhbnNpdGlvbiB0aGUgbGluZSBsb2dpY2Fs IGNvbnN0cmFpbnRzIHRvIElubGluZVJlY3QoRmxvYXRSZWN0KSkuCisKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmNvbnN0cmFpbnRz Rm9yTGluZSk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1 aWxkZXIuaDoKKwogMjAyMC0xMC0wNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIENyYXNoIHVuZGVyIEpTQXVkaW9Xb3JrbGV0UHJvY2Vzc29yQ29uc3RydWN0b3I6 On5KU0F1ZGlvV29ya2xldFByb2Nlc3NvckNvbnN0cnVjdG9yKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcAppbmRleCBjMjU3MjVkYjNmY2IwZWNjOWZkNTkyMmQwYzdlNmMwMTQ0 ZTI0MzY4Li4zOTljYmI3ZWZhNmNmOGY2OThhMmI4NDE0YTA0OWQwZjIzYmE0YTY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xNDMsNyArMTQzLDcgQEAgdm9pZCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25T dGF0ZSYgaW52YWxpZGF0aW8KIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxh eW91dChJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFu Z2UgbmVlZHNMYXlvdXRSYW5nZSwgY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBj b25zdHJhaW50cykKIHsKLSAgICBhdXRvIGxpbmVMb2dpY2FsVG9wID0gY29uc3RyYWludHMudmVy dGljYWwubG9naWNhbFRvcDsKKyAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVMb2dpY2FsVG9wID0g Y29uc3RyYWludHMudmVydGljYWwubG9naWNhbFRvcDsKICAgICBzdHJ1Y3QgUHJldmlvdXNMaW5l IHsKICAgICAgICAgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSByYW5nZTsKICAgICAgICAg c2l6ZV90IG92ZXJmbG93Q29udGVudExlbmd0aCB7IDAgfTsKQEAgLTE1Nyw3ICsxNTcsNyBAQCB2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KElubGluZUl0ZW1zJiBpbmxp bmVJdGVtcywgTGluZUJ1aWxkZXI6OgogICAgICAgICAvLyBUdXJuIHByZXZpb3VzIGxpbmUncyBv dmVyZmxvdyBjb250ZW50IGxlbmd0aCBpbnRvIHRoZSBuZXh0IGxpbmUncyBsZWFkaW5nIGNvbnRl bnQgcGFydGlhbCBsZW5ndGguCiAgICAgICAgIC8vICJzcFs8LWxpbmUgYnJlYWstPl1saXRfY29u dGVudCIgLT4gb3ZlcmZsb3cgbGVuZ3RoOiAxMSAtPiBsZWFkaW5nIHBhcnRpYWwgY29udGVudCBs ZW5ndGg6IDExLgogICAgICAgICBhdXRvIHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCA9IHBy ZXZpb3VzTGluZSA/IHByZXZpb3VzTGluZS0+b3ZlcmZsb3dDb250ZW50TGVuZ3RoIDogMDsKLSAg ICAgICAgYXV0byBpbml0aWFsTGluZUNvbnN0cmFpbnRzID0gQ29uc3RyYWludHNGb3JJbkZsb3dD b250ZW50IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCwgeyBsaW5lTG9naWNhbFRvcCwgbWFrZU9w dGlvbmFsKHRvTGF5b3V0VW5pdChxdWlya3MoKS5pbml0aWFsTGluZUhlaWdodCgpKSkgfSB9Owor ICAgICAgICBhdXRvIGluaXRpYWxMaW5lQ29uc3RyYWludHMgPSBJbmxpbmVSZWN0IHsgbGluZUxv Z2ljYWxUb3AsIGNvbnN0cmFpbnRzLmhvcml6b250YWwubG9naWNhbExlZnQsIGNvbnN0cmFpbnRz Lmhvcml6b250YWwubG9naWNhbFdpZHRoLCBxdWlya3MoKS5pbml0aWFsTGluZUhlaWdodCgpIH07 CiAgICAgICAgIGF1dG8gbGluZUNvbnRlbnQgPSBsaW5lQnVpbGRlci5sYXlvdXRJbmxpbmVDb250 ZW50KG5lZWRzTGF5b3V0UmFuZ2UsIHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgaW5pdGlh bExpbmVDb25zdHJhaW50cywgaXNGaXJzdExpbmUpOwogICAgICAgICBhdXRvIGxpbmVMb2dpY2Fs UmVjdCA9IGNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGxpbmVDb250ZW50LCBjb25zdHJh aW50cy5ob3Jpem9udGFsKTsKIApAQCAtMTY4LDggKzE2OCw3IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zLCBMaW5lQnVp bGRlcjo6CiAgICAgICAgICAgICBsaW5lTG9naWNhbFRvcCA9IGdlb21ldHJ5KCkubG9naWNhbFRv cEZvck5leHRMaW5lKGxpbmVDb250ZW50LCBsaW5lTG9naWNhbFJlY3QuYm90dG9tKCksIGZsb2F0 aW5nQ29udGV4dCk7CiAgICAgICAgICAgICBpZiAobGluZUNvbnRlbnQuaXNMYXN0TGluZVdpdGhJ bmxpbmVDb250ZW50KSB7CiAgICAgICAgICAgICAgICAgLy8gVGhlIGZpbmFsIGNvbnRlbnQgaGVp Z2h0IG9mIHRoaXMgaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCBzaG91bGQgaW5jbHVkZSB0aGUg Y2xlYXJlZCBmbG9hdHMgYXMgd2VsbC4KLSAgICAgICAgICAgICAgICAvLyBGSVhNRTogQXJpdGht ZXRpYyBvdmVyZmxvdyBkdWUgdG8gbGluZUxvZ2ljYWxUb3AgYmVpbmcgYSBMYXlvdXRVbml0IHR5 cGUgd2hpbGUgdGhpcyBpcyBtb3N0bHkgSW5saW5lTGF5b3V0VW5pdChmbG9hdCkgdGVycml0b3J5 LgotICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZSgpLnNldENsZWFyR2FwQWZ0ZXJMYXN0 TGluZShzdGQ6Om1heDxJbmxpbmVMYXlvdXRVbml0PigwLCBsaW5lTG9naWNhbFRvcCAtIGxpbmVM b2dpY2FsUmVjdC5ib3R0b20oKSkpOworICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZSgp LnNldENsZWFyR2FwQWZ0ZXJMYXN0TGluZShsaW5lTG9naWNhbFRvcCAtIGxpbmVMb2dpY2FsUmVj dC5ib3R0b20oKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBXaGVuIHRoZSB0cmFp bGluZyBjb250ZW50IGlzIHBhcnRpYWwsIHdlIG5lZWQgdG8gcmV1c2UgdGhlIGxhc3QgSW5saW5l VGV4dEl0ZW0uCiAgICAgICAgICAgICBhdXRvIGxhc3RJbmxpbmVJdGVtTmVlZHNQYXJ0aWFsTGF5 b3V0ID0gbGluZUNvbnRlbnQucGFydGlhbFRyYWlsaW5nQ29udGVudExlbmd0aDsKQEAgLTE5Miw3 ICsxOTEsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KElubGlu ZUl0ZW1zJiBpbmxpbmVJdGVtcywgTGluZUJ1aWxkZXI6OgogICAgICAgICBBU1NFUlQobGluZUNv bnRlbnQucnVucy5pc0VtcHR5KCkpOwogICAgICAgICBBU1NFUlQobGluZUNvbnRlbnQuaGFzSW50 cnVzaXZlRmxvYXQpOwogICAgICAgICAvLyBNb3ZlIHRoZSBuZXh0IGxpbmUgYmVsb3cgdGhlIGlu dHJ1c2l2ZSBmbG9hdC4KLSAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdD b250ZXh0LmNvbnN0cmFpbnRzKGxpbmVMb2dpY2FsVG9wLCB0b0xheW91dFVuaXQobGluZUxvZ2lj YWxSZWN0LmJvdHRvbSgpKSk7CisgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IGZsb2F0 aW5nQ29udGV4dC5jb25zdHJhaW50cyh0b0xheW91dFVuaXQobGluZUxvZ2ljYWxUb3ApLCB0b0xh eW91dFVuaXQobGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgpKSk7CiAgICAgICAgIEFTU0VSVChmbG9h dENvbnN0cmFpbnRzLmxlZnQgfHwgZmxvYXRDb25zdHJhaW50cy5yaWdodCk7CiAgICAgICAgIHN0 YXRpYyBhdXRvIGluaWZpdGVQb2ludCA9IFBvaW50SW5Db250ZXh0Um9vdDo6bWF4KCk7CiAgICAg ICAgIC8vIEluIGNhc2Ugb2YgbGVmdCBhbmQgcmlnaHQgY29uc3RyYWludHMsIHdlIG5lZWQgdG8g cGljayB0aGUgb25lIHRoYXQncyBjbG9zZXIgdG8gdGhlIGN1cnJlbnQgbGluZS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcAppbmRleCAzZjkxNjQxNWVlZWJhOWU5NmZkZTMxNDg3YTQwOWEzOGIyNzU4 YzNlLi4zYjg2MDNlZTFmNDk5YjY2ZDIxNjVlMDg4ZjVmNjQ0YzlkMzQ3NzIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwCkBAIC0zMTIsMTUgKzMxMiwxNSBAQCBMaW5lQnVpbGRlcjo6TGluZUJ1 aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250 ZXh0LAogewogfQogCi1MaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91 dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBz aXplX3QgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoLCBjb25zdCBGb3JtYXR0aW5nQ29udGV4 dDo6Q29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBpbml0aWFsQ29uc3RyYWludHMsIGJvb2wg aXNGaXJzdExpbmUpCitMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91 dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBz aXplX3QgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoLCBjb25zdCBJbmxpbmVSZWN0JiBsaW5l TG9naWNhbENvbnN0cmFpbnRzLCBib29sIGlzRmlyc3RMaW5lKQogewotICAgIGF1dG8gdXNlZENv bnN0cmFpbnRzID0gY29uc3RyYWludHNGb3JMaW5lKGluaXRpYWxDb25zdHJhaW50cywgaXNGaXJz dExpbmUpOworICAgIGF1dG8gdXNlZENvbnN0cmFpbnRzID0gY29uc3RyYWludHNGb3JMaW5lKGxp bmVMb2dpY2FsQ29uc3RyYWludHMsIGlzRmlyc3RMaW5lKTsKICAgICBpbml0aWFsaXplKHVzZWRD b25zdHJhaW50cyk7CiAKICAgICBhdXRvIGNvbW1pdHRlZENvbnRlbnQgPSBwbGFjZUlubGluZUNv bnRlbnQobmVlZHNMYXlvdXRSYW5nZSwgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoKTsKICAg ICBhdXRvIGNvbW1pdHRlZFJhbmdlID0gY2xvc2UobmVlZHNMYXlvdXRSYW5nZSwgY29tbWl0dGVk Q29udGVudCk7CiAKLSAgICBhdXRvIGxpbmVMb2dpY2FsVG9wTGVmdCA9IElubGluZUxheW91dFBv aW50IHsgdXNlZENvbnN0cmFpbnRzLmxvZ2ljYWxMZWZ0LCBpbml0aWFsQ29uc3RyYWludHMudmVy dGljYWwubG9naWNhbFRvcCB9OworICAgIGF1dG8gbGluZUxvZ2ljYWxUb3BMZWZ0ID0gSW5saW5l TGF5b3V0UG9pbnQgeyB1c2VkQ29uc3RyYWludHMubG9naWNhbExlZnQsIGxpbmVMb2dpY2FsQ29u c3RyYWludHMudG9wKCkgfTsKICAgICBhdXRvIGlzTGFzdExpbmUgPSBpc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQoY29tbWl0dGVkUmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0 ZWRDb250ZW50LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIHJldHVybiBMaW5l Q29udGVudCB7IGNvbW1pdHRlZFJhbmdlLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFpbGlu Z0NvbnRlbnRMZW5ndGgsIG1fZmxvYXRzLCBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdAog ICAgICAgICAsIGxpbmVMb2dpY2FsVG9wTGVmdApAQCAtNDE5LDE3ICs0MTksMTcgQEAgTGluZUJ1 aWxkZXI6OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRlcjo6Y2xvc2UoY29uc3QgSW5saW5lSXRl bVJhbmdlJiBuZWVkc0xheW8KICAgICByZXR1cm4gbGluZVJhbmdlOwogfQogCi1MaW5lQnVpbGRl cjo6VXNlZENvbnN0cmFpbnRzIExpbmVCdWlsZGVyOjpjb25zdHJhaW50c0ZvckxpbmUoY29uc3Qg Rm9ybWF0dGluZ0NvbnRleHQ6OkNvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgaW5pdGlhbENv bnN0cmFpbnRzLCBib29sIGlzRmlyc3RMaW5lKQorTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50 cyBMaW5lQnVpbGRlcjo6Y29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZVJlY3QmIGxpbmVM b2dpY2FsQ29uc3RyYWludHMsIGJvb2wgaXNGaXJzdExpbmUpCiB7Ci0gICAgYXV0byBsaW5lTG9n aWNhbExlZnQgPSBpbml0aWFsQ29uc3RyYWludHMuaG9yaXpvbnRhbC5sb2dpY2FsTGVmdDsKLSAg ICBhdXRvIGxpbmVMb2dpY2FsVG9wID0gaW5pdGlhbENvbnN0cmFpbnRzLnZlcnRpY2FsLmxvZ2lj YWxUb3A7Ci0gICAgYXV0byBsaW5lTG9naWNhbFJpZ2h0ID0gbGluZUxvZ2ljYWxMZWZ0ICsgaW5p dGlhbENvbnN0cmFpbnRzLmhvcml6b250YWwubG9naWNhbFdpZHRoOworICAgIGF1dG8gbGluZUxv Z2ljYWxMZWZ0ID0gbGluZUxvZ2ljYWxDb25zdHJhaW50cy5sZWZ0KCk7CisgICAgYXV0byBsaW5l TG9naWNhbFRvcCA9IGxpbmVMb2dpY2FsQ29uc3RyYWludHMudG9wKCk7CisgICAgYXV0byBsaW5l TG9naWNhbFJpZ2h0ID0gbGluZUxvZ2ljYWxMZWZ0ICsgbGluZUxvZ2ljYWxDb25zdHJhaW50cy53 aWR0aCgpOwogICAgIGF1dG8gbGluZUlzQ29uc3RyYWluZWRCeUZsb2F0ID0gZmFsc2U7CiAKICAg ICAvLyBDaGVjayBmb3IgaW50cnVkaW5nIGZsb2F0cyBhbmQgYWRqdXN0IGxvZ2ljYWwgbGVmdC9h dmFpbGFibGUgd2lkdGggZm9yIHRoaXMgbGluZSBhY2NvcmRpbmdseS4KICAgICBpZiAoIW1fZmxv YXRpbmdDb250ZXh0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQg Zm9yIHZhcmlhYmxlIGxpbmUgaGVpZ2h0LCB3aGVyZSB0aGUgaW50cnVzaXZlIGZsb2F0cyBzaG91 bGQgYmUgcHJvYmVkIGFzIHRoZSBsaW5lIGhlaWdodCBncm93cy4KLSAgICAgICAgYXV0byBmbG9h dENvbnN0cmFpbnRzID0gbV9mbG9hdGluZ0NvbnRleHQuY29uc3RyYWludHModG9MYXlvdXRVbml0 KGxpbmVMb2dpY2FsVG9wKSwgdG9MYXlvdXRVbml0KGxpbmVMb2dpY2FsVG9wICsgKmluaXRpYWxD b25zdHJhaW50cy52ZXJ0aWNhbC5sb2dpY2FsSGVpZ2h0KSk7CisgICAgICAgIGF1dG8gZmxvYXRD b25zdHJhaW50cyA9IG1fZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHRvTGF5b3V0VW5pdChs aW5lTG9naWNhbFRvcCksIHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCArIGxpbmVMb2dpY2Fs Q29uc3RyYWludHMuaGVpZ2h0KCkpKTsKICAgICAgICAgLy8gQ2hlY2sgaWYgdGhlc2UgdmFsdWVz IGFjdHVhbGx5IGNvbnN0cmFpbiB0aGUgbGluZS4KICAgICAgICAgaWYgKGZsb2F0Q29uc3RyYWlu dHMubGVmdCAmJiBmbG9hdENvbnN0cmFpbnRzLmxlZnQtPnggPD0gbGluZUxvZ2ljYWxMZWZ0KQog ICAgICAgICAgICAgZmxvYXRDb25zdHJhaW50cy5sZWZ0ID0geyB9OwpAQCAtNDQ4LDcgKzQ0OCw3 IEBAIExpbmVCdWlsZGVyOjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6OmNvbnN0cmFpbnRz Rm9yTGluZShjb25zdCBGb3JtYXR0aW5nQ29uCiAgICAgICAgICAgICBsaW5lTG9naWNhbExlZnQg PSBmbG9hdENvbnN0cmFpbnRzLmxlZnQtPng7CiAgICAgICAgIH0gZWxzZSBpZiAoZmxvYXRDb25z dHJhaW50cy5yaWdodCkgewogICAgICAgICAgICAgLy8gUmlnaHQgZmxvYXQgYm94ZXMgbWF5IG92 ZXJmbG93IHRoZSBjb250YWluaW5nIGJsb2NrIG9uIHRoZSBsZWZ0LgotICAgICAgICAgICAgbGlu ZUxvZ2ljYWxSaWdodCA9IHN0ZDo6bWF4KGxpbmVMb2dpY2FsTGVmdCwgZmxvYXRDb25zdHJhaW50 cy5yaWdodC0+eCk7CisgICAgICAgICAgICBsaW5lTG9naWNhbFJpZ2h0ID0gc3RkOjptYXg8SW5s aW5lTGF5b3V0VW5pdD4obGluZUxvZ2ljYWxMZWZ0LCBmbG9hdENvbnN0cmFpbnRzLnJpZ2h0LT54 KTsKICAgICAgICAgfQogICAgIH0KIApAQCAtNDg3LDcgKzQ4Nyw3IEBAIExpbmVCdWlsZGVyOjpV c2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6OmNvbnN0cmFpbnRzRm9yTGluZShjb25zdCBGb3Jt YXR0aW5nQ29uCiAgICAgICAgIGF1dG8gdGV4dEluZGVudCA9IHJvb3Quc3R5bGUoKS50ZXh0SW5k ZW50KCk7CiAgICAgICAgIGlmICh0ZXh0SW5kZW50ID09IFJlbmRlclN0eWxlOjppbml0aWFsVGV4 dEluZGVudCgpKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgcmV0dXJuIHsgbWlu aW11bVZhbHVlRm9yTGVuZ3RoKHRleHRJbmRlbnQsIGluaXRpYWxDb25zdHJhaW50cy5ob3Jpem9u dGFsLmxvZ2ljYWxXaWR0aCkgfTsKKyAgICAgICAgcmV0dXJuIHsgbWluaW11bVZhbHVlRm9yTGVu Z3RoKHRleHRJbmRlbnQsIGxpbmVMb2dpY2FsQ29uc3RyYWludHMud2lkdGgoKSkgfTsKICAgICB9 OwogICAgIGxpbmVMb2dpY2FsTGVmdCArPSBjb21wdXRlZFRleHRJbmRlbnQoKTsKICAgICByZXR1 cm4gVXNlZENvbnN0cmFpbnRzIHsgbGluZUxvZ2ljYWxMZWZ0LCBsaW5lTG9naWNhbFJpZ2h0IC0g bGluZUxvZ2ljYWxMZWZ0LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5oCmluZGV4IGExY2U5NTg0NTE4MWVlYmY4MDJiMjAwYTE5MjFjZTgyZDFhNTNkZWYuLjgz NWM5OGE5OTk2YWZmYTIyYzU0MmFlZmExMmMzMWVkNWI5NTgwYmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuaApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNMYXN0TGluZVdp dGhJbmxpbmVDb250ZW50IHsgdHJ1ZSB9OwogICAgICAgICBjb25zdCBMaW5lOjpSdW5MaXN0JiBy dW5zOwogICAgIH07Ci0gICAgTGluZUNvbnRlbnQgbGF5b3V0SW5saW5lQ29udGVudChjb25zdCBJ bmxpbmVJdGVtUmFuZ2UmLCBzaXplX3QgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoLCBjb25z dCBGb3JtYXR0aW5nQ29udGV4dDo6Q29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBpbml0aWFs TGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlyc3RMaW5lKTsKKyAgICBMaW5lQ29udGVudCBsYXlv dXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYsIHNpemVfdCBwYXJ0aWFsTGVh ZGluZ0NvbnRlbnRMZW5ndGgsIGNvbnN0IElubGluZVJlY3QmIGluaXRpYWxMaW5lQ29uc3RyYWlu dHMsIGJvb2wgaXNGaXJzdExpbmUpOwogCiAgICAgc3RydWN0IEludHJpbnNpY0NvbnRlbnQgewog ICAgICAgICBJbmxpbmVJdGVtUmFuZ2UgaW5saW5lSXRlbVJhbmdlOwpAQCAtODksNyArODksNyBA QCBwcml2YXRlOgogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aCB7IDAgfTsKICAgICAgICAgYm9vbCBpc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CiAg ICAgfTsKLSAgICBVc2VkQ29uc3RyYWludHMgY29uc3RyYWludHNGb3JMaW5lKGNvbnN0IEZvcm1h dHRpbmdDb250ZXh0OjpDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGluaXRpYWxMaW5lQ29u c3RyYWludHMsIGJvb2wgaXNGaXJzdExpbmUpOworICAgIFVzZWRDb25zdHJhaW50cyBjb25zdHJh aW50c0ZvckxpbmUoY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVDb25zdHJhaW50cywgYm9v bCBpc0ZpcnN0TGluZSk7CiAgICAgdm9pZCBjb21taXRGbG9hdHMoY29uc3QgTGluZUNhbmRpZGF0 ZSYsIENvbW1pdEludHJ1c2l2ZUZsb2F0c09ubHkgPSBDb21taXRJbnRydXNpdmVGbG9hdHNPbmx5 OjpObyk7CiAgICAgUmVzdWx0IGhhbmRsZUZsb2F0c0FuZElubGluZUNvbnRlbnQoSW5saW5lQ29u dGVudEJyZWFrZXImLCBjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNv bnN0IExpbmVDYW5kaWRhdGUmKTsKICAgICBzaXplX3QgcmVidWlsZExpbmUoY29uc3QgSW5saW5l SXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBJbmxpbmVJdGVtJiBsYXN0SW5saW5l SXRlbVRvQWRkKTsK