199129 2019-06-22 13:51:49 -0700 [LFC][IFC] Non-baseline aligned inline container should not mutate the baseline 2019-06-23 08:14: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 1547126 0 zalan 2019-06-22 13:51:49 -0700 <span style="vertical-align: top">foobar</span> 1547127 1 webkit-bug-importer 2019-06-22 13:52:13 -0700 <rdar://problem/52022533> 1547129 2 372687 zalan 2019-06-22 13:57:17 -0700 Created attachment 372687 Patch 1547134 3 372689 zalan 2019-06-22 15:21:35 -0700 Created attachment 372689 Patch 1547161 4 372689 commit-queue 2019-06-23 08:14:49 -0700 Comment on attachment 372689 Patch Clearing flags on attachment: 372689 Committed r246719: <https://trac.webkit.org/changeset/246719> 1547162 5 commit-queue 2019-06-23 08:14:51 -0700 All reviewed patches have been landed. Closing bug. 372687 2019-06-22 13:57:17 -0700 2019-06-22 15:07:19 -0700 Patch bug-199129-20190622135715.patch text/plain 8934 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzJlMzU2YjY4ZDE0OTBk NTljZTk0MGIzMDQwZjU1OGNkNGQ3NDhiOS4uNGJmMDg5MjhmNzZiNDBlM2IxMGEzMWRjYmJkYmQz ZTUwZmQ2M2U1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBOb24tYmFz ZWxpbmUgYWxpZ25lZCBpbmxpbmUgY29udGFpbmVyIHNob3VsZCBub3QgbXV0YXRlIHRoZSBiYXNl bGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 MTI5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjAyMjUzMz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGJhc2VsaW5lIGFsaWduZWQgaW5s aW5lIGNvbnRhaW5lciAoPHNwYW4gc3R5bGU9InZlcnRpY2FsLWFsaWduZWQ6IGJhc2VsaW5lIj4p IHNob3VsZCBhZGp1c3QgbGluZSdzIGJhc2VsaW5lLgorICAgICAgICBUaGlzIHBhdGNoIGFsc28g Zml4ZXMgbV9iYXNlbGluZVRvcCdzIHZhbHVlIHdoZW4gd2UgYXBwbHkgdGhlIGluaXRpYWwgc3Ry dXQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVkRW1w dHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc1Zpc3VhbGx5RW1wdHkgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphZGp1c3RCYXNlbGluZUFuZExp bmVIZWlnaHQpOgorCiAyMDE5LTA2LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bSUZDXSBUaGUgYW5vbnltb3VzIElubGluZUJveCB3cmFwcGVyIGZv ciB0aGUgdGV4dCBub2RlIHNob3VsZCB0YWtlIHRoZSBwYXJlbnQgc3R5bGUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmlu ZGV4IGIxMjhjOGQ1MGM0NTMzN2E5NGUzMmZmZGVhYTM2MmUyZWQ3MzQ4OTYuLjdkNDYyZWZkYjI5 MTA1ZTM3NjgzNjIxNjA3Yzc4OThmMTg4OTUxOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC01NiwxNCArNTYs MjAgQEAgTGluZTo6TGluZShjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IElu aXRpYWxDb25zdHJhaW50cyYgaW5pdGlhbENvbnMKIHsKIH0KIAorc3RhdGljIGJvb2wgaXNJbmxp bmVDb250YWluZXJDb25zaWRlcmVkRW1wdHkoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRl LCBjb25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5v dCBjaGVjayB3aGV0aGVyIHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1w bHkgY2hlY2tzIGlmIHRoZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgZW1wdHkuCisg ICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94KTsKKyAgICByZXR1cm4gIShkaXNwbGF5Qm94Lmhvcml6b250YWxCb3JkZXIoKSB8 fCAoZGlzcGxheUJveC5ob3Jpem9udGFsUGFkZGluZygpICYmIGRpc3BsYXlCb3guaG9yaXpvbnRh bFBhZGRpbmcoKS52YWx1ZSgpKSk7Cit9CisKIGJvb2wgTGluZTo6aXNWaXN1YWxseUVtcHR5KCkg Y29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgY2FjaGVkIGluc3RlYWQgLWFz IHRoZSBpbmxpbmUgaXRlbXMgYXJlIGJlaW5nIGFkZGVkLgogICAgIC8vIFJldHVybiB0cnVlIGZv ciBlbXB0eSBpbmxpbmUgY29udGFpbmVycyBsaWtlIDxzcGFuPjwvc3Bhbj4uCiAgICAgZm9yIChh dXRvJiBydW4gOiBtX2NvbnRlbnQtPnJ1bnMoKSkgewogICAgICAgICBpZiAocnVuLT5pbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSkgewotICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9 IG1fbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChydW4tPmlubGluZUl0ZW0ubGF5 b3V0Qm94KCkpOwotICAgICAgICAgICAgaWYgKGRpc3BsYXlCb3guaG9yaXpvbnRhbEJvcmRlcigp IHx8IChkaXNwbGF5Qm94Lmhvcml6b250YWxQYWRkaW5nKCkgJiYgZGlzcGxheUJveC5ob3Jpem9u dGFsUGFkZGluZygpLnZhbHVlKCkpKQorICAgICAgICAgICAgaWYgKCFpc0lubGluZUNvbnRhaW5l ckNvbnNpZGVyZWRFbXB0eShtX2xheW91dFN0YXRlLCBydW4tPmlubGluZUl0ZW0ubGF5b3V0Qm94 KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CkBAIC0zMTMsNTkgKzMxOSw3MSBAQCB2b2lkIExpbmU6OmFkanVzdEJhc2Vs aW5lQW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0 CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKIAogICAgIGlmIChpbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBpbXBsaWVz IGJhc2VsaW5lIHZlcnRpY2FsIGFsaWdtZW50IGZvciB0aGUgaW5saW5lIGNvbnRhaW5lci4KKyAg ICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgc3RyZXRjaCB0aGUgbGluZSBieSB0aGVpciBmb250 IHNpemUuCisgICAgICAgIC8vIFZlcnRpY2FsIG1hcmdpbnMsIHBhZGRpbmdzIGFuZCBib3JkZXJz IGRvbid0IGNvbnRyaWJ1dGUgdG8gdGhlIGxpbmUgaGVpZ2h0LgogICAgICAgICBhdXRvJiBmb250 TWV0cmljcyA9IHN0eWxlLmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIGF1dG8gaGFsZkxlYWRpbmcg PSBoYWxmTGVhZGluZ01ldHJpY3MoZm9udE1ldHJpY3MsIHN0eWxlLmNvbXB1dGVkTGluZUhlaWdo dCgpKTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmRlc2NlbnQgPiAwKQotICAgICAgICAgICAg bV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9iYXNlbGluZS5kZXNjZW50LCBoYWxmTGVh ZGluZy5kZXNjZW50KTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmFzY2VudCA+IDApCi0gICAg ICAgICAgICBtX2Jhc2VsaW5lLmFzY2VudCA9IHN0ZDo6bWF4KG1fYmFzZWxpbmUuYXNjZW50LCBo YWxmTGVhZGluZy5hc2NlbnQpOwotICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjpt YXgobV9saW5lTG9naWNhbEhlaWdodCwgbV9iYXNlbGluZS5oZWlnaHQoKSk7CisgICAgICAgIExh eW91dFVuaXQgY29udGVudEhlaWdodDsKKyAgICAgICAgaWYgKHN0eWxlLnZlcnRpY2FsQWxpZ24o KSA9PSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkgeworICAgICAgICAgICAgYXV0byBoYWxmTGVh ZGluZyA9IGhhbGZMZWFkaW5nTWV0cmljcyhmb250TWV0cmljcywgc3R5bGUuY29tcHV0ZWRMaW5l SGVpZ2h0KCkpOworICAgICAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9i YXNlbGluZS5kZXNjZW50LCBzdGQ6Om1heChoYWxmTGVhZGluZy5kZXNjZW50LCBMYXlvdXRVbml0 IHsgfSkpOworICAgICAgICAgICAgbV9iYXNlbGluZS5hc2NlbnQgPSBzdGQ6Om1heChtX2Jhc2Vs aW5lLmFzY2VudCwgc3RkOjptYXgoaGFsZkxlYWRpbmcuYXNjZW50LCBMYXlvdXRVbml0IHsgfSkp OworICAgICAgICAgICAgY29udGVudEhlaWdodCA9IG1fYmFzZWxpbmUuaGVpZ2h0KCk7CisgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgY29udGVudEhlaWdodCA9IGZvbnRNZXRyaWNzLmhlaWdo dCgpOworICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgobV9saW5lTG9naWNh bEhlaWdodCwgY29udGVudEhlaWdodCk7CisgICAgICAgIG1fYmFzZWxpbmVUb3AgPSBzdGQ6Om1h eChtX2Jhc2VsaW5lVG9wLCBtX2xpbmVMb2dpY2FsSGVpZ2h0IC0gbV9iYXNlbGluZS5oZWlnaHQo KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgLy8gQXBwbHkgaW5pdGlhbCBzdHJ1dCBp ZiBuZWVkZWQuCisKICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSB8fCBpbmxpbmVJdGVtLmlz SGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgIC8vIEZvciB0ZXh0IGNvbnRlbnQgd2Ugc2V0IHRo ZSBiYXNlbGluZSBlaXRoZXIgdGhyb3VnaCB0aGUgaW5pdGlhbCBzdHJ1dCAoc2V0IGJ5IHRoZSBm b3JtYXR0aW5nIGNvbnRleHQgcm9vdCkgb3IKKyAgICAgICAgLy8gdGhyb3VnaCB0aGUgaW5saW5l IGNvbnRhaW5lciAoc3RhcnQpIC1zZWUgYWJvdmUuIE5vcm1hbGx5IHRoZSB0ZXh0IGNvbnRlbnQg aXRzZWxmIGRvZXMgbm90IHN0cmV0Y2ggdGhlIGxpbmUuCiAgICAgICAgIGlmICghbV9pbml0aWFs U3RydXQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1fYmFzZWxpbmUuYXNjZW50ID0g c3RkOjptYXgobV9pbml0aWFsU3RydXQtPmFzY2VudCwgbV9iYXNlbGluZS5hc2NlbnQpOwogICAg ICAgICBtX2Jhc2VsaW5lLmRlc2NlbnQgPSBzdGQ6Om1heChtX2luaXRpYWxTdHJ1dC0+ZGVzY2Vu dCwgbV9iYXNlbGluZS5kZXNjZW50KTsKICAgICAgICAgbV9saW5lTG9naWNhbEhlaWdodCA9IHN0 ZDo6bWF4KG1fbGluZUxvZ2ljYWxIZWlnaHQsIG1fYmFzZWxpbmUuaGVpZ2h0KCkpOworICAgICAg ICBtX2Jhc2VsaW5lVG9wID0gc3RkOjptYXgobV9iYXNlbGluZVRvcCwgbV9saW5lTG9naWNhbEhl aWdodCAtIG1fYmFzZWxpbmUuaGVpZ2h0KCkpOwogICAgICAgICBtX2luaXRpYWxTdHJ1dCA9IHsg fTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICAvLyBSZXBsYWNlZCBhbmQgbm9uLXJlcGxh Y2VkIGlubGluZSBsZXZlbCBib3guCi0gICAgc3dpdGNoIChpbmxpbmVJdGVtLnN0eWxlKCkudmVy dGljYWxBbGlnbigpKSB7Ci0gICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6IHsKLSAg ICAgICAgYXV0byBuZXdCYXNlbGluZUNhbmRpZGF0ZSA9IExpbmVCb3g6OkJhc2VsaW5lIHsgcnVu SGVpZ2h0LCAwIH07Ci0gICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYm IGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAg ICAgICAgIC8vIElubGluZS1ibG9ja3Mgd2l0aCBpbmxpbmUgY29udGVudCBhbHdheXMgaGF2ZSBi YXNlbGluZXMuCi0gICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBkb3duY2FzdDxJ bmxpbmVGb3JtYXR0aW5nU3RhdGU+KG1fbGF5b3V0U3RhdGUuZXN0YWJsaXNoZWRGb3JtYXR0aW5n U3RhdGUobGF5b3V0Qm94KSk7Ci0gICAgICAgICAgICAvLyBTcGVjIG1ha2VzIHVzIGdlbmVyYXRl IGF0IGxlYXN0IG9uZSBsaW5lIC1ldmVuIGlmIGl0IGlzIGVtcHR5LgotICAgICAgICAgICAgQVNT RVJUKCFmb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkuaXNFbXB0eSgpKTsKLSAgICAgICAgICAg IG5ld0Jhc2VsaW5lQ2FuZGlkYXRlID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLmxhc3Qo KS5iYXNlbGluZSgpOworCisgICAgaWYgKGlubGluZUl0ZW0uaXNCb3goKSkgeworICAgICAgICBz d2l0Y2ggKHN0eWxlLnZlcnRpY2FsQWxpZ24oKSkgeworICAgICAgICBjYXNlIFZlcnRpY2FsQWxp Z246OkJhc2VsaW5lOiB7CisgICAgICAgICAgICBhdXRvIG5ld0Jhc2VsaW5lQ2FuZGlkYXRlID0g TGluZUJveDo6QmFzZWxpbmUgeyBydW5IZWlnaHQsIDAgfTsKKyAgICAgICAgICAgIGlmIChsYXlv dXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYmIGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZv cm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgICAgICAgICAvLyBJbmxpbmUtYmxvY2tzIHdp dGggaW5saW5lIGNvbnRlbnQgYWx3YXlzIGhhdmUgYmFzZWxpbmVzLgorICAgICAgICAgICAgICAg IGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PElubGluZUZvcm1hdHRpbmdTdGF0ZT4o bV9sYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShsYXlvdXRCb3gpKTsKKyAg ICAgICAgICAgICAgICAvLyBTcGVjIG1ha2VzIHVzIGdlbmVyYXRlIGF0IGxlYXN0IG9uZSBsaW5l IC1ldmVuIGlmIGl0IGlzIGVtcHR5LgorICAgICAgICAgICAgICAgIEFTU0VSVCghZm9ybWF0dGlu Z1N0YXRlLmxpbmVCb3hlcygpLmlzRW1wdHkoKSk7CisgICAgICAgICAgICAgICAgbmV3QmFzZWxp bmVDYW5kaWRhdGUgPSBmb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkubGFzdCgpLmJhc2VsaW5l KCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBtX2Jhc2VsaW5lLmFzY2VudCA9IHN0ZDo6 bWF4KG5ld0Jhc2VsaW5lQ2FuZGlkYXRlLmFzY2VudCwgbV9iYXNlbGluZS5hc2NlbnQpOworICAg ICAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobmV3QmFzZWxpbmVDYW5kaWRh dGUuZGVzY2VudCwgbV9iYXNlbGluZS5kZXNjZW50KTsKKyAgICAgICAgICAgIG1fbGluZUxvZ2lj YWxIZWlnaHQgPSBzdGQ6Om1heChzdGQ6Om1heChtX2xpbmVMb2dpY2FsSGVpZ2h0LCBydW5IZWln aHQpLCBtX2Jhc2VsaW5lLmhlaWdodCgpKTsKKyAgICAgICAgICAgIC8vIEJhc2VsaW5lIGFzY2Vu dC9kZXNjZW50IG5ldmVyIHNocmluayAtPiBtYXguCisgICAgICAgICAgICBtX2Jhc2VsaW5lVG9w ID0gc3RkOjptYXgobV9iYXNlbGluZVRvcCwgbV9saW5lTG9naWNhbEhlaWdodCAtIG1fYmFzZWxp bmUuaGVpZ2h0KCkpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgbV9i YXNlbGluZS5hc2NlbnQgPSBzdGQ6Om1heChuZXdCYXNlbGluZUNhbmRpZGF0ZS5hc2NlbnQsIG1f YmFzZWxpbmUuYXNjZW50KTsKLSAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgo bmV3QmFzZWxpbmVDYW5kaWRhdGUuZGVzY2VudCwgbV9iYXNlbGluZS5kZXNjZW50KTsKLSAgICAg ICAgbV9saW5lTG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KHN0ZDo6bWF4KG1fbGluZUxvZ2ljYWxI ZWlnaHQsIHJ1bkhlaWdodCksIG1fYmFzZWxpbmUuaGVpZ2h0KCkpOwotICAgICAgICAvLyBCYXNl bGluZSBhc2NlbnQvZGVzY2VudCBuZXZlciBzaHJpbmsgLT4gbWF4LgotICAgICAgICBtX2Jhc2Vs aW5lVG9wID0gc3RkOjptYXgobV9iYXNlbGluZVRvcCwgbV9saW5lTG9naWNhbEhlaWdodCAtIG1f YmFzZWxpbmUuaGVpZ2h0KCkpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgY2FzZSBWZXJ0 aWNhbEFsaWduOjpUb3A6Ci0gICAgICAgIC8vIFRvcCBhbGlnbiBjb250ZW50IG5ldmVyIGNoYW5n ZXMgdGhlIGJhc2VsaW5lIG9mZnNldCwgaXQgb25seSBwdXNoZXMgdGhlIGJvdHRvbSBvZiB0aGUg bGluZSBmdXJ0aGVyIGRvd24uCi0gICAgICAgIG1fbGluZUxvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1h eChydW5IZWlnaHQsIG1fbGluZUxvZ2ljYWxIZWlnaHQpOwotICAgICAgICBicmVhazsKLSAgICBj YXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbToKLSAgICAgICAgLy8gQm90dG9tIGFsaWduZWQsIHRh bGwgY29udGVudCBwdXNoZXMgdGhlIGJhc2VsaW5lIGZ1cnRoZXIgZG93biBmcm9tIHRoZSBsaW5l IHRvcC4KLSAgICAgICAgaWYgKHJ1bkhlaWdodCA+IG1fbGluZUxvZ2ljYWxIZWlnaHQpIHsKLSAg ICAgICAgICAgIG1fYmFzZWxpbmVUb3AgKz0gKHJ1bkhlaWdodCAtIG1fbGluZUxvZ2ljYWxIZWln aHQpOwotICAgICAgICAgICAgbV9saW5lTG9naWNhbEhlaWdodCA9IHJ1bkhlaWdodDsKKyAgICAg ICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUb3A6CisgICAgICAgICAgICAvLyBUb3AgYWxpZ24gY29u dGVudCBuZXZlciBjaGFuZ2VzIHRoZSBiYXNlbGluZSBvZmZzZXQsIGl0IG9ubHkgcHVzaGVzIHRo ZSBib3R0b20gb2YgdGhlIGxpbmUgZnVydGhlciBkb3duLgorICAgICAgICAgICAgbV9saW5lTG9n aWNhbEhlaWdodCA9IHN0ZDo6bWF4KHJ1bkhlaWdodCwgbV9saW5lTG9naWNhbEhlaWdodCk7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCb3R0b206Cisg ICAgICAgICAgICAvLyBCb3R0b20gYWxpZ25lZCwgdGFsbCBjb250ZW50IHB1c2hlcyB0aGUgYmFz ZWxpbmUgZnVydGhlciBkb3duIGZyb20gdGhlIGxpbmUgdG9wLgorICAgICAgICAgICAgaWYgKHJ1 bkhlaWdodCA+IG1fbGluZUxvZ2ljYWxIZWlnaHQpIHsKKyAgICAgICAgICAgICAgICBtX2Jhc2Vs aW5lVG9wICs9IChydW5IZWlnaHQgLSBtX2xpbmVMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAg ICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gcnVuSGVpZ2h0OworICAgICAgICAgICAgfQorICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9U X0lNUExFTUVOVEVEX1lFVCgpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAg ICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9Z RVQoKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICB9CisgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiB9CiAKIExheW91dFVuaXQgTGluZTo6aW5saW5lSXRlbUNvbnRlbnRI ZWlnaHQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkgY29uc3QK 372689 2019-06-22 15:21:35 -0700 2019-06-23 08:14:49 -0700 Patch bug-199129-20190622152133.patch text/plain 9083 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzJlMzU2YjY4ZDE0OTBk NTljZTk0MGIzMDQwZjU1OGNkNGQ3NDhiOS4uNGJmMDg5MjhmNzZiNDBlM2IxMGEzMWRjYmJkYmQz ZTUwZmQ2M2U1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBOb24tYmFz ZWxpbmUgYWxpZ25lZCBpbmxpbmUgY29udGFpbmVyIHNob3VsZCBub3QgbXV0YXRlIHRoZSBiYXNl bGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 MTI5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjAyMjUzMz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IGJhc2VsaW5lIGFsaWduZWQgaW5s aW5lIGNvbnRhaW5lciAoPHNwYW4gc3R5bGU9InZlcnRpY2FsLWFsaWduZWQ6IGJhc2VsaW5lIj4p IHNob3VsZCBhZGp1c3QgbGluZSdzIGJhc2VsaW5lLgorICAgICAgICBUaGlzIHBhdGNoIGFsc28g Zml4ZXMgbV9iYXNlbGluZVRvcCdzIHZhbHVlIHdoZW4gd2UgYXBwbHkgdGhlIGluaXRpYWwgc3Ry dXQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVkRW1w dHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc1Zpc3VhbGx5RW1wdHkgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphZGp1c3RCYXNlbGluZUFuZExp bmVIZWlnaHQpOgorCiAyMDE5LTA2LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bSUZDXSBUaGUgYW5vbnltb3VzIElubGluZUJveCB3cmFwcGVyIGZv ciB0aGUgdGV4dCBub2RlIHNob3VsZCB0YWtlIHRoZSBwYXJlbnQgc3R5bGUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmlu ZGV4IGIxMjhjOGQ1MGM0NTMzN2E5NGUzMmZmZGVhYTM2MmUyZWQ3MzQ4OTYuLjg3Y2E0MjE2M2Rh YWQ0ZjMyYjAzNGVhODZlYWY0YmRmZDY2OGM4NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC01NiwxNCArNTYs MjAgQEAgTGluZTo6TGluZShjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IElu aXRpYWxDb25zdHJhaW50cyYgaW5pdGlhbENvbnMKIHsKIH0KIAorc3RhdGljIGJvb2wgaXNJbmxp bmVDb250YWluZXJDb25zaWRlcmVkRW1wdHkoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRl LCBjb25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5v dCBjaGVjayB3aGV0aGVyIHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1w bHkgY2hlY2tzIGlmIHRoZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgZW1wdHkuCisg ICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94KTsKKyAgICByZXR1cm4gIShkaXNwbGF5Qm94Lmhvcml6b250YWxCb3JkZXIoKSB8 fCAoZGlzcGxheUJveC5ob3Jpem9udGFsUGFkZGluZygpICYmIGRpc3BsYXlCb3guaG9yaXpvbnRh bFBhZGRpbmcoKS52YWx1ZSgpKSk7Cit9CisKIGJvb2wgTGluZTo6aXNWaXN1YWxseUVtcHR5KCkg Y29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgY2FjaGVkIGluc3RlYWQgLWFz IHRoZSBpbmxpbmUgaXRlbXMgYXJlIGJlaW5nIGFkZGVkLgogICAgIC8vIFJldHVybiB0cnVlIGZv ciBlbXB0eSBpbmxpbmUgY29udGFpbmVycyBsaWtlIDxzcGFuPjwvc3Bhbj4uCiAgICAgZm9yIChh dXRvJiBydW4gOiBtX2NvbnRlbnQtPnJ1bnMoKSkgewogICAgICAgICBpZiAocnVuLT5pbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSkgewotICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9 IG1fbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChydW4tPmlubGluZUl0ZW0ubGF5 b3V0Qm94KCkpOwotICAgICAgICAgICAgaWYgKGRpc3BsYXlCb3guaG9yaXpvbnRhbEJvcmRlcigp IHx8IChkaXNwbGF5Qm94Lmhvcml6b250YWxQYWRkaW5nKCkgJiYgZGlzcGxheUJveC5ob3Jpem9u dGFsUGFkZGluZygpLnZhbHVlKCkpKQorICAgICAgICAgICAgaWYgKCFpc0lubGluZUNvbnRhaW5l ckNvbnNpZGVyZWRFbXB0eShtX2xheW91dFN0YXRlLCBydW4tPmlubGluZUl0ZW0ubGF5b3V0Qm94 KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CkBAIC0zMTMsNTkgKzMxOSw3NCBAQCB2b2lkIExpbmU6OmFkanVzdEJhc2Vs aW5lQW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0 CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKIAogICAgIGlmIChpbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBpbXBsaWVz IGJhc2VsaW5lIHZlcnRpY2FsIGFsaWdtZW50IGZvciB0aGUgaW5saW5lIGNvbnRhaW5lci4KKyAg ICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgc3RyZXRjaCB0aGUgbGluZSBieSB0aGVpciBmb250 IHNpemUuCisgICAgICAgIC8vIFZlcnRpY2FsIG1hcmdpbnMsIHBhZGRpbmdzIGFuZCBib3JkZXJz IGRvbid0IGNvbnRyaWJ1dGUgdG8gdGhlIGxpbmUgaGVpZ2h0LgogICAgICAgICBhdXRvJiBmb250 TWV0cmljcyA9IHN0eWxlLmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIGF1dG8gaGFsZkxlYWRpbmcg PSBoYWxmTGVhZGluZ01ldHJpY3MoZm9udE1ldHJpY3MsIHN0eWxlLmNvbXB1dGVkTGluZUhlaWdo dCgpKTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmRlc2NlbnQgPiAwKQotICAgICAgICAgICAg bV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9iYXNlbGluZS5kZXNjZW50LCBoYWxmTGVh ZGluZy5kZXNjZW50KTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmFzY2VudCA+IDApCi0gICAg ICAgICAgICBtX2Jhc2VsaW5lLmFzY2VudCA9IHN0ZDo6bWF4KG1fYmFzZWxpbmUuYXNjZW50LCBo YWxmTGVhZGluZy5hc2NlbnQpOwotICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjpt YXgobV9saW5lTG9naWNhbEhlaWdodCwgbV9iYXNlbGluZS5oZWlnaHQoKSk7CisgICAgICAgIExh eW91dFVuaXQgY29udGVudEhlaWdodDsKKyAgICAgICAgaWYgKHN0eWxlLnZlcnRpY2FsQWxpZ24o KSA9PSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkgeworICAgICAgICAgICAgYXV0byBoYWxmTGVh ZGluZyA9IGhhbGZMZWFkaW5nTWV0cmljcyhmb250TWV0cmljcywgc3R5bGUuY29tcHV0ZWRMaW5l SGVpZ2h0KCkpOworICAgICAgICAgICAgLy8gQm90aCBoYWxmbGVhZGluZyBhc2NlbnQgYW5kIGRl c2NlbnQgY291bGQgYmUgbmVnYXRpdmUgKHRhbGwgZm9udCB2cy4gc21hbGwgbGluZS1oZWlnaHQg dmFsdWUpCisgICAgICAgICAgICBpZiAoaGFsZkxlYWRpbmcuZGVzY2VudCA+IDApCisgICAgICAg ICAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9iYXNlbGluZS5kZXNjZW50 LCBoYWxmTGVhZGluZy5kZXNjZW50KTsKKyAgICAgICAgICAgIGlmIChoYWxmTGVhZGluZy5hc2Nl bnQgPiAwKQorICAgICAgICAgICAgICAgIG1fYmFzZWxpbmUuYXNjZW50ID0gc3RkOjptYXgobV9i YXNlbGluZS5hc2NlbnQsIGhhbGZMZWFkaW5nLmFzY2VudCk7CisgICAgICAgICAgICBjb250ZW50 SGVpZ2h0ID0gbV9iYXNlbGluZS5oZWlnaHQoKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBjb250ZW50SGVpZ2h0ID0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7CisgICAgICAgIG1fbGluZUxv Z2ljYWxIZWlnaHQgPSBzdGQ6Om1heChtX2xpbmVMb2dpY2FsSGVpZ2h0LCBjb250ZW50SGVpZ2h0 KTsKKyAgICAgICAgbV9iYXNlbGluZVRvcCA9IHN0ZDo6bWF4KG1fYmFzZWxpbmVUb3AsIG1fbGlu ZUxvZ2ljYWxIZWlnaHQgLSBtX2Jhc2VsaW5lLmhlaWdodCgpKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KLSAgICAvLyBBcHBseSBpbml0aWFsIHN0cnV0IGlmIG5lZWRlZC4KKwogICAgIGlmIChp bmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAg ICAgICAgLy8gRm9yIHRleHQgY29udGVudCB3ZSBzZXQgdGhlIGJhc2VsaW5lIGVpdGhlciB0aHJv dWdoIHRoZSBpbml0aWFsIHN0cnV0IChzZXQgYnkgdGhlIGZvcm1hdHRpbmcgY29udGV4dCByb290 KSBvcgorICAgICAgICAvLyB0aHJvdWdoIHRoZSBpbmxpbmUgY29udGFpbmVyIChzdGFydCkgLXNl ZSBhYm92ZS4gTm9ybWFsbHkgdGhlIHRleHQgY29udGVudCBpdHNlbGYgZG9lcyBub3Qgc3RyZXRj aCB0aGUgbGluZS4KICAgICAgICAgaWYgKCFtX2luaXRpYWxTdHJ1dCkKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgbV9iYXNlbGluZS5hc2NlbnQgPSBzdGQ6Om1heChtX2luaXRpYWxTdHJ1 dC0+YXNjZW50LCBtX2Jhc2VsaW5lLmFzY2VudCk7CiAgICAgICAgIG1fYmFzZWxpbmUuZGVzY2Vu dCA9IHN0ZDo6bWF4KG1faW5pdGlhbFN0cnV0LT5kZXNjZW50LCBtX2Jhc2VsaW5lLmRlc2NlbnQp OwogICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgobV9saW5lTG9naWNhbEhl aWdodCwgbV9iYXNlbGluZS5oZWlnaHQoKSk7CisgICAgICAgIG1fYmFzZWxpbmVUb3AgPSBzdGQ6 Om1heChtX2Jhc2VsaW5lVG9wLCBtX2xpbmVMb2dpY2FsSGVpZ2h0IC0gbV9iYXNlbGluZS5oZWln aHQoKSk7CiAgICAgICAgIG1faW5pdGlhbFN0cnV0ID0geyB9OwogICAgICAgICByZXR1cm47CiAg ICAgfQotICAgIC8vIFJlcGxhY2VkIGFuZCBub24tcmVwbGFjZWQgaW5saW5lIGxldmVsIGJveC4K LSAgICBzd2l0Y2ggKGlubGluZUl0ZW0uc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCkpIHsKLSAgICAg Y2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZTogewotICAgICAgICBhdXRvIG5ld0Jhc2VsaW5l Q2FuZGlkYXRlID0gTGluZUJveDo6QmFzZWxpbmUgeyBydW5IZWlnaHQsIDAgfTsKLSAgICAgICAg aWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5b3V0Qm94LmVzdGFibGlzaGVz SW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAgLy8gSW5saW5lLWJsb2Nr cyB3aXRoIGlubGluZSBjb250ZW50IGFsd2F5cyBoYXZlIGJhc2VsaW5lcy4KLSAgICAgICAgICAg IGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PElubGluZUZvcm1hdHRpbmdTdGF0ZT4o bV9sYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShsYXlvdXRCb3gpKTsKLSAg ICAgICAgICAgIC8vIFNwZWMgbWFrZXMgdXMgZ2VuZXJhdGUgYXQgbGVhc3Qgb25lIGxpbmUgLWV2 ZW4gaWYgaXQgaXMgZW1wdHkuCi0gICAgICAgICAgICBBU1NFUlQoIWZvcm1hdHRpbmdTdGF0ZS5s aW5lQm94ZXMoKS5pc0VtcHR5KCkpOwotICAgICAgICAgICAgbmV3QmFzZWxpbmVDYW5kaWRhdGUg PSBmb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkubGFzdCgpLmJhc2VsaW5lKCk7CisKKyAgICBp ZiAoaW5saW5lSXRlbS5pc0JveCgpKSB7CisgICAgICAgIHN3aXRjaCAoc3R5bGUudmVydGljYWxB bGlnbigpKSB7CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxpbmU6IHsKKyAgICAg ICAgICAgIGF1dG8gbmV3QmFzZWxpbmVDYW5kaWRhdGUgPSBMaW5lQm94OjpCYXNlbGluZSB7IHJ1 bkhlaWdodCwgMCB9OworICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94 KCkgJiYgbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewor ICAgICAgICAgICAgICAgIC8vIElubGluZS1ibG9ja3Mgd2l0aCBpbmxpbmUgY29udGVudCBhbHdh eXMgaGF2ZSBiYXNlbGluZXMuCisgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRl ID0gZG93bmNhc3Q8SW5saW5lRm9ybWF0dGluZ1N0YXRlPihtX2xheW91dFN0YXRlLmVzdGFibGlz aGVkRm9ybWF0dGluZ1N0YXRlKGxheW91dEJveCkpOworICAgICAgICAgICAgICAgIC8vIFNwZWMg bWFrZXMgdXMgZ2VuZXJhdGUgYXQgbGVhc3Qgb25lIGxpbmUgLWV2ZW4gaWYgaXQgaXMgZW1wdHku CisgICAgICAgICAgICAgICAgQVNTRVJUKCFmb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkuaXNF bXB0eSgpKTsKKyAgICAgICAgICAgICAgICBuZXdCYXNlbGluZUNhbmRpZGF0ZSA9IGZvcm1hdHRp bmdTdGF0ZS5saW5lQm94ZXMoKS5sYXN0KCkuYmFzZWxpbmUoKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIG1fYmFzZWxpbmUuYXNjZW50ID0gc3RkOjptYXgobmV3QmFzZWxpbmVDYW5kaWRh dGUuYXNjZW50LCBtX2Jhc2VsaW5lLmFzY2VudCk7CisgICAgICAgICAgICBtX2Jhc2VsaW5lLmRl c2NlbnQgPSBzdGQ6Om1heChuZXdCYXNlbGluZUNhbmRpZGF0ZS5kZXNjZW50LCBtX2Jhc2VsaW5l LmRlc2NlbnQpOworICAgICAgICAgICAgbV9saW5lTG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KHN0 ZDo6bWF4KG1fbGluZUxvZ2ljYWxIZWlnaHQsIHJ1bkhlaWdodCksIG1fYmFzZWxpbmUuaGVpZ2h0 KCkpOworICAgICAgICAgICAgLy8gQmFzZWxpbmUgYXNjZW50L2Rlc2NlbnQgbmV2ZXIgc2hyaW5r IC0+IG1heC4KKyAgICAgICAgICAgIG1fYmFzZWxpbmVUb3AgPSBzdGQ6Om1heChtX2Jhc2VsaW5l VG9wLCBtX2xpbmVMb2dpY2FsSGVpZ2h0IC0gbV9iYXNlbGluZS5oZWlnaHQoKSk7CisgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQotICAgICAgICBtX2Jhc2VsaW5lLmFzY2VudCA9IHN0ZDo6 bWF4KG5ld0Jhc2VsaW5lQ2FuZGlkYXRlLmFzY2VudCwgbV9iYXNlbGluZS5hc2NlbnQpOwotICAg ICAgICBtX2Jhc2VsaW5lLmRlc2NlbnQgPSBzdGQ6Om1heChuZXdCYXNlbGluZUNhbmRpZGF0ZS5k ZXNjZW50LCBtX2Jhc2VsaW5lLmRlc2NlbnQpOwotICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0 ID0gc3RkOjptYXgoc3RkOjptYXgobV9saW5lTG9naWNhbEhlaWdodCwgcnVuSGVpZ2h0KSwgbV9i YXNlbGluZS5oZWlnaHQoKSk7Ci0gICAgICAgIC8vIEJhc2VsaW5lIGFzY2VudC9kZXNjZW50IG5l dmVyIHNocmluayAtPiBtYXguCi0gICAgICAgIG1fYmFzZWxpbmVUb3AgPSBzdGQ6Om1heChtX2Jh c2VsaW5lVG9wLCBtX2xpbmVMb2dpY2FsSGVpZ2h0IC0gbV9iYXNlbGluZS5oZWlnaHQoKSk7Ci0g ICAgICAgIGJyZWFrOwotICAgIH0KLSAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRvcDoKLSAgICAg ICAgLy8gVG9wIGFsaWduIGNvbnRlbnQgbmV2ZXIgY2hhbmdlcyB0aGUgYmFzZWxpbmUgb2Zmc2V0 LCBpdCBvbmx5IHB1c2hlcyB0aGUgYm90dG9tIG9mIHRoZSBsaW5lIGZ1cnRoZXIgZG93bi4KLSAg ICAgICAgbV9saW5lTG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KHJ1bkhlaWdodCwgbV9saW5lTG9n aWNhbEhlaWdodCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVmVydGljYWxBbGlnbjo6Qm90 dG9tOgotICAgICAgICAvLyBCb3R0b20gYWxpZ25lZCwgdGFsbCBjb250ZW50IHB1c2hlcyB0aGUg YmFzZWxpbmUgZnVydGhlciBkb3duIGZyb20gdGhlIGxpbmUgdG9wLgotICAgICAgICBpZiAocnVu SGVpZ2h0ID4gbV9saW5lTG9naWNhbEhlaWdodCkgewotICAgICAgICAgICAgbV9iYXNlbGluZVRv cCArPSAocnVuSGVpZ2h0IC0gbV9saW5lTG9naWNhbEhlaWdodCk7Ci0gICAgICAgICAgICBtX2xp bmVMb2dpY2FsSGVpZ2h0ID0gcnVuSGVpZ2h0OworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246 OlRvcDoKKyAgICAgICAgICAgIC8vIFRvcCBhbGlnbiBjb250ZW50IG5ldmVyIGNoYW5nZXMgdGhl IGJhc2VsaW5lIG9mZnNldCwgaXQgb25seSBwdXNoZXMgdGhlIGJvdHRvbSBvZiB0aGUgbGluZSBm dXJ0aGVyIGRvd24uCisgICAgICAgICAgICBtX2xpbmVMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgo cnVuSGVpZ2h0LCBtX2xpbmVMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbToKKyAgICAgICAgICAgIC8vIEJvdHRvbSBh bGlnbmVkLCB0YWxsIGNvbnRlbnQgcHVzaGVzIHRoZSBiYXNlbGluZSBmdXJ0aGVyIGRvd24gZnJv bSB0aGUgbGluZSB0b3AuCisgICAgICAgICAgICBpZiAocnVuSGVpZ2h0ID4gbV9saW5lTG9naWNh bEhlaWdodCkgeworICAgICAgICAgICAgICAgIG1fYmFzZWxpbmVUb3AgKz0gKHJ1bkhlaWdodCAt IG1fbGluZUxvZ2ljYWxIZWlnaHQpOworICAgICAgICAgICAgICAgIG1fbGluZUxvZ2ljYWxIZWln aHQgPSBydW5IZWlnaHQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Cisg ICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgICAgICBicmVhazsKLSAgICBkZWZhdWx0 OgotICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOwotICAgICAgICBicmVhazsK KyAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAog TGF5b3V0VW5pdCBMaW5lOjppbmxpbmVJdGVtQ29udGVudEhlaWdodChjb25zdCBJbmxpbmVJdGVt JiBpbmxpbmVJdGVtKSBjb25zdAo=