192345 2018-12-03 18:58:39 -0800 [LFC][BFC][MarginCollapsing] HeightAndMargin::margin is always the non-collapsed margin value. 2018-12-06 07:26:39 -0800 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 1484662 0 zalan 2018-12-03 18:58:39 -0800 VerticalEdges margin -> nonCollapsedMargin; 1484663 1 356445 zalan 2018-12-03 19:02:16 -0800 Created attachment 356445 Patch 1485692 2 zalan 2018-12-06 07:25:03 -0800 Committed r238931: <https://trac.webkit.org/changeset/238931> 1485693 3 webkit-bug-importer 2018-12-06 07:26:39 -0800 <rdar://problem/46523172> 356445 2018-12-03 19:02:16 -0800 2018-12-05 08:27:51 -0800 Patch Patch.txt text/plain 11028 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZDllZWY2OTcyNC4uMDFhZWUyNWYxOGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOC0xMi0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gSGVpZ2h0QW5kTWFyZ2luOjpt YXJnaW4gaXMgYWx3YXlzIHRoZSBub24tY29sbGFwc2VkIG1hcmdpbiB2YWx1ZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjM0NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBIZWlnaHRBbmRN YXJnaW46Om1hcmdpbiB0byBIZWlnaHRBbmRNYXJnaW46Om5vbkNvbGxhcHNlZE1hcmdpbi4KKwor ICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93VmVydGljYWxHZW9t ZXRyeSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L0xheW91dFVuaXRzLmg6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkhlaWdodEFuZE1hcmdpbjo6dXNlZE1hcmdpblZhbHVlcyBjb25zdCk6 CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZUhlaWdodEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9u UmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKToKKyAg ICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWly a3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpRdWlya3M6OnN0cmV0Y2hlZEhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbiBjb25z dCk6CisKIDIwMTgtMTItMDIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtCRkNdW01hcmdpbkNvbGxhcHNpbmddIEFkZCBNYXJnaW5Db2xsYXBzZTo6ZXN0 YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAwZjhiMDJjOGM0MC4uZmY0MTIwMGFlN2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTE1LDExICsx MTUsMTMgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRpY2Fs R2VvbWV0cnkoY29uc3QgQm94JiBsYXlvdXRCb3gpIGMKICAgICB9CiAKICAgICBhdXRvJiBkaXNw bGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gpOwot ICAgIGRpc3BsYXlCb3guc2V0VG9wKHZlcnRpY2FsR2VvbWV0cnkudG9wICsgdmVydGljYWxHZW9t ZXRyeS5oZWlnaHRBbmRNYXJnaW4ubWFyZ2luLnRvcCk7Ci0gICAgZGlzcGxheUJveC5zZXRDb250 ZW50Qm94SGVpZ2h0KHZlcnRpY2FsR2VvbWV0cnkuaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7Cisg ICAgLy8gTWFyZ2lucyBvZiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxh cHNlCiAgICAgQVNTRVJUKCF2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1hcmdpbi5jb2xsYXBz ZWRNYXJnaW4pOwotICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4odmVydGljYWxHZW9t ZXRyeS5oZWlnaHRBbmRNYXJnaW4ubWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2Fs Tm9uQ29sbGFwc2VkTWFyZ2luKHZlcnRpY2FsR2VvbWV0cnkuaGVpZ2h0QW5kTWFyZ2luLm1hcmdp bik7CisgICAgYXV0byBub25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbnMgPSB2ZXJ0aWNhbEdlb21l dHJ5LmhlaWdodEFuZE1hcmdpbi51c2VkTWFyZ2luVmFsdWVzKCk7CisgICAgZGlzcGxheUJveC5z ZXRUb3AodmVydGljYWxHZW9tZXRyeS50b3AgKyBub25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbnMu dG9wKTsKKyAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQodmVydGljYWxHZW9tZXRy eS5oZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKKyAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFy Z2luKG5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2lucyk7CisgICAgZGlzcGxheUJveC5zZXRWZXJ0 aWNhbE5vbkNvbGxhcHNlZE1hcmdpbihub25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbnMpOwogfQog CiB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9M YXlvdXRVbml0cy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKaW5kZXgg YjFjM2Q1MjFkNDUuLjNlMWQ4NDQ2Zjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0VW5pdHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMu aApAQCAtMTA3LDEwICsxMDcsMTAgQEAgc3RydWN0IFdpZHRoQW5kTWFyZ2luIHsKIH07CiAKIHN0 cnVjdCBIZWlnaHRBbmRNYXJnaW4gewotICAgIFZlcnRpY2FsRWRnZXMgdXNlZE1hcmdpblZhbHVl cygpIGNvbnN0IHsgcmV0dXJuIGNvbGxhcHNlZE1hcmdpbi52YWx1ZV9vcihtYXJnaW4pOyB9Cisg ICAgVmVydGljYWxFZGdlcyB1c2VkTWFyZ2luVmFsdWVzKCkgY29uc3QgeyByZXR1cm4gY29sbGFw c2VkTWFyZ2luLnZhbHVlX29yKG5vbkNvbGxhcHNlZE1hcmdpbik7IH0KIAogICAgIExheW91dFVu aXQgaGVpZ2h0OwotICAgIFZlcnRpY2FsRWRnZXMgbWFyZ2luOworICAgIFZlcnRpY2FsRWRnZXMg bm9uQ29sbGFwc2VkTWFyZ2luOwogICAgIHN0ZDo6b3B0aW9uYWw8VmVydGljYWxFZGdlcz4gY29s bGFwc2VkTWFyZ2luOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXgg ZjgwZTMxZmYyZGQuLjI2YTgyYjczMzU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5j cHAKQEAgLTM1OCw3ICszNTgsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiAgICAgICAgICAg ICBhdXRvIG1heEhlaWdodEFuZE1hcmdpbiA9IGNvbXB1dGUobWF4SGVpZ2h0KTsKICAgICAgICAg ICAgIC8vIFVzZWQgaGVpZ2h0IHNob3VsZCByZW1haW4gdGhlIHNhbWUuCiAgICAgICAgICAgICBB U1NFUlQoKGxheW91dFN0YXRlLmluUXVpcmtzTW9kZSgpICYmIChsYXlvdXRCb3guaXNCb2R5Qm94 KCkgfHwgbGF5b3V0Qm94LmlzRG9jdW1lbnRCb3goKSkpIHx8IG1heEhlaWdodEFuZE1hcmdpbi5o ZWlnaHQgPT0gKm1heEhlaWdodCk7Ci0gICAgICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSB7ICpt YXhIZWlnaHQsIG1heEhlaWdodEFuZE1hcmdpbi5tYXJnaW4sIG1heEhlaWdodEFuZE1hcmdpbi5j b2xsYXBzZWRNYXJnaW4gfTsKKyAgICAgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IHsgKm1heEhl aWdodCwgbWF4SGVpZ2h0QW5kTWFyZ2luLm5vbkNvbGxhcHNlZE1hcmdpbiwgbWF4SGVpZ2h0QW5k TWFyZ2luLmNvbGxhcHNlZE1hcmdpbiB9OwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNjcsMTgg KzM2NywxOCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRN YXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiAgICAgICAgICAgICBhdXRvIG1pbkhl aWdodEFuZE1hcmdpbiA9IGNvbXB1dGUobWluSGVpZ2h0KTsKICAgICAgICAgICAgIC8vIFVzZWQg aGVpZ2h0IHNob3VsZCByZW1haW4gdGhlIHNhbWUuCiAgICAgICAgICAgICBBU1NFUlQoKGxheW91 dFN0YXRlLmluUXVpcmtzTW9kZSgpICYmIChsYXlvdXRCb3guaXNCb2R5Qm94KCkgfHwgbGF5b3V0 Qm94LmlzRG9jdW1lbnRCb3goKSkpIHx8IG1pbkhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPT0gKm1p bkhlaWdodCk7Ci0gICAgICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSB7ICptaW5IZWlnaHQsIG1p bkhlaWdodEFuZE1hcmdpbi5tYXJnaW4sIG1pbkhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJn aW4gfTsKKyAgICAgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IHsgKm1pbkhlaWdodCwgbWluSGVp Z2h0QW5kTWFyZ2luLm5vbkNvbGxhcHNlZE1hcmdpbiwgbWluSGVpZ2h0QW5kTWFyZ2luLmNvbGxh cHNlZE1hcmdpbiB9OwogICAgICAgICB9CiAgICAgfQogCiAgICAgYXV0byYgZGlzcGxheUJveCA9 IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKICAgICBkaXNw bGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQoaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7Ci0gICAg ZGlzcGxheUJveC5zZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbihoZWlnaHRBbmRNYXJnaW4u bWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKGhlaWdodEFuZE1hcmdp bi5jb2xsYXBzZWRNYXJnaW4udmFsdWVfb3IoaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbikpOworICAg IGRpc3BsYXlCb3guc2V0VmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4oaGVpZ2h0QW5kTWFyZ2lu Lm5vbkNvbGxhcHNlZE1hcmdpbik7CisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbiho ZWlnaHRBbmRNYXJnaW4udXNlZE1hcmdpblZhbHVlcygpKTsKIAogICAgIC8vIElmIHRoaXMgYm94 IGhhcyBhbHJlYWR5IGJlZW4gbW92ZWQgYnkgdGhlIGVzdGltYXRlZCB2ZXJ0aWNhbCBtYXJnaW4s IG5vIG5lZWQgdG8gbW92ZSBpdCBhZ2Fpbi4KICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQ b3NpdGlvbmVkKCkgfHwgIWRpc3BsYXlCb3guZXN0aW1hdGVkTWFyZ2luVG9wKCkpCi0gICAgICAg IGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVpZ2h0QW5kTWFyZ2luLmNvbGxhcHNlZE1hcmdp bi52YWx1ZV9vcihoZWlnaHRBbmRNYXJnaW4ubWFyZ2luKS50b3ApOworICAgICAgICBkaXNwbGF5 Qm94Lm1vdmVWZXJ0aWNhbGx5KGhlaWdodEFuZE1hcmdpbi51c2VkTWFyZ2luVmFsdWVzKCkudG9w KTsKIH0KIAogRm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA4MTlm MDMwM2UwOS4uM2IwOWYzMGNmMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAKQEAgLTEwNCw3ICsxMDQsNyBAQCBIZWlnaHRBbmRNYXJnaW4gQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFy ZwogCiAgICAgYXV0byBoZWlnaHRBbmRNYXJnaW4gPSBjb21wdXRlKCk7CiAKLSAgICBMT0dfV0lU SF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0hlaWdodF1bTWFy Z2luXSAtPiBpbmZsb3cgbm9uLXJlcGxhY2VkIC0+IGhlaWdodCgiIDw8IGhlaWdodEFuZE1hcmdp bi5oZWlnaHQgPDwgInB4KSBtYXJnaW4oIiA8PCBoZWlnaHRBbmRNYXJnaW4ubWFyZ2luLnRvcCA8 PCAicHgsICIgPDwgaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi5ib3R0b20gPDwgInB4KSAtPiBsYXlv dXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CisgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1h dHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltIZWlnaHRdW01hcmdpbl0gLT4gaW5mbG93 IG5vbi1yZXBsYWNlZCAtPiBoZWlnaHQoIiA8PCBoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0IDw8ICJw eCkgbWFyZ2luKCIgPDwgaGVpZ2h0QW5kTWFyZ2luLnVzZWRNYXJnaW5WYWx1ZXMoKS50b3AgPDwg InB4LCAiIDw8IGhlaWdodEFuZE1hcmdpbi51c2VkTWFyZ2luVmFsdWVzKCkuYm90dG9tIDw8ICJw eCkgLT4gbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwogICAgIHJldHVybiBoZWln aHRBbmRNYXJnaW47CiB9CiAKQEAgLTI2Myw3ICsyNjMsNyBAQCBIZWlnaHRBbmRNYXJnaW4gQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbihjb25z dCBMYQogCiAgICAgaGVpZ2h0QW5kTWFyZ2luID0gUXVpcmtzOjpzdHJldGNoZWRIZWlnaHQobGF5 b3V0U3RhdGUsIGxheW91dEJveCwgaGVpZ2h0QW5kTWFyZ2luKTsKIAotICAgIExPR19XSVRIX1NU UkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbSGVpZ2h0XVtNYXJnaW5d IC0+IGluZmxvdyBub24tcmVwbGFjZWQgLT4gc3RyZWNoZWQgdG8gdmlld3BvcnQgLT4gaGVpZ2h0 KCIgPDwgaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCA8PCAicHgpIG1hcmdpbigiIDw8IGhlaWdodEFu ZE1hcmdpbi5tYXJnaW4udG9wIDw8ICJweCwgIiA8PCBoZWlnaHRBbmRNYXJnaW4ubWFyZ2luLmJv dHRvbSA8PCAicHgpIC0+IGxheW91dEJveCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKKyAgICBM T0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0hlaWdo dF1bTWFyZ2luXSAtPiBpbmZsb3cgbm9uLXJlcGxhY2VkIC0+IHN0cmVjaGVkIHRvIHZpZXdwb3J0 IC0+IGhlaWdodCgiIDw8IGhlaWdodEFuZE1hcmdpbi5oZWlnaHQgPDwgInB4KSBtYXJnaW4oIiA8 PCBoZWlnaHRBbmRNYXJnaW4udXNlZE1hcmdpblZhbHVlcygpLnRvcCA8PCAicHgsICIgPDwgaGVp Z2h0QW5kTWFyZ2luLnVzZWRNYXJnaW5WYWx1ZXMoKS5ib3R0b20gPDwgInB4KSAtPiBsYXlvdXRC b3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CiAgICAgcmV0dXJuIGhlaWdodEFuZE1hcmdpbjsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggMmFi OTJlODkyMDQuLjkzNzJjYmMwMmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dFF1aXJrcy5jcHAKQEAgLTc5LDkgKzc5LDEyIEBAIEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjpRdWlya3M6OnN0cmV0Y2hlZEhlaWdodChjb25zdCBMYXlvdXRTdGF0CiAg ICAgc3RyZWNoZWRIZWlnaHQgLT0gZG9jdW1lbnRCb3hWZXJ0aWNhbEJvcmRlcnMgKyBkb2N1bWVu dEJveFZlcnRpY2FsUGFkZGluZ3M7CiAKICAgICBMYXlvdXRVbml0IHRvdGFsVmVydGljYWxNYXJn aW5zOwotICAgIGlmIChsYXlvdXRCb3guaXNEb2N1bWVudEJveCgpKQotICAgICAgICB0b3RhbFZl cnRpY2FsTWFyZ2lucyA9IGhlaWdodEFuZE1hcmdpbi5tYXJnaW4udG9wICsgaGVpZ2h0QW5kTWFy Z2luLm1hcmdpbi5ib3R0b207Ci0gICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzQm9keUJveCgpKSB7 CisgICAgaWYgKGxheW91dEJveC5pc0RvY3VtZW50Qm94KCkpIHsKKyAgICAgICAgYXV0byB2ZXJ0 aWNhbE1hcmdpbnMgPSBoZWlnaHRBbmRNYXJnaW4udXNlZE1hcmdpblZhbHVlcygpOworICAgICAg ICAvLyBEb2N1bWVudCBib3gncyBtYXJnaW5zIGRvIG5vdCBjb2xsYXBzZS4KKyAgICAgICAgQVNT RVJUKCFoZWlnaHRBbmRNYXJnaW4uY29sbGFwc2VkTWFyZ2luKTsKKyAgICAgICAgdG90YWxWZXJ0 aWNhbE1hcmdpbnMgPSB2ZXJ0aWNhbE1hcmdpbnMudG9wICsgdmVydGljYWxNYXJnaW5zLmJvdHRv bTsKKyAgICB9IGVsc2UgaWYgKGxheW91dEJveC5pc0JvZHlCb3goKSkgewogICAgICAgICAvLyBI ZXJlIGlzIHRoZSBxdWlya3kgcGFydCBmb3IgYm9keSBib3g6CiAgICAgICAgIC8vIFN0cmV0Y2gg dGhlIGJvZHkgdXNpbmcgdGhlIGluaXRpYWwgY29udGFpbmluZyBibG9jaydzIGhlaWdodCBhbmQg c2hyaW5rIGl0IHdpdGggZG9jdW1lbnQgYm94J3MgbWFyZ2luL2JvcmRlci9wYWRkaW5nLgogICAg ICAgICAvLyBUaGlzIGxvb2tzIGV4dHJlbWVseSBvZGQgd2hlbiBodG1sIGhhcyBub24tYXV0byBo ZWlnaHQuCkBAIC05MCw3ICs5Myw3IEBAIEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpRdWlya3M6OnN0cmV0Y2hlZEhlaWdodChjb25zdCBMYXlvdXRTdGF0CiAKICAgICAg ICAgLy8gVGhpcyBxdWlyayBoYXBwZW5zIHdoZW4gdGhlIGJvZHkgaGVpZ2h0IGlzIDAgd2hpY2gg bWVhbnMgaXRzIHZlcnRpY2FsIG1hcmdpbnMgY29sbGFwc2UgdGhyb3VnaCAodG9wIGFuZCBib3R0 b20gbWFyZ2lucyBhcmUgYWRqb2luaW5nKS4KICAgICAgICAgLy8gSG93ZXZlciBub3cgdGhhdCB3 ZSBzdHJldGNoIHRoZSBib2R5IHRoZXkgZG9uJ3QgY29sbGFwc2UgdGhyb3VnaCBhbnltb3JlLCBz byB3ZSBuZWVkIHRvIHVzZSB0aGUgbm9uLWNvbGxhcHNlZCB2YWx1ZXMgaW5zdGVhZC4KLSAgICAg ICAgYXV0byBib2R5Qm94VmVydGljYWxNYXJnaW5zID0gaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCA/ IGhlaWdodEFuZE1hcmdpbi51c2VkTWFyZ2luVmFsdWVzKCkgOiBoZWlnaHRBbmRNYXJnaW4ubWFy Z2luOworICAgICAgICBhdXRvIGJvZHlCb3hWZXJ0aWNhbE1hcmdpbnMgPSBoZWlnaHRBbmRNYXJn aW4uaGVpZ2h0ID8gaGVpZ2h0QW5kTWFyZ2luLnVzZWRNYXJnaW5WYWx1ZXMoKSA6IGhlaWdodEFu ZE1hcmdpbi5ub25Db2xsYXBzZWRNYXJnaW47CiAgICAgICAgIHRvdGFsVmVydGljYWxNYXJnaW5z ID0gYm9keUJveFZlcnRpY2FsTWFyZ2lucy50b3AgKyBib2R5Qm94VmVydGljYWxNYXJnaW5zLmJv dHRvbTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAz MjAxMmMzY2EyYS4uYjUzMGFkNmY0YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKQEAgLTM2Miw4ICszNjIsOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAogCiAgICAg YXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5 b3V0Qm94KTsKICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQoaGVpZ2h0QW5kTWFy Z2luLmhlaWdodCk7Ci0gICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdp bihoZWlnaHRBbmRNYXJnaW4ubWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFy Z2luKGhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJnaW4udmFsdWVfb3IoaGVpZ2h0QW5kTWFy Z2luLm1hcmdpbikpOworICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxOb25Db2xsYXBzZWRNYXJn aW4oaGVpZ2h0QW5kTWFyZ2luLm5vbkNvbGxhcHNlZE1hcmdpbik7CisgICAgZGlzcGxheUJveC5z ZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRBbmRNYXJnaW4udXNlZE1hcmdpblZhbHVlcygpKTsKIH0K IAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRS b290KGNvbnN0IEJveCYgcm9vdCkgY29uc3QK