185858 2018-05-21 22:04:55 -0700 [LFC] Implement positioning for non-replaced out-of-flow elements. 2018-05-22 08:07:18 -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 sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1426039 0 zalan 2018-05-21 22:04:55 -0700 ssia. 1426042 1 340954 zalan 2018-05-21 22:10:18 -0700 Created attachment 340954 Patch 1426134 2 340980 zalan 2018-05-22 06:46:25 -0700 Created attachment 340980 Patch 1426156 3 340980 commit-queue 2018-05-22 08:06:32 -0700 Comment on attachment 340980 Patch Clearing flags on attachment: 340980 Committed r232065: <https://trac.webkit.org/changeset/232065> 1426157 4 commit-queue 2018-05-22 08:06:34 -0700 All reviewed patches have been landed. Closing bug. 1426158 5 webkit-bug-importer 2018-05-22 08:07:18 -0700 <rdar://problem/40451021> 340954 2018-05-21 22:10:18 -0700 2018-05-22 06:46:23 -0700 Patch bug-185858-20180521221017.patch text/plain 10782 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxOTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWJmOTM0NTA5NmQ3MWRl MDU5YzYwZGUwYWIxODI3Yzg3YTU4ZTdkZi4uNmM3OTMxYjYyNTczYzc2NmJlNDY5NDRjNjY0NDJh MTk3MGUzNGQxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHBv c2l0aW9uaW5nIGZvciBub24tcmVwbGFjZWQgb3V0LW9mLWZsb3cgZWxlbWVudHMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU4NTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjZXJ0YWluIGNhc2Vz LCB0aGUgb3V0LW9mLWZsb3cgZWxlbWVudCdzIGZpbmFsIHBvc2l0aW9uIGRlcGVuZHMgb24gdGhl IGVsZW1lbnQncyBzaXplLgorICAgICAgICBDYWxsIGNvbXB1dGVPdXRPZkZsb3dQb3NpdGlvbigp IGFmdGVyIHdpZHRoL2hlaWdodCBhcmUgcmVzb2x2ZWQuCisKKyAgICAgICAgKiBsYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRz IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFBvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dSZXBsYWNlZFBv c2l0aW9uIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKwog MjAxOC0wNS0xOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdIEltcGxlbWVudCBoZWlnaHQgY29tcHV0YXRpb24gZm9yIG5vbi1yZXBsYWNlZCBmbG9hdGlu ZyBlbGVtZW50cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IGIxOTdlYTU2MzE4ZTRhZTQ1MGJiYjQwM2M0MjYyMDA1NGFkNWNiNGIuLmQwYTVmODVh NjU1MTMwZWJlYzMzYjMyM2E3MDJiMDY2NjM2NTE4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNTYsOCArNTYsMTMgQEAgdm9pZCBGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihjb25zdCBCb3gmLCBE aXNwbGF5OjpCb3gKIHsKIH0KIAotdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9m Rmxvd1Bvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0Cit2b2lkIEZvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oTGF5b3V0Q29udGV4dCYgbGF5 b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJv eCkgY29uc3QKIHsKKyAgICBpZiAoIWxheW91dEJveC5yZXBsYWNlZCgpKSB7CisgICAgICAgIGNv bXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFBvc2l0aW9uKGxheW91dENvbnRleHQsIGxheW91dEJv eCwgZGlzcGxheUJveCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgY29tcHV0ZU91dE9m Rmxvd1JlcGxhY2VkUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94 KTsKIH0KIAogdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoKExheW91dENvbnRl eHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5OjpCb3gmIGRp c3BsYXlCb3gpIGNvbnN0CkBAIC0xNDYsNyArMTUxLDExIEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKExheW91dENvbnRleHQmIGxheW91dENvbnRl eHQpCiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpvdXRPZkZsb3dCb3g7CiAgICAgICAgIGF1 dG8mIGRpc3BsYXlCb3ggPSBsYXlvdXRDb250ZXh0LmNyZWF0ZURpc3BsYXlCb3gobGF5b3V0Qm94 KTsKIAotICAgICAgICBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24obGF5b3V0Qm94LCBkaXNwbGF5 Qm94KTsKKyAgICAgICAgLy8gVGhlIHRlcm0gInN0YXRpYyBwb3NpdGlvbiIgKG9mIGFuIGVsZW1l bnQpIHJlZmVycywgcm91Z2hseSwgdG8gdGhlIHBvc2l0aW9uIGFuIGVsZW1lbnQgd291bGQgaGF2 ZSBoYWQgaW4gdGhlIG5vcm1hbCBmbG93LgorICAgICAgICAvLyBNb3JlIHByZWNpc2VseSwgdGhl IHN0YXRpYyBwb3NpdGlvbiBmb3IgJ3RvcCcgaXMgdGhlIGRpc3RhbmNlIGZyb20gdGhlIHRvcCBl ZGdlIG9mIHRoZSBjb250YWluaW5nIGJsb2NrIHRvIHRoZSB0b3AgbWFyZ2luIGVkZ2UKKyAgICAg ICAgLy8gb2YgYSBoeXBvdGhldGljYWwgYm94IHRoYXQgd291bGQgaGF2ZSBiZWVuIHRoZSBmaXJz dCBib3ggb2YgdGhlIGVsZW1lbnQgaWYgaXRzIHNwZWNpZmllZCAncG9zaXRpb24nIHZhbHVlIGhh ZCBiZWVuICdzdGF0aWMnIGFuZAorICAgICAgICAvLyBpdHMgc3BlY2lmaWVkICdmbG9hdCcgaGFk IGJlZW4gJ25vbmUnIGFuZCBpdHMgc3BlY2lmaWVkICdjbGVhcicgaGFkIGJlZW4gJ25vbmUnLgor ICAgICAgICBjb21wdXRlU3RhdGljUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBk aXNwbGF5Qm94KTsKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1dpZHRoKGxheW91dENvbnRleHQs IGxheW91dEJveCwgZGlzcGxheUJveCk7CiAKICAgICAgICAgQVNTRVJUKGxheW91dEJveC5lc3Rh Ymxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwpAQCAtMTU0LDYgKzE2Myw3IEBAIHZvaWQgRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKExheW91dENvbnRleHQm IGxheW91dENvbnRleHQpCiAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQobGF5b3V0 Q29udGV4dCwgbGF5b3V0Q29udGV4dC5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShsYXlvdXRC b3gsICpmb3JtYXR0aW5nQ29udGV4dCkpOwogCiAgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dIZWln aHQobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKKyAgICAgICAgY29tcHV0 ZU91dE9mRmxvd1Bvc2l0aW9uKGxheW91dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7 CiAgICAgfQogfQogCkBAIC00NDIsNiArNDUyLDEwNSBAQCBMYXlvdXRVbml0IEZvcm1hdHRpbmdD b250ZXh0OjpzaHJpbmtUb0ZpdFdpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBjb25z dAogICAgIHJldHVybiAwOwogfQogCit2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0 T2ZGbG93Tm9uUmVwbGFjZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAorewor ICAgIC8vIDEwLjMuNyBBYnNvbHV0ZWx5IHBvc2l0aW9uZWQsIG5vbi1yZXBsYWNlZCBlbGVtZW50 cyAobGVmdC9yaWdodCkKKyAgICAvLyAxMC42LjQgQWJzb2x1dGVseSBwb3NpdGlvbmVkLCBub24t cmVwbGFjZWQgZWxlbWVudHMgKHRvcC9ib3R0b20pCisKKyAgICAvLyBBdCB0aGlzIHBvaW50IHdl J3ZlIHRoZSBzaXplIGNvbXB1dGVkLgorICAgIGF1dG8gc2l6ZSA9IGRpc3BsYXlCb3guc2l6ZSgp OworICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisKKyAgICAvLyAxMC42LjQg QWJzb2x1dGVseSBwb3NpdGlvbmVkLCBub24tcmVwbGFjZWQgZWxlbWVudHMKKyAgICBhdXRvIHRv cCA9IHN0eWxlLmxvZ2ljYWxUb3AoKTsKKyAgICBhdXRvIGJvdHRvbSA9IHN0eWxlLmxvZ2ljYWxC b3R0b20oKTsKKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IGxheW91dENvbnRleHQu ZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS0+aGVp Z2h0KCk7CisKKyAgICAvLyAndG9wJyArICdtYXJnaW4tdG9wJyArICdib3JkZXItdG9wLXdpZHRo JyArICdwYWRkaW5nLXRvcCcgKyAnaGVpZ2h0JyArICdwYWRkaW5nLWJvdHRvbScgKyAnYm9yZGVy LWJvdHRvbS13aWR0aCcgKyAnbWFyZ2luLWJvdHRvbScgKyAnYm90dG9tJworICAgIC8vID0gaGVp Z2h0IG9mIGNvbnRhaW5pbmcgYmxvY2sKKyAgICAvLworICAgIC8vIDEuICd0b3AnIGFuZCAnaGVp Z2h0JyBhcmUgJ2F1dG8nIGFuZCAnYm90dG9tJyBpcyBub3QgJ2F1dG8nLCB0aGVuIHRoZSBoZWln aHQgaXMgYmFzZWQgb24gdGhlIGNvbnRlbnQgcGVyIDEwLjYuNywKKyAgICAvLyAgICAgc2V0ICdh dXRvJyB2YWx1ZXMgZm9yICdtYXJnaW4tdG9wJyBhbmQgJ21hcmdpbi1ib3R0b20nIHRvIDAsIGFu ZCBzb2x2ZSBmb3IgJ3RvcCcKKyAgICAvLyAyLiAndG9wJyBhbmQgJ2JvdHRvbScgYXJlICdhdXRv JyBhbmQgJ2hlaWdodCcgaXMgbm90ICdhdXRvJywgdGhlbiBzZXQgJ3RvcCcgdG8gdGhlIHN0YXRp YyBwb3NpdGlvbiwgc2V0ICdhdXRvJyB2YWx1ZXMgZm9yCisgICAgLy8gICAgJ21hcmdpbi10b3An IGFuZCAnbWFyZ2luLWJvdHRvbScgdG8gMCwgYW5kIHNvbHZlIGZvciAnYm90dG9tJworICAgIC8v IDMuICdoZWlnaHQnIGFuZCAnYm90dG9tJyBhcmUgJ2F1dG8nIGFuZCAndG9wJyBpcyBub3QgJ2F1 dG8nLCB0aGVuIHRoZSBoZWlnaHQgaXMgYmFzZWQgb24gdGhlIGNvbnRlbnQgcGVyIDEwLjYuNywg c2V0ICdhdXRvJworICAgIC8vICAgICB2YWx1ZXMgZm9yICdtYXJnaW4tdG9wJyBhbmQgJ21hcmdp bi1ib3R0b20nIHRvIDAsIGFuZCBzb2x2ZSBmb3IgJ2JvdHRvbScKKyAgICAvLyA0LiAndG9wJyBp cyAnYXV0bycsICdoZWlnaHQnIGFuZCAnYm90dG9tJyBhcmUgbm90ICdhdXRvJywgdGhlbiBzZXQg J2F1dG8nIHZhbHVlcyBmb3IgJ21hcmdpbi10b3AnIGFuZCAnbWFyZ2luLWJvdHRvbScgdG8gMCwg YW5kIHNvbHZlIGZvciAndG9wJworICAgIC8vIDUuICdoZWlnaHQnIGlzICdhdXRvJywgJ3RvcCcg YW5kICdib3R0b20nIGFyZSBub3QgJ2F1dG8nLCB0aGVuICdhdXRvJyB2YWx1ZXMgZm9yICdtYXJn aW4tdG9wJyBhbmQgJ21hcmdpbi1ib3R0b20nIGFyZSBzZXQgdG8gMCBhbmQgc29sdmUgZm9yICdo ZWlnaHQnCisgICAgLy8gNi4gJ2JvdHRvbScgaXMgJ2F1dG8nLCAndG9wJyBhbmQgJ2hlaWdodCcg YXJlIG5vdCAnYXV0bycsIHRoZW4gc2V0ICdhdXRvJyB2YWx1ZXMgZm9yICdtYXJnaW4tdG9wJyBh bmQgJ21hcmdpbi1ib3R0b20nIHRvIDAgYW5kIHNvbHZlIGZvciAnYm90dG9tJworICAgIExheW91 dFVuaXQgY29tcHV0ZWRUb3BWYWx1ZTsKKyAgICBpZiAodG9wLmlzQXV0bygpICYmICFib3R0b20u aXNBdXRvKCkpIHsKKyAgICAgICAgLy8gIzEgIzQKKyAgICAgICAgYXV0byBtYXJnaW5Ub3AgPSBk aXNwbGF5Qm94Lm1hcmdpblRvcCgpOworICAgICAgICBhdXRvIG1hcmdpbkJvdHRvbSA9IGRpc3Bs YXlCb3gubWFyZ2luQm90dG9tKCk7CisgICAgCisgICAgICAgIGF1dG8gcGFkZGluZ1RvcCA9IGRp c3BsYXlCb3gucGFkZGluZ1RvcCgpOworICAgICAgICBhdXRvIHBhZGRpbmdCb3R0b20gPSBkaXNw bGF5Qm94LnBhZGRpbmdCb3R0b20oKTsKKworICAgICAgICBhdXRvIGJvcmRlclRvcCA9IGRpc3Bs YXlCb3guYm9yZGVyVG9wKCk7CisgICAgICAgIGF1dG8gYm9yZGVyQm90dG9tID0gZGlzcGxheUJv eC5ib3JkZXJCb3R0b20oKTsKKworICAgICAgICBjb21wdXRlZFRvcFZhbHVlID0gY29udGFpbmlu Z0Jsb2NrSGVpZ2h0IC0gKG1hcmdpblRvcCArIGJvcmRlclRvcCArIHBhZGRpbmdUb3AgKyBzaXpl LmhlaWdodCgpICsgcGFkZGluZ0JvdHRvbSArIGJvcmRlckJvdHRvbSArIG1hcmdpbkJvdHRvbSAr IGJvdHRvbS52YWx1ZSgpKTsKKyAgICB9IGVsc2UgaWYgKHRvcC5pc0F1dG8oKSAmJiBib3R0b20u aXNBdXRvKCkpIHsKKyAgICAgICAgLy8gIzIKKyAgICAgICAgLy8gQWxyZWFkeSBjb21wdXRlZCBh cyBwYXJ0IG9mIHRoZSBjb21wdXRlU3RhdGljUG9zaXRpb24oKTsKKyAgICAgICAgY29tcHV0ZWRU b3BWYWx1ZSA9IGRpc3BsYXlCb3gudG9wKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gIzMg IzUgIzYgaGF2ZSB0b3AgIT0gYXV0bworICAgICAgICBjb21wdXRlZFRvcFZhbHVlID0gdmFsdWVG b3JMZW5ndGgodG9wLCBjb250YWluaW5nQmxvY2tIZWlnaHQpOworICAgIH0KKworICAgIGRpc3Bs YXlCb3guc2V0VG9wKGNvbXB1dGVkVG9wVmFsdWUpOworCisgICAgLy8gMTAuMy43IEFic29sdXRl bHkgcG9zaXRpb25lZCwgbm9uLXJlcGxhY2VkIGVsZW1lbnRzCisgICAgYXV0byBsZWZ0ID0gc3R5 bGUubG9naWNhbExlZnQoKTsKKyAgICBhdXRvIHJpZ2h0ID0gc3R5bGUubG9naWNhbFJpZ2h0KCk7 CisgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IGxheW91dENvbnRleHQuZGlzcGxheUJv eEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS0+d2lkdGgoKTsKKwor ICAgIC8vICdsZWZ0JyArICdtYXJnaW4tbGVmdCcgKyAnYm9yZGVyLWxlZnQtd2lkdGgnICsgJ3Bh ZGRpbmctbGVmdCcgKyAnd2lkdGgnICsgJ3BhZGRpbmctcmlnaHQnICsgJ2JvcmRlci1yaWdodC13 aWR0aCcgKyAnbWFyZ2luLXJpZ2h0JyArICdyaWdodCcKKyAgICAvLyA9IHdpZHRoIG9mIGNvbnRh aW5pbmcgYmxvY2sKKyAgICAvLworICAgIC8vIElmIGFsbCB0aHJlZSBvZiAnbGVmdCcsICd3aWR0 aCcsIGFuZCAncmlnaHQnIGFyZSAnYXV0byc6IEZpcnN0IHNldCBhbnkgJ2F1dG8nIHZhbHVlcyBm b3IgJ21hcmdpbi1sZWZ0JyBhbmQgJ21hcmdpbi1yaWdodCcgdG8gMC4KKyAgICAvLyBUaGVuLCBp ZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJsaXNoaW5nIHRo ZSBzdGF0aWMtcG9zaXRpb24gY29udGFpbmluZyBibG9jayBpcyAnbHRyJyBzZXQgJ2xlZnQnIHRv IHRoZSBzdGF0aWMKKyAgICAvLyBwb3NpdGlvbiBhbmQgYXBwbHkgcnVsZSBudW1iZXIgdGhyZWUg YmVsb3c7IG90aGVyd2lzZSwgc2V0ICdyaWdodCcgdG8gdGhlIHN0YXRpYyBwb3NpdGlvbiBhbmQg YXBwbHkgcnVsZSBudW1iZXIgb25lIGJlbG93LgorCisgICAgLy8gMS4gJ2xlZnQnIGFuZCAnd2lk dGgnIGFyZSAnYXV0bycgYW5kICdyaWdodCcgaXMgbm90ICdhdXRvJywgdGhlbiB0aGUgd2lkdGgg aXMgc2hyaW5rLXRvLWZpdC4gVGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisgICAgLy8gMi4gJ2xlZnQn IGFuZCAncmlnaHQnIGFyZSAnYXV0bycgYW5kICd3aWR0aCcgaXMgbm90ICdhdXRvJywgdGhlbiBp ZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJsaXNoaW5nIHRo ZSBzdGF0aWMtcG9zaXRpb24gCisgICAgLy8gICAgY29udGFpbmluZyBibG9jayBpcyAnbHRyJyBz ZXQgJ2xlZnQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24sIG90aGVyd2lzZSBzZXQgJ3JpZ2h0JyB0 byB0aGUgc3RhdGljIHBvc2l0aW9uLgorICAgIC8vICAgIFRoZW4gc29sdmUgZm9yICdsZWZ0JyAo aWYgJ2RpcmVjdGlvbiBpcyAncnRsJykgb3IgJ3JpZ2h0JyAoaWYgJ2RpcmVjdGlvbicgaXMgJ2x0 cicpLgorICAgIC8vIDMuICd3aWR0aCcgYW5kICdyaWdodCcgYXJlICdhdXRvJyBhbmQgJ2xlZnQn IGlzIG5vdCAnYXV0bycsIHRoZW4gdGhlIHdpZHRoIGlzIHNocmluay10by1maXQgLiBUaGVuIHNv bHZlIGZvciAncmlnaHQnCisgICAgLy8gNC4gJ2xlZnQnIGlzICdhdXRvJywgJ3dpZHRoJyBhbmQg J3JpZ2h0JyBhcmUgbm90ICdhdXRvJywgdGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisgICAgLy8gNS4g J3dpZHRoJyBpcyAnYXV0bycsICdsZWZ0JyBhbmQgJ3JpZ2h0JyBhcmUgbm90ICdhdXRvJywgdGhl biBzb2x2ZSBmb3IgJ3dpZHRoJworICAgIC8vIDYuICdyaWdodCcgaXMgJ2F1dG8nLCAnbGVmdCcg YW5kICd3aWR0aCcgYXJlIG5vdCAnYXV0bycsIHRoZW4gc29sdmUgZm9yICdyaWdodCcKKyAgICBM YXlvdXRVbml0IGNvbXB1dGVkTGVmdFZhbHVlOworICAgIGlmIChsZWZ0LmlzQXV0bygpICYmICFy aWdodC5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMSAjNAorICAgICAgICBhdXRvIG1hcmdpbkxl ZnQgPSBkaXNwbGF5Qm94Lm1hcmdpbkxlZnQoKTsKKyAgICAgICAgYXV0byBtYXJnaW5SaWdodCA9 IGRpc3BsYXlCb3gubWFyZ2luUmlnaHQoKTsKKyAgICAKKyAgICAgICAgYXV0byBwYWRkaW5nTGVm dCA9IGRpc3BsYXlCb3gucGFkZGluZ0xlZnQoKTsKKyAgICAgICAgYXV0byBwYWRkaW5nUmlnaHQg PSBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpOworCisgICAgICAgIGF1dG8gYm9yZGVyTGVmdCA9 IGRpc3BsYXlCb3guYm9yZGVyTGVmdCgpOworICAgICAgICBhdXRvIGJvcmRlclJpZ2h0ID0gZGlz cGxheUJveC5ib3JkZXJSaWdodCgpOworCisgICAgICAgIGNvbXB1dGVkTGVmdFZhbHVlID0gY29u dGFpbmluZ0Jsb2NrV2lkdGggLSAobWFyZ2luTGVmdCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVm dCArIHNpemUud2lkdGgoKSArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0ICsgbWFyZ2luUmln aHQgKyByaWdodC52YWx1ZSgpKTsKKyAgICB9IGVsc2UgaWYgKGxlZnQuaXNBdXRvKCkgJiYgcmln aHQuaXNBdXRvKCkpIHsKKyAgICAgICAgLy8gIzIKKyAgICAgICAgLy8gRklYTUU6IHJ0bAorICAg ICAgICBjb21wdXRlZExlZnRWYWx1ZSA9IGRpc3BsYXlCb3gubGVmdCgpOworICAgIH0gZWxzZSB7 CisgICAgICAgIC8vICMzICM1ICM2IGhhdmUgbGVmdCAhPSBhdXRvCisgICAgICAgIGNvbXB1dGVk TGVmdFZhbHVlID0gdmFsdWVGb3JMZW5ndGgobGVmdCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwor ICAgIH0KKworICAgIGRpc3BsYXlCb3guc2V0TGVmdChjb21wdXRlZExlZnRWYWx1ZSk7Cit9CisK K3ZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dSZXBsYWNlZFBvc2l0aW9u KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdAoreworCit9 CiB9CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgK aW5kZXggZWUwZWQ1NTRiNmI4NGYxMzhmYzkwNGM0N2ZkNjY5NTllYjcxMzdjYS4uZWQ4ZTg3ZmUx Y2FiOTYyZWRiNmM1YWFjMTYzMjgyMTFmZDY5NTY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTY2LDcgKzY2LDcgQEAgcHJvdGVjdGVkOgogCiAgICAg dmlydHVhbCB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29uc3Qg Qm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbkZs b3dQb3NpdGlvbmVkUG9zaXRpb24oY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7Ci0g ICAgdmlydHVhbCB2b2lkIGNvbXB1dGVPdXRPZkZsb3dQb3NpdGlvbihjb25zdCBCb3gmLCBEaXNw bGF5OjpCb3gmKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9mRmxvd1Bvc2l0 aW9uKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKIAog ICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlV2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYs IERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlSGVpZ2h0KExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKQEAgLTk2LDYg Kzk2LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dSZXBsYWNlZEhlaWdo dChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAgICAg dm9pZCBjb21wdXRlT3V0T2ZGbG93UmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3Qg Qm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAKKyAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dO b25SZXBsYWNlZFBvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpC b3gmKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dSZXBsYWNlZFBvc2l0aW9uKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKKwogICAgIHZv aWQgY29tcHV0ZUZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHQoTGF5b3V0Q29udGV4dCYsIGNvbnN0 IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZUZsb2F0aW5nTm9u UmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94Jikg Y29uc3Q7CiAK 340980 2018-05-22 06:46:25 -0700 2018-05-22 08:06:32 -0700 Patch bug-185858-20180522064624.patch text/plain 11098 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYyOWNjYTIzMWYxNjFm Y2RhNzMxMjcwYTg5YjdiZmZjZDUwYWU4NS4uNzhmOTI0YjIwNzc3MTY3NTc2NjViYjAxNDc3NGJj NGMyOTYwNTU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHBv c2l0aW9uaW5nIGZvciBub24tcmVwbGFjZWQgb3V0LW9mLWZsb3cgZWxlbWVudHMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU4NTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjZXJ0YWluIGNhc2Vz LCB0aGUgb3V0LW9mLWZsb3cgZWxlbWVudCdzIGZpbmFsIHBvc2l0aW9uIGRlcGVuZHMgb24gdGhl IGVsZW1lbnQncyBzaXplLgorICAgICAgICBDYWxsIGNvbXB1dGVPdXRPZkZsb3dQb3NpdGlvbigp IGFmdGVyIHdpZHRoL2hlaWdodCBhcmUgcmVzb2x2ZWQuCisKKyAgICAgICAgKiBsYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRz IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFBvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dSZXBsYWNlZFBv c2l0aW9uIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKwog MjAxOC0wNS0yMiAgWWFjaW5lIEJhbmRvdSAgPHlhY2luZS5iYW5kb3VfZXh0QHNvZnRhdGhvbWUu Y29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIERvbid0IHNldCB0aGUgUmVhZHlTdGF0ZSB0byBI YXZlTm90aGluZyB3aGVuIGFuIGVycm9yIG9jY3VycyBpbiBwbGF5YmFjayBwaXBlbGluZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZmUwN2U4MDdj ZDE5YmNhZTZiMmVlMTkyMzllZmM1NGY4ZmM3NzcwZi4uYmEzZDYzODdhOTE5ODBkY2IyNzQ1YzJm NjRkZjZiNGZjM2ViMTlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuY3BwCkBAIC01Nyw4ICs1NywxMyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlSW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveAogewog fQogCi12b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oY29u c3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QKK3ZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVPdXRPZkZsb3dQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25z dCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAogeworICAg IGlmICghbGF5b3V0Qm94LnJlcGxhY2VkKCkpIHsKKyAgICAgICAgY29tcHV0ZU91dE9mRmxvd05v blJlcGxhY2VkUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsK KyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBjb21wdXRlT3V0T2ZGbG93UmVwbGFjZWRQb3Np dGlvbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogfQogCiB2b2lkIEZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGgoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4 dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QK QEAgLTE0Nyw3ICsxNTIsMTEgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0T2ZG bG93RGVzY2VuZGFudHMoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCkKICAgICAgICAgYXV0 byYgbGF5b3V0Qm94ID0gKm91dE9mRmxvd0JveDsKICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9 IGxheW91dENvbnRleHQuY3JlYXRlRGlzcGxheUJveChsYXlvdXRCb3gpOwogCi0gICAgICAgIGNv bXB1dGVPdXRPZkZsb3dQb3NpdGlvbihsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgICAgICAv LyBUaGUgdGVybSAic3RhdGljIHBvc2l0aW9uIiAob2YgYW4gZWxlbWVudCkgcmVmZXJzLCByb3Vn aGx5LCB0byB0aGUgcG9zaXRpb24gYW4gZWxlbWVudCB3b3VsZCBoYXZlIGhhZCBpbiB0aGUgbm9y bWFsIGZsb3cuCisgICAgICAgIC8vIE1vcmUgcHJlY2lzZWx5LCB0aGUgc3RhdGljIHBvc2l0aW9u IGZvciAndG9wJyBpcyB0aGUgZGlzdGFuY2UgZnJvbSB0aGUgdG9wIGVkZ2Ugb2YgdGhlIGNvbnRh aW5pbmcgYmxvY2sgdG8gdGhlIHRvcCBtYXJnaW4gZWRnZQorICAgICAgICAvLyBvZiBhIGh5cG90 aGV0aWNhbCBib3ggdGhhdCB3b3VsZCBoYXZlIGJlZW4gdGhlIGZpcnN0IGJveCBvZiB0aGUgZWxl bWVudCBpZiBpdHMgc3BlY2lmaWVkICdwb3NpdGlvbicgdmFsdWUgaGFkIGJlZW4gJ3N0YXRpYycg YW5kCisgICAgICAgIC8vIGl0cyBzcGVjaWZpZWQgJ2Zsb2F0JyBoYWQgYmVlbiAnbm9uZScgYW5k IGl0cyBzcGVjaWZpZWQgJ2NsZWFyJyBoYWQgYmVlbiAnbm9uZScuCisgICAgICAgIGNvbXB1dGVT dGF0aWNQb3NpdGlvbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogICAg ICAgICBjb21wdXRlT3V0T2ZGbG93V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNw bGF5Qm94KTsKIAogICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGlu Z0NvbnRleHQoKSk7CkBAIC0xNTUsNiArMTY0LDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6 bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCkK ICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dChsYXlvdXRDb250ZXh0LCBsYXlvdXRD b250ZXh0LmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGxheW91dEJveCwgKmZvcm1hdHRpbmdD b250ZXh0KSk7CiAKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd0hlaWdodChsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgICAgICBjb21wdXRlT3V0T2ZGbG93UG9zaXRp b24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICB9CiB9CiAKQEAg LTQzOCw2ICs0NDgsMTA2IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZs b3dSZXBsYWNlZFdpZHRoKExheW91dENvbnRleHQmIGxheW91dENvbnRlCiAgICAgY29tcHV0ZVJl cGxhY2VkV2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKIH0KIAor dm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd05vblJlcGxhY2VkUG9zaXRp b24oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERp c3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKK3sKKyAgICAvLyAxMC4zLjcgQWJzb2x1dGVs eSBwb3NpdGlvbmVkLCBub24tcmVwbGFjZWQgZWxlbWVudHMgKGxlZnQvcmlnaHQpCisgICAgLy8g MTAuNi40IEFic29sdXRlbHkgcG9zaXRpb25lZCwgbm9uLXJlcGxhY2VkIGVsZW1lbnRzICh0b3Av Ym90dG9tKQorCisgICAgLy8gQXQgdGhpcyBwb2ludCB3ZSd2ZSB0aGUgc2l6ZSBjb21wdXRlZC4K KyAgICBhdXRvIHNpemUgPSBkaXNwbGF5Qm94LnNpemUoKTsKKyAgICBhdXRvJiBzdHlsZSA9IGxh eW91dEJveC5zdHlsZSgpOworCisgICAgLy8gMTAuNi40IEFic29sdXRlbHkgcG9zaXRpb25lZCwg bm9uLXJlcGxhY2VkIGVsZW1lbnRzCisgICAgYXV0byB0b3AgPSBzdHlsZS5sb2dpY2FsVG9wKCk7 CisgICAgYXV0byBib3R0b20gPSBzdHlsZS5sb2dpY2FsQm90dG9tKCk7CisgICAgYXV0byBjb250 YWluaW5nQmxvY2tIZWlnaHQgPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3go KmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPmhlaWdodCgpOworCisgICAgLy8gJ3RvcCcg KyAnbWFyZ2luLXRvcCcgKyAnYm9yZGVyLXRvcC13aWR0aCcgKyAncGFkZGluZy10b3AnICsgJ2hl aWdodCcgKyAncGFkZGluZy1ib3R0b20nICsgJ2JvcmRlci1ib3R0b20td2lkdGgnICsgJ21hcmdp bi1ib3R0b20nICsgJ2JvdHRvbScKKyAgICAvLyA9IGhlaWdodCBvZiBjb250YWluaW5nIGJsb2Nr CisgICAgLy8KKyAgICAvLyAxLiAndG9wJyBhbmQgJ2hlaWdodCcgYXJlICdhdXRvJyBhbmQgJ2Jv dHRvbScgaXMgbm90ICdhdXRvJywgdGhlbiB0aGUgaGVpZ2h0IGlzIGJhc2VkIG9uIHRoZSBjb250 ZW50IHBlciAxMC42LjcsCisgICAgLy8gICAgIHNldCAnYXV0bycgdmFsdWVzIGZvciAnbWFyZ2lu LXRvcCcgYW5kICdtYXJnaW4tYm90dG9tJyB0byAwLCBhbmQgc29sdmUgZm9yICd0b3AnCisgICAg Ly8gMi4gJ3RvcCcgYW5kICdib3R0b20nIGFyZSAnYXV0bycgYW5kICdoZWlnaHQnIGlzIG5vdCAn YXV0bycsIHRoZW4gc2V0ICd0b3AnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24sIHNldCAnYXV0bycg dmFsdWVzIGZvcgorICAgIC8vICAgICdtYXJnaW4tdG9wJyBhbmQgJ21hcmdpbi1ib3R0b20nIHRv IDAsIGFuZCBzb2x2ZSBmb3IgJ2JvdHRvbScKKyAgICAvLyAzLiAnaGVpZ2h0JyBhbmQgJ2JvdHRv bScgYXJlICdhdXRvJyBhbmQgJ3RvcCcgaXMgbm90ICdhdXRvJywgdGhlbiB0aGUgaGVpZ2h0IGlz IGJhc2VkIG9uIHRoZSBjb250ZW50IHBlciAxMC42LjcsIHNldCAnYXV0bycKKyAgICAvLyAgICAg dmFsdWVzIGZvciAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tYm90dG9tJyB0byAwLCBhbmQgc29s dmUgZm9yICdib3R0b20nCisgICAgLy8gNC4gJ3RvcCcgaXMgJ2F1dG8nLCAnaGVpZ2h0JyBhbmQg J2JvdHRvbScgYXJlIG5vdCAnYXV0bycsIHRoZW4gc2V0ICdhdXRvJyB2YWx1ZXMgZm9yICdtYXJn aW4tdG9wJyBhbmQgJ21hcmdpbi1ib3R0b20nIHRvIDAsIGFuZCBzb2x2ZSBmb3IgJ3RvcCcKKyAg ICAvLyA1LiAnaGVpZ2h0JyBpcyAnYXV0bycsICd0b3AnIGFuZCAnYm90dG9tJyBhcmUgbm90ICdh dXRvJywgdGhlbiAnYXV0bycgdmFsdWVzIGZvciAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tYm90 dG9tJyBhcmUgc2V0IHRvIDAgYW5kIHNvbHZlIGZvciAnaGVpZ2h0JworICAgIC8vIDYuICdib3R0 b20nIGlzICdhdXRvJywgJ3RvcCcgYW5kICdoZWlnaHQnIGFyZSBub3QgJ2F1dG8nLCB0aGVuIHNl dCAnYXV0bycgdmFsdWVzIGZvciAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tYm90dG9tJyB0byAw IGFuZCBzb2x2ZSBmb3IgJ2JvdHRvbScKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVkVG9wVmFsdWU7 CisgICAgaWYgKHRvcC5pc0F1dG8oKSAmJiAhYm90dG9tLmlzQXV0bygpKSB7CisgICAgICAgIC8v ICMxICM0CisgICAgICAgIGF1dG8gbWFyZ2luVG9wID0gZGlzcGxheUJveC5tYXJnaW5Ub3AoKTsK KyAgICAgICAgYXV0byBtYXJnaW5Cb3R0b20gPSBkaXNwbGF5Qm94Lm1hcmdpbkJvdHRvbSgpOwor ICAgIAorICAgICAgICBhdXRvIHBhZGRpbmdUb3AgPSBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKTsK KyAgICAgICAgYXV0byBwYWRkaW5nQm90dG9tID0gZGlzcGxheUJveC5wYWRkaW5nQm90dG9tKCk7 CisKKyAgICAgICAgYXV0byBib3JkZXJUb3AgPSBkaXNwbGF5Qm94LmJvcmRlclRvcCgpOworICAg ICAgICBhdXRvIGJvcmRlckJvdHRvbSA9IGRpc3BsYXlCb3guYm9yZGVyQm90dG9tKCk7CisKKyAg ICAgICAgY29tcHV0ZWRUb3BWYWx1ZSA9IGNvbnRhaW5pbmdCbG9ja0hlaWdodCAtIChtYXJnaW5U b3AgKyBib3JkZXJUb3AgKyBwYWRkaW5nVG9wICsgc2l6ZS5oZWlnaHQoKSArIHBhZGRpbmdCb3R0 b20gKyBib3JkZXJCb3R0b20gKyBtYXJnaW5Cb3R0b20gKyBib3R0b20udmFsdWUoKSk7CisgICAg fSBlbHNlIGlmICh0b3AuaXNBdXRvKCkgJiYgYm90dG9tLmlzQXV0bygpKSB7CisgICAgICAgIC8v ICMyCisgICAgICAgIC8vIEFscmVhZHkgY29tcHV0ZWQgYXMgcGFydCBvZiB0aGUgY29tcHV0ZVN0 YXRpY1Bvc2l0aW9uKCk7CisgICAgICAgIGNvbXB1dGVkVG9wVmFsdWUgPSBkaXNwbGF5Qm94LnRv cCgpOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vICMzICM1ICM2IGhhdmUgdG9wICE9IGF1dG8K KyAgICAgICAgY29tcHV0ZWRUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHRvcCwgY29udGFpbmlu Z0Jsb2NrSGVpZ2h0KTsKKyAgICB9CisKKyAgICBkaXNwbGF5Qm94LnNldFRvcChjb21wdXRlZFRv cFZhbHVlKTsKKworICAgIC8vIDEwLjMuNyBBYnNvbHV0ZWx5IHBvc2l0aW9uZWQsIG5vbi1yZXBs YWNlZCBlbGVtZW50cworICAgIGF1dG8gbGVmdCA9IHN0eWxlLmxvZ2ljYWxMZWZ0KCk7CisgICAg YXV0byByaWdodCA9IHN0eWxlLmxvZ2ljYWxSaWdodCgpOworICAgIGF1dG8gY29udGFpbmluZ0Js b2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKmxheW91dEJv eC5jb250YWluaW5nQmxvY2soKSktPndpZHRoKCk7CisKKyAgICAvLyAnbGVmdCcgKyAnbWFyZ2lu LWxlZnQnICsgJ2JvcmRlci1sZWZ0LXdpZHRoJyArICdwYWRkaW5nLWxlZnQnICsgJ3dpZHRoJyAr ICdwYWRkaW5nLXJpZ2h0JyArICdib3JkZXItcmlnaHQtd2lkdGgnICsgJ21hcmdpbi1yaWdodCcg KyAncmlnaHQnCisgICAgLy8gPSB3aWR0aCBvZiBjb250YWluaW5nIGJsb2NrCisgICAgLy8KKyAg ICAvLyBJZiBhbGwgdGhyZWUgb2YgJ2xlZnQnLCAnd2lkdGgnLCBhbmQgJ3JpZ2h0JyBhcmUgJ2F1 dG8nOiBGaXJzdCBzZXQgYW55ICdhdXRvJyB2YWx1ZXMgZm9yICdtYXJnaW4tbGVmdCcgYW5kICdt YXJnaW4tcmlnaHQnIHRvIDAuCisgICAgLy8gVGhlbiwgaWYgdGhlICdkaXJlY3Rpb24nIHByb3Bl cnR5IG9mIHRoZSBlbGVtZW50IGVzdGFibGlzaGluZyB0aGUgc3RhdGljLXBvc2l0aW9uIGNvbnRh aW5pbmcgYmxvY2sgaXMgJ2x0cicgc2V0ICdsZWZ0JyB0byB0aGUgc3RhdGljCisgICAgLy8gcG9z aXRpb24gYW5kIGFwcGx5IHJ1bGUgbnVtYmVyIHRocmVlIGJlbG93OyBvdGhlcndpc2UsIHNldCAn cmlnaHQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24gYW5kIGFwcGx5IHJ1bGUgbnVtYmVyIG9uZSBi ZWxvdy4KKworICAgIC8vIDEuICdsZWZ0JyBhbmQgJ3dpZHRoJyBhcmUgJ2F1dG8nIGFuZCAncmln aHQnIGlzIG5vdCAnYXV0bycsIHRoZW4gdGhlIHdpZHRoIGlzIHNocmluay10by1maXQuIFRoZW4g c29sdmUgZm9yICdsZWZ0JworICAgIC8vIDIuICdsZWZ0JyBhbmQgJ3JpZ2h0JyBhcmUgJ2F1dG8n IGFuZCAnd2lkdGgnIGlzIG5vdCAnYXV0bycsIHRoZW4gaWYgdGhlICdkaXJlY3Rpb24nIHByb3Bl cnR5IG9mIHRoZSBlbGVtZW50IGVzdGFibGlzaGluZyB0aGUgc3RhdGljLXBvc2l0aW9uIAorICAg IC8vICAgIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicgc2V0ICdsZWZ0JyB0byB0aGUgc3RhdGlj IHBvc2l0aW9uLCBvdGhlcndpc2Ugc2V0ICdyaWdodCcgdG8gdGhlIHN0YXRpYyBwb3NpdGlvbi4K KyAgICAvLyAgICBUaGVuIHNvbHZlIGZvciAnbGVmdCcgKGlmICdkaXJlY3Rpb24gaXMgJ3J0bCcp IG9yICdyaWdodCcgKGlmICdkaXJlY3Rpb24nIGlzICdsdHInKS4KKyAgICAvLyAzLiAnd2lkdGgn IGFuZCAncmlnaHQnIGFyZSAnYXV0bycgYW5kICdsZWZ0JyBpcyBub3QgJ2F1dG8nLCB0aGVuIHRo ZSB3aWR0aCBpcyBzaHJpbmstdG8tZml0IC4gVGhlbiBzb2x2ZSBmb3IgJ3JpZ2h0JworICAgIC8v IDQuICdsZWZ0JyBpcyAnYXV0bycsICd3aWR0aCcgYW5kICdyaWdodCcgYXJlIG5vdCAnYXV0bycs IHRoZW4gc29sdmUgZm9yICdsZWZ0JworICAgIC8vIDUuICd3aWR0aCcgaXMgJ2F1dG8nLCAnbGVm dCcgYW5kICdyaWdodCcgYXJlIG5vdCAnYXV0bycsIHRoZW4gc29sdmUgZm9yICd3aWR0aCcKKyAg ICAvLyA2LiAncmlnaHQnIGlzICdhdXRvJywgJ2xlZnQnIGFuZCAnd2lkdGgnIGFyZSBub3QgJ2F1 dG8nLCB0aGVuIHNvbHZlIGZvciAncmlnaHQnCisgICAgTGF5b3V0VW5pdCBjb21wdXRlZExlZnRW YWx1ZTsKKyAgICBpZiAobGVmdC5pc0F1dG8oKSAmJiAhcmlnaHQuaXNBdXRvKCkpIHsKKyAgICAg ICAgLy8gIzEgIzQKKyAgICAgICAgYXV0byBtYXJnaW5MZWZ0ID0gZGlzcGxheUJveC5tYXJnaW5M ZWZ0KCk7CisgICAgICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBkaXNwbGF5Qm94Lm1hcmdpblJpZ2h0 KCk7CisgICAgCisgICAgICAgIGF1dG8gcGFkZGluZ0xlZnQgPSBkaXNwbGF5Qm94LnBhZGRpbmdM ZWZ0KCk7CisgICAgICAgIGF1dG8gcGFkZGluZ1JpZ2h0ID0gZGlzcGxheUJveC5wYWRkaW5nUmln aHQoKTsKKworICAgICAgICBhdXRvIGJvcmRlckxlZnQgPSBkaXNwbGF5Qm94LmJvcmRlckxlZnQo KTsKKyAgICAgICAgYXV0byBib3JkZXJSaWdodCA9IGRpc3BsYXlCb3guYm9yZGVyUmlnaHQoKTsK KworICAgICAgICBjb21wdXRlZExlZnRWYWx1ZSA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKG1h cmdpbkxlZnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyBzaXplLndpZHRoKCkgKyBwYWRk aW5nUmlnaHQgKyBib3JkZXJSaWdodCArIG1hcmdpblJpZ2h0ICsgcmlnaHQudmFsdWUoKSk7Cisg ICAgfSBlbHNlIGlmIChsZWZ0LmlzQXV0bygpICYmIHJpZ2h0LmlzQXV0bygpKSB7CisgICAgICAg IC8vICMyCisgICAgICAgIC8vIEZJWE1FOiBydGwKKyAgICAgICAgY29tcHV0ZWRMZWZ0VmFsdWUg PSBkaXNwbGF5Qm94LmxlZnQoKTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyAjMyAjNSAjNiBo YXZlIGxlZnQgIT0gYXV0bworICAgICAgICBjb21wdXRlZExlZnRWYWx1ZSA9IHZhbHVlRm9yTGVu Z3RoKGxlZnQsIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICB9CisKKyAgICBkaXNwbGF5Qm94 LnNldExlZnQoY29tcHV0ZWRMZWZ0VmFsdWUpOworfQorCit2b2lkIEZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlT3V0T2ZGbG93UmVwbGFjZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29uc3Qg Qm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QKK3sKKworfQorCiBMYXlvdXRVbml0IEZvcm1hdHRp bmdDb250ZXh0OjpzaHJpbmtUb0ZpdFdpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBj b25zdAogewogICAgIHJldHVybiAwOwpAQCAtNDc2LDYgKzU4Niw3IEBAIHZvaWQgRm9ybWF0dGlu Z0NvbnRleHQ6OnZhbGlkYXRlR2VvbWV0cnlDb25zdHJhaW50c0FmdGVyTGF5b3V0KGNvbnN0IExh eW91dENvbnRlCiAgICAgfQogfQogI2VuZGlmCisKIH0KIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA0ZjkwYmU4NDJjZGJhMjcxZmMwZjE1 ZmZjNDE0NDgxODEwMjcwYzdkLi4zZWMyZWY3N2M5MDYzYjlkNDM0ZjQxYjcxODFiMmQxNTE2NTIw ZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNjYs NyArNjYsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVN0YXRpY1Bv c2l0aW9uKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsK ICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihjb25zdCBC b3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9m Rmxvd1Bvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OworICAgIHZpcnR1 YWwgdm9pZCBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJv eCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVXaWR0 aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAgICAg dmlydHVhbCB2b2lkIGNvbXB1dGVIZWlnaHQoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERp c3BsYXk6OkJveCYpIGNvbnN0OwpAQCAtMTAwLDYgKzEwMCw5IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBjb21wdXRlT3V0T2ZGbG93UmVwbGFjZWRIZWlnaHQoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJv eCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZvaWQgY29tcHV0ZU91dE9mRmxvd1JlcGxh Y2VkV2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0 OwogCisgICAgdm9pZCBjb21wdXRlT3V0T2ZGbG93Tm9uUmVwbGFjZWRQb3NpdGlvbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CisgICAgdm9pZCBjb21w dXRlT3V0T2ZGbG93UmVwbGFjZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jiwg RGlzcGxheTo6Qm94JikgY29uc3Q7CisKICAgICB2b2lkIGNvbXB1dGVGbG9hdGluZ05vblJlcGxh Y2VkSGVpZ2h0KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25z dDsKICAgICB2b2lkIGNvbXB1dGVGbG9hdGluZ05vblJlcGxhY2VkV2lkdGgoTGF5b3V0Q29udGV4 dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogCg==