202092 2019-09-22 17:59:55 -0700 [LFC][IFC] Merge inline box compute functions 2019-09-23 10:21:30 -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 1573211 0 zalan 2019-09-22 17:59:55 -0700 ssia 1573212 1 webkit-bug-importer 2019-09-22 18:00:31 -0700 <rdar://problem/55607748> 1573213 2 379349 zalan 2019-09-22 18:04:43 -0700 Created attachment 379349 Patch 1573323 3 379374 zalan 2019-09-23 09:21:43 -0700 Created attachment 379374 Patch 1573341 4 379374 commit-queue 2019-09-23 10:21:29 -0700 Comment on attachment 379374 Patch Clearing flags on attachment: 379374 Committed r250240: <https://trac.webkit.org/changeset/250240> 1573342 5 commit-queue 2019-09-23 10:21:30 -0700 All reviewed patches have been landed. Closing bug. 379349 2019-09-22 18:04:43 -0700 2019-09-23 09:21:42 -0700 Patch bug-202092-20190922180435.patch text/plain 9708 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E4MmMwNjk3YmJjYWRi NGM3YzZmNjU5YmRkMjE1ODc1NTAyNjExNC4uZGNkYjBlYjI0MjY1MDYyM2E2YTg0ODYxMTg5Yzcw NWRhYjBlNTVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA5LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNZXJnZSBp bmxpbmUgYm94IGNvbXB1dGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwOTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1NjA3 NzQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1h a2UgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoKSBsb2dpYyBz aW1wbGVyLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVNYXJnaW5Cb3JkZXJBbmRQ YWRkaW5nRm9yR2VuZXJpY0lubGluZUJveCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFk ZGluZ0ZvcklubGluZUNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKwogMjAxOS0wOS0yMiAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUGFzcyBp biB0aGUgVXNlZCpWYWx1ZXMgdG8gaW5saW5lIGxheW91dCBmdW5jdGlvbnMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMDk5NDg1NGI5MzQ2MmE0YWY3MDMzMzI1ZmM1 MzkzZTE2MWQ4OTI4NC4uZGZhZTMyODliNDc2MzZlMDZjOTc1YzcxMDYyMWEwYzRmMmY2ZmEyYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNzgsMTQgKzc4LDggQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCgpCiAgICAg d2hpbGUgKGxheW91dEJveCkgewogICAgICAgICBpZiAobGF5b3V0Qm94LT5lc3RhYmxpc2hlc0Zv cm1hdHRpbmdDb250ZXh0KCkpCiAgICAgICAgICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJv b3QoKmxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7 Ci0gICAgICAgIGVsc2UgaWYgKGlzPENvbnRhaW5lcj4oKmxheW91dEJveCkpCi0gICAgICAgICAg ICBjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvcklubGluZUNvbnRhaW5lcihkb3duY2Fz dDxDb250YWluZXI+KCpsYXlvdXRCb3gpLCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7Ci0gICAgICAg IGVsc2UgaWYgKGxheW91dEJveC0+aXNSZXBsYWNlZCgpKQotICAgICAgICAgICAgY29tcHV0ZVdp ZHRoQW5kSGVpZ2h0Rm9yUmVwbGFjZWRJbmxpbmVCb3goKmxheW91dEJveCwgdXNlZEhvcml6b250 YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAg ICAgQVNTRVJUKGxheW91dEJveC0+aXNJbmxpbmVMZXZlbEJveCgpKTsKLSAgICAgICAgICAgIGlu aXRpYWxpemVNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nRm9yR2VuZXJpY0lubGluZUJveCgqbGF5b3V0 Qm94KTsKLSAgICAgICAgfQorICAgICAgICBlbHNlCisgICAgICAgICAgICBjb21wdXRlSG9yaXpv bnRhbEFuZFZlcnRpY2FsR2VvbWV0cnkoKmxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMs IHVzZWRWZXJ0aWNhbFZhbHVlcyk7CiAgICAgICAgIGxheW91dEJveCA9IG5leHRJblByZU9yZGVy KCpsYXlvdXRCb3gsIHJvb3QoKSk7CiAgICAgfQogCkBAIC05OCw2ICs5Miw1NCBAQCB2b2lkIElu bGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KCkKICAgICBMT0dfV0lU SF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0VuZF0gLT4gaW5s aW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8 ICIpIik7CiB9CiAKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRp bmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgVXNlZEhvcml6 b250YWxWYWx1ZXMgdXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2Vk VmVydGljYWxWYWx1ZXMpCit7CisgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpIHx8IGZvcm1hdHRpbmdDb250ZXh0Um9vdC5pc0lubGluZUJsb2Nr Qm94KCkpOworCisgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcoZm9ybWF0dGluZ0NvbnRleHRS b290LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7CisgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGZv cm1hdHRpbmdDb250ZXh0Um9vdCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgIC8vIFN3aWNo IG92ZXIgdG8gdGhlIG5ldyBmb3JtYXR0aW5nIGNvbnRleHQgKHRoZSBvbmUgdGhhdCB0aGUgcm9v dCBjcmVhdGVzKS4KKyAgICBpZiAoaXM8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3Qp KSB7CisgICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGZv cm1hdHRpbmdDb250ZXh0Um9vdCk7CisgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBM YXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlv dXRTdGF0ZSgpKTsKKyAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRl bnQoKTsKKyAgICAgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdo dCBhbmQgbWFyZ2luLgorICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWlu ZXIsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOworICAgICAgICAv LyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGdvIGJhY2sg YW5kIGxheW91dCB0aGUgb3V0LW9mLWZsb3cgY29udGVudC4KKyAgICAgICAgZm9ybWF0dGluZ0Nv bnRleHQtPmxheW91dE91dE9mRmxvd0NvbnRlbnQoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgY29t cHV0ZUhlaWdodEFuZE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3QsIHVzZWRIb3Jpem9udGFs VmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOworfQorCit2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlSG9yaXpvbnRhbEFuZFZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94JiBs YXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2Vk VmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzKQoreworICAgIGlmIChpczxDb250YWlu ZXI+KGxheW91dEJveCkpIHsKKyAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgKDxzcGFuPikg Y2FuJ3QgZ2V0IHNpemVkL3Bvc2l0aW9uZWQgeWV0LiBBdCB0aGlzIHBvaW50IHdlIGNhbiBvbmx5 IGNvbXB1dGUgdGhlaXIgbWFyZ2lucywgYm9yZGVycyBhbmQgcGFkZGluZ3MuCisgICAgICAgIGNv bXB1dGVIb3Jpem9udGFsTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOwor ICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFs VmFsdWVzKTsKKyAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgaGF2ZSAwIGNvbXB1dGVkIHZl cnRpY2FsIG1hcmdpbnMuCisgICAgICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5 b3V0Qm94KS5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkKCkpIHsKKyAgICAgICAgLy8g UmVwbGFjZWQgZWxlbWVudHMgKGltZywgdmlkZW8pIGNhbiBiZSBzaXplZCBidXQgbm90IHlldCBw b3NpdGlvbmVkLgorICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsIHVz ZWRIb3Jpem9udGFsVmFsdWVzKTsKKyAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91 dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFy Z2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICAvLyBUaGVzZSBhcmUgYWN0dWFsIHRleHQg Ym94ZXMuIE5vIG1hcmdpbnMsIGJvcmRlcnMgb3IgcGFkZGluZ3MuCisgICAgQVNTRVJUKGxheW91 dEJveC5pc0Fub255bW91cygpIHx8IGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKTsKKyAgICBh dXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChsYXlvdXRCb3gp OworCisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOworICAg IGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IH0pOworICAgIGRpc3BsYXlCb3guc2V0 Qm9yZGVyKHsgeyB9LCB7IH0gfSk7CisgICAgZGlzcGxheUJveC5zZXRQYWRkaW5nKHsgfSk7Cit9 CisKIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKQogewog ICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKQEAgLTE0OSwyNSAr MTkxLDYgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW4KICAgICByZXR1cm4gY29uc3RyYWludHM7 CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVNYXJnaW5Cb3Jk ZXJBbmRQYWRkaW5nRm9yR2VuZXJpY0lubGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCkKLXsK LSAgICBBU1NFUlQobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkgfHwgbGF5b3V0Qm94LmlzTGluZUJy ZWFrQm94KCkpOwotICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNw bGF5Qm94KGxheW91dEJveCk7Ci0KLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsg eyB9LCB7IH0gfSk7Ci0gICAgZGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7Ci0g ICAgZGlzcGxheUJveC5zZXRCb3JkZXIoeyB7IH0sIHsgfSB9KTsKLSAgICBkaXNwbGF5Qm94LnNl dFBhZGRpbmcoeyB9KTsKLX0KLQotdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZU1hcmdpbkJvcmRlckFuZFBhZGRpbmdGb3JJbmxpbmVDb250YWluZXIoY29uc3QgQ29udGFpbmVy JiBjb250YWluZXIsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzKQot ewotICAgIGNvbXB1dGVIb3Jpem9udGFsTWFyZ2luKGNvbnRhaW5lciwgdXNlZEhvcml6b250YWxW YWx1ZXMpOwotICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGNvbnRhaW5lciwgdXNlZEhvcml6 b250YWxWYWx1ZXMpOwotICAgIC8vIElubGluZSBjb250YWluZXJzICg8c3Bhbj4pIGhhdmUgMCB2 ZXJ0aWNhbCBtYXJnaW5zLgotICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3goY29udGFp bmVyKS5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOwotfQotCiB2b2lkIElubGluZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmluc2ljV2lkdGhGb3JGb3JtYXR0aW5nUm9vdChj b25zdCBCb3gmIGZvcm1hdHRpbmdSb290LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpv bnRhbFZhbHVlcykKIHsKICAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuZXN0YWJsaXNoZXNGb3Jt YXR0aW5nQ29udGV4dCgpKTsKQEAgLTIyOCwyNyArMjUxLDYgQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwg VXNlZEgKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsgaGVpZ2h0QW5kTWFyZ2lu Lm5vbkNvbGxhcHNlZE1hcmdpbiwgeyB9IH0pOwogfQogCi12b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiByb290LCBVc2Vk SG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVz IHVzZWRWZXJ0aWNhbFZhbHVlcykKLXsKLSAgICBBU1NFUlQocm9vdC5pc0Zsb2F0aW5nUG9zaXRp b25lZCgpIHx8IHJvb3QuaXNJbmxpbmVCbG9ja0JveCgpKTsKLQotICAgIGNvbXB1dGVCb3JkZXJB bmRQYWRkaW5nKHJvb3QsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKLSAgICBjb21wdXRlV2lkdGhB bmRNYXJnaW4ocm9vdCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOwotICAgIC8vIFRoaXMgaXMgc2lt aWxhciB0byBzdGF0aWMgcG9zaXRpb25pbmcgaW4gYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0LiBX ZSBqdXN0IG5lZWQgdG8gaW5pdGlhbGl6ZSB0aGUgdG9wIGxlZnQgcG9zaXRpb24uCi0gICAgZm9y bWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChyb290KS5zZXRUb3BMZWZ0KHsgMCwgMCB9KTsKLSAg ICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRo YXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgaWYgKGlzPENvbnRhaW5lcj4ocm9vdCkpIHsKLSAg ICAgICAgYXV0byYgcm9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4ocm9vdCk7Ci0g ICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3Jt YXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKLSAgICAgICAgZm9y bWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoKTsKLSAgICAgICAgLy8gQ29tZSBi YWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFyZ2luLgotICAgICAgICBj b21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWluZXIsIHVzZWRIb3Jpem9udGFsVmFsdWVz LCB1c2VkVmVydGljYWxWYWx1ZXMpOwotICAgICAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0 aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGdvIGJhY2sgYW5kIGxheW91dCB0aGUgb3V0LW9mLWZs b3cgY29udGVudC4KLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0Nv bnRlbnQoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihyb290 LCB1c2VkSG9yaXpvbnRhbFZhbHVlcywgdXNlZFZlcnRpY2FsVmFsdWVzKTsKLX0KLQogdm9pZCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kSGVpZ2h0Rm9yUmVwbGFjZWRJ bmxpbmVCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRI b3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzKQog ewogICAgIEFTU0VSVCghbGF5b3V0Qm94LmlzQ29udGFpbmVyKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmgKaW5kZXggNjhkNGE2ODM1YWNlNTU1OTU3OGE0ZmU4Nzc2ODVhZDk3OThk ZjEwZC4uNmNjZjE4OGQ5Mjg2MDBiZTM4OGFjNzIzYmM5NDhmYzhhMzliOWEzMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMDIsMTAgKzEwMiwxMSBAQCBwcml2YXRlOgog ICAgIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSBnZW9tZXRyeSgpIGNvbnN0IHsg cmV0dXJuIEdlb21ldHJ5KCp0aGlzKTsgfQogCiAgICAgdm9pZCBsYXlvdXRGb3JtYXR0aW5nQ29u dGV4dFJvb3QoY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZh bHVlcyk7Ci0gICAgdm9pZCBjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvcklubGluZUNv bnRhaW5lcihjb25zdCBDb250YWluZXImLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyk7Ci0gICAgdm9p ZCBpbml0aWFsaXplTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvckdlbmVyaWNJbmxpbmVCb3goY29u c3QgQm94Jik7CisgICAgdm9pZCBjb21wdXRlSG9yaXpvbnRhbEFuZFZlcnRpY2FsR2VvbWV0cnko Y29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyk7CisK ICAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNXaWR0aEZvckZvcm1hdHRpbmdSb290KGNvbnN0IEJv eCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZEhlaWdo dEZvclJlcGxhY2VkSW5saW5lQm94KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBV c2VkVmVydGljYWxWYWx1ZXMpOworCiAgICAgdm9pZCBjb21wdXRlSG9yaXpvbnRhbE1hcmdpbihj b25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAgICAgdm9pZCBjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxW YWx1ZXMpOwogICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRI b3Jpem9udGFsVmFsdWVzKTsK 379374 2019-09-23 09:21:43 -0700 2019-09-23 10:21:29 -0700 Patch bug-202092-20190923092143.patch text/plain 9708 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgyMjBhNDY0MWQzMWY2 NWFkNzNiNmNiZjY2NmExMjQzNTE5MDI2MC4uNzU5ZTVhZTNhZjFkZWQ3YzRlNzEyOWVhZTk4ODdi MWU0NDk4ODRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA5LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNZXJnZSBp bmxpbmUgYm94IGNvbXB1dGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwOTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1NjA3 NzQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIE1h a2UgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoKSBsb2dpYyBz aW1wbGVyLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVNYXJnaW5Cb3JkZXJBbmRQ YWRkaW5nRm9yR2VuZXJpY0lubGluZUJveCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFk ZGluZ0ZvcklubGluZUNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKwogMjAxOS0wOS0yMyAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUGFzcyBp biB0aGUgVXNlZCpWYWx1ZXMgdG8gaW5saW5lIGxheW91dCBmdW5jdGlvbnMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMDk5NDg1NGI5MzQ2MmE0YWY3MDMzMzI1ZmM1 MzkzZTE2MWQ4OTI4NC4uZGZhZTMyODliNDc2MzZlMDZjOTc1YzcxMDYyMWEwYzRmMmY2ZmEyYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNzgsMTQgKzc4LDggQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCgpCiAgICAg d2hpbGUgKGxheW91dEJveCkgewogICAgICAgICBpZiAobGF5b3V0Qm94LT5lc3RhYmxpc2hlc0Zv cm1hdHRpbmdDb250ZXh0KCkpCiAgICAgICAgICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJv b3QoKmxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7 Ci0gICAgICAgIGVsc2UgaWYgKGlzPENvbnRhaW5lcj4oKmxheW91dEJveCkpCi0gICAgICAgICAg ICBjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvcklubGluZUNvbnRhaW5lcihkb3duY2Fz dDxDb250YWluZXI+KCpsYXlvdXRCb3gpLCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7Ci0gICAgICAg IGVsc2UgaWYgKGxheW91dEJveC0+aXNSZXBsYWNlZCgpKQotICAgICAgICAgICAgY29tcHV0ZVdp ZHRoQW5kSGVpZ2h0Rm9yUmVwbGFjZWRJbmxpbmVCb3goKmxheW91dEJveCwgdXNlZEhvcml6b250 YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAg ICAgQVNTRVJUKGxheW91dEJveC0+aXNJbmxpbmVMZXZlbEJveCgpKTsKLSAgICAgICAgICAgIGlu aXRpYWxpemVNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nRm9yR2VuZXJpY0lubGluZUJveCgqbGF5b3V0 Qm94KTsKLSAgICAgICAgfQorICAgICAgICBlbHNlCisgICAgICAgICAgICBjb21wdXRlSG9yaXpv bnRhbEFuZFZlcnRpY2FsR2VvbWV0cnkoKmxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMs IHVzZWRWZXJ0aWNhbFZhbHVlcyk7CiAgICAgICAgIGxheW91dEJveCA9IG5leHRJblByZU9yZGVy KCpsYXlvdXRCb3gsIHJvb3QoKSk7CiAgICAgfQogCkBAIC05OCw2ICs5Miw1NCBAQCB2b2lkIElu bGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KCkKICAgICBMT0dfV0lU SF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0VuZF0gLT4gaW5s aW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8 ICIpIik7CiB9CiAKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRp bmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgVXNlZEhvcml6 b250YWxWYWx1ZXMgdXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyB1c2Vk VmVydGljYWxWYWx1ZXMpCit7CisgICAgQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpIHx8IGZvcm1hdHRpbmdDb250ZXh0Um9vdC5pc0lubGluZUJsb2Nr Qm94KCkpOworCisgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcoZm9ybWF0dGluZ0NvbnRleHRS b290LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7CisgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGZv cm1hdHRpbmdDb250ZXh0Um9vdCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgIC8vIFN3aWNo IG92ZXIgdG8gdGhlIG5ldyBmb3JtYXR0aW5nIGNvbnRleHQgKHRoZSBvbmUgdGhhdCB0aGUgcm9v dCBjcmVhdGVzKS4KKyAgICBpZiAoaXM8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3Qp KSB7CisgICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGZv cm1hdHRpbmdDb250ZXh0Um9vdCk7CisgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBM YXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlv dXRTdGF0ZSgpKTsKKyAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRl bnQoKTsKKyAgICAgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdo dCBhbmQgbWFyZ2luLgorICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWlu ZXIsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOworICAgICAgICAv LyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGdvIGJhY2sg YW5kIGxheW91dCB0aGUgb3V0LW9mLWZsb3cgY29udGVudC4KKyAgICAgICAgZm9ybWF0dGluZ0Nv bnRleHQtPmxheW91dE91dE9mRmxvd0NvbnRlbnQoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgY29t cHV0ZUhlaWdodEFuZE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3QsIHVzZWRIb3Jpem9udGFs VmFsdWVzLCB1c2VkVmVydGljYWxWYWx1ZXMpOworfQorCit2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlSG9yaXpvbnRhbEFuZFZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94JiBs YXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2Vk VmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzKQoreworICAgIGlmIChpczxDb250YWlu ZXI+KGxheW91dEJveCkpIHsKKyAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgKDxzcGFuPikg Y2FuJ3QgZ2V0IHNpemVkL3Bvc2l0aW9uZWQgeWV0LiBBdCB0aGlzIHBvaW50IHdlIGNhbiBvbmx5 IGNvbXB1dGUgdGhlaXIgbWFyZ2lucywgYm9yZGVycyBhbmQgcGFkZGluZ3MuCisgICAgICAgIGNv bXB1dGVIb3Jpem9udGFsTWFyZ2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOwor ICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFs VmFsdWVzKTsKKyAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMgaGF2ZSAwIGNvbXB1dGVkIHZl cnRpY2FsIG1hcmdpbnMuCisgICAgICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5 b3V0Qm94KS5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkKCkpIHsKKyAgICAgICAgLy8g UmVwbGFjZWQgZWxlbWVudHMgKGltZywgdmlkZW8pIGNhbiBiZSBzaXplZCBidXQgbm90IHlldCBw b3NpdGlvbmVkLgorICAgICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsIHVz ZWRIb3Jpem9udGFsVmFsdWVzKTsKKyAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91 dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOworICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFy Z2luKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICAvLyBUaGVzZSBhcmUgYWN0dWFsIHRleHQg Ym94ZXMuIE5vIG1hcmdpbnMsIGJvcmRlcnMgb3IgcGFkZGluZ3MuCisgICAgQVNTRVJUKGxheW91 dEJveC5pc0Fub255bW91cygpIHx8IGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKTsKKyAgICBh dXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChsYXlvdXRCb3gp OworCisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOworICAg IGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IH0pOworICAgIGRpc3BsYXlCb3guc2V0 Qm9yZGVyKHsgeyB9LCB7IH0gfSk7CisgICAgZGlzcGxheUJveC5zZXRQYWRkaW5nKHsgfSk7Cit9 CisKIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKQogewog ICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKQEAgLTE0OSwyNSAr MTkxLDYgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW4KICAgICByZXR1cm4gY29uc3RyYWludHM7 CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVNYXJnaW5Cb3Jk ZXJBbmRQYWRkaW5nRm9yR2VuZXJpY0lubGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCkKLXsK LSAgICBBU1NFUlQobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkgfHwgbGF5b3V0Qm94LmlzTGluZUJy ZWFrQm94KCkpOwotICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNw bGF5Qm94KGxheW91dEJveCk7Ci0KLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsg eyB9LCB7IH0gfSk7Ci0gICAgZGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7Ci0g ICAgZGlzcGxheUJveC5zZXRCb3JkZXIoeyB7IH0sIHsgfSB9KTsKLSAgICBkaXNwbGF5Qm94LnNl dFBhZGRpbmcoeyB9KTsKLX0KLQotdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZU1hcmdpbkJvcmRlckFuZFBhZGRpbmdGb3JJbmxpbmVDb250YWluZXIoY29uc3QgQ29udGFpbmVy JiBjb250YWluZXIsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRIb3Jpem9udGFsVmFsdWVzKQot ewotICAgIGNvbXB1dGVIb3Jpem9udGFsTWFyZ2luKGNvbnRhaW5lciwgdXNlZEhvcml6b250YWxW YWx1ZXMpOwotICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGNvbnRhaW5lciwgdXNlZEhvcml6 b250YWxWYWx1ZXMpOwotICAgIC8vIElubGluZSBjb250YWluZXJzICg8c3Bhbj4pIGhhdmUgMCB2 ZXJ0aWNhbCBtYXJnaW5zLgotICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3goY29udGFp bmVyKS5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOwotfQotCiB2b2lkIElubGluZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmluc2ljV2lkdGhGb3JGb3JtYXR0aW5nUm9vdChj b25zdCBCb3gmIGZvcm1hdHRpbmdSb290LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpv bnRhbFZhbHVlcykKIHsKICAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuZXN0YWJsaXNoZXNGb3Jt YXR0aW5nQ29udGV4dCgpKTsKQEAgLTIyOCwyNyArMjUxLDYgQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwg VXNlZEgKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsgaGVpZ2h0QW5kTWFyZ2lu Lm5vbkNvbGxhcHNlZE1hcmdpbiwgeyB9IH0pOwogfQogCi12b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiByb290LCBVc2Vk SG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVz IHVzZWRWZXJ0aWNhbFZhbHVlcykKLXsKLSAgICBBU1NFUlQocm9vdC5pc0Zsb2F0aW5nUG9zaXRp b25lZCgpIHx8IHJvb3QuaXNJbmxpbmVCbG9ja0JveCgpKTsKLQotICAgIGNvbXB1dGVCb3JkZXJB bmRQYWRkaW5nKHJvb3QsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKLSAgICBjb21wdXRlV2lkdGhB bmRNYXJnaW4ocm9vdCwgdXNlZEhvcml6b250YWxWYWx1ZXMpOwotICAgIC8vIFRoaXMgaXMgc2lt aWxhciB0byBzdGF0aWMgcG9zaXRpb25pbmcgaW4gYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0LiBX ZSBqdXN0IG5lZWQgdG8gaW5pdGlhbGl6ZSB0aGUgdG9wIGxlZnQgcG9zaXRpb24uCi0gICAgZm9y bWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChyb290KS5zZXRUb3BMZWZ0KHsgMCwgMCB9KTsKLSAg ICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRo YXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgaWYgKGlzPENvbnRhaW5lcj4ocm9vdCkpIHsKLSAg ICAgICAgYXV0byYgcm9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4ocm9vdCk7Ci0g ICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3Jt YXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKLSAgICAgICAgZm9y bWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoKTsKLSAgICAgICAgLy8gQ29tZSBi YWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFyZ2luLgotICAgICAgICBj b21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWluZXIsIHVzZWRIb3Jpem9udGFsVmFsdWVz LCB1c2VkVmVydGljYWxWYWx1ZXMpOwotICAgICAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0 aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGdvIGJhY2sgYW5kIGxheW91dCB0aGUgb3V0LW9mLWZs b3cgY29udGVudC4KLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0Nv bnRlbnQoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihyb290 LCB1c2VkSG9yaXpvbnRhbFZhbHVlcywgdXNlZFZlcnRpY2FsVmFsdWVzKTsKLX0KLQogdm9pZCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kSGVpZ2h0Rm9yUmVwbGFjZWRJ bmxpbmVCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRI b3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMgdXNlZFZlcnRpY2FsVmFsdWVzKQog ewogICAgIEFTU0VSVCghbGF5b3V0Qm94LmlzQ29udGFpbmVyKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmgKaW5kZXggNjhkNGE2ODM1YWNlNTU1OTU3OGE0ZmU4Nzc2ODVhZDk3OThk ZjEwZC4uNmNjZjE4OGQ5Mjg2MDBiZTM4OGFjNzIzYmM5NDhmYzhhMzliOWEzMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMDIsMTAgKzEwMiwxMSBAQCBwcml2YXRlOgog ICAgIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSBnZW9tZXRyeSgpIGNvbnN0IHsg cmV0dXJuIEdlb21ldHJ5KCp0aGlzKTsgfQogCiAgICAgdm9pZCBsYXlvdXRGb3JtYXR0aW5nQ29u dGV4dFJvb3QoY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZh bHVlcyk7Ci0gICAgdm9pZCBjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvcklubGluZUNv bnRhaW5lcihjb25zdCBDb250YWluZXImLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyk7Ci0gICAgdm9p ZCBpbml0aWFsaXplTWFyZ2luQm9yZGVyQW5kUGFkZGluZ0ZvckdlbmVyaWNJbmxpbmVCb3goY29u c3QgQm94Jik7CisgICAgdm9pZCBjb21wdXRlSG9yaXpvbnRhbEFuZFZlcnRpY2FsR2VvbWV0cnko Y29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyk7CisK ICAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNXaWR0aEZvckZvcm1hdHRpbmdSb290KGNvbnN0IEJv eCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZEhlaWdo dEZvclJlcGxhY2VkSW5saW5lQm94KGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBV c2VkVmVydGljYWxWYWx1ZXMpOworCiAgICAgdm9pZCBjb21wdXRlSG9yaXpvbnRhbE1hcmdpbihj b25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAgICAgdm9pZCBjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxW YWx1ZXMpOwogICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRI b3Jpem9udGFsVmFsdWVzKTsK