189271 2018-09-04 13:22:47 -0700 [LFC][BFC] Merge computeInFlowWidth(Height)AndMargin and computeFloatingWidth(Height)AndMargin. 2018-09-04 14:26:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1456428 0 zalan 2018-09-04 13:22:47 -0700 This is in preparation for adding min/max-widht(height. 1456429 1 348843 zalan 2018-09-04 13:26:39 -0700 Created attachment 348843 Patch 1456455 2 zalan 2018-09-04 14:25:56 -0700 Committed r235639: <https://trac.webkit.org/changeset/235639> 1456456 3 webkit-bug-importer 2018-09-04 14:26:15 -0700 <rdar://problem/44112622> 348843 2018-09-04 13:26:39 -0700 2018-09-04 14:18:14 -0700 Patch bug-189271-20180904132636.patch text/plain 9392 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZmMzcxOTNkZmRmZDY1 NjUxNjMyYmE2NjAyYjc1NDZjNGJiMjAxOC4uMTU2OThmMWY4MzRhNGZjZGNmY2Y1N2E3YzBlZDcz NWJkZTljYzkyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA5LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBNZXJnZSBj b21wdXRlSW5GbG93V2lkdGgoSGVpZ2h0KUFuZE1hcmdpbiBhbmQgY29tcHV0ZUZsb2F0aW5nV2lk dGgoSGVpZ2h0KUFuZE1hcmdpbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4OTI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBtaW4vbWF4LXdp ZGh0KGhlaWdodCkuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUZsb2F0 aW5nSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVGbG9hdGluZ1dpZHRoQW5kTWFyZ2luIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAg ICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlV2lkdGhBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxv d0hlaWdodEFuZE1hcmdpbiBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dXaWR0aEFuZE1hcmdpbiBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0Lmg6CisKIDIwMTgtMDktMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIEZpbHRlckVmZmVjdFJlbmRlcmVyIHRv IENTU0ZpbHRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAK aW5kZXggNmYyYzVjNzcxMjk0ZjM3MzM5MDQ5ODZmODRmZDc2ZjYxZThmNzMzYy4uYmE4MjBjZTk1 N2YxYTQzOTNiODc2ZDRjMDMwNzkxOWEzODRkNTM5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC01MSwyNSArNTEsNiBAQCBGb3JtYXR0aW5nQ29u dGV4dDo6fkZvcm1hdHRpbmdDb250ZXh0KCkKIHsKIH0KIAotdm9pZCBGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNv bnN0Ci17Ci0gICAgYXV0byBoZWlnaHRBbmRNYXJnaW4gPSBHZW9tZXRyeTo6ZmxvYXRpbmdIZWln aHRBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKLSAgICBkaXNwbGF5Qm94LnNl dENvbnRlbnRCb3hIZWlnaHQoaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7Ci0gICAgZGlzcGxheUJv eC5tb3ZlVmVydGljYWxseShoZWlnaHRBbmRNYXJnaW4ubWFyZ2luLnRvcCk7Ci0gICAgQVNTRVJU KCFoZWlnaHRBbmRNYXJnaW4uY29sbGFwc2VkTWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFZl cnRpY2FsTWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwotICAgIGRpc3BsYXlCb3guc2V0 VmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4oaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbik7Ci19Ci0K LXZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVGbG9hdGluZ1dpZHRoQW5kTWFyZ2luKExh eW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5 OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0Ci17Ci0gICAgYXV0byB3aWR0aEFuZE1hcmdpbiA9IEdl b21ldHJ5OjpmbG9hdGluZ1dpZHRoQW5kTWFyZ2luKGxheW91dENvbnRleHQsICp0aGlzLCBsYXlv dXRCb3gpOwotICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKHdpZHRoQW5kTWFyZ2lu LndpZHRoKTsKLSAgICBkaXNwbGF5Qm94Lm1vdmVIb3Jpem9udGFsbHkod2lkdGhBbmRNYXJnaW4u bWFyZ2luLmxlZnQpOwotICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih3aWR0aEFu ZE1hcmdpbi5tYXJnaW4pOwotICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE5vbkNvbXB1dGVk TWFyZ2luKHdpZHRoQW5kTWFyZ2luLm5vbkNvbXB1dGVkTWFyZ2luKTsKLX0KLQogdm9pZCBGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShMYXlvdXRD b250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94 JiBkaXNwbGF5Qm94KSBjb25zdAogewogICAgIGF1dG8gaG9yaXpvbnRhbEdlb21ldHJ5ID0gR2Vv bWV0cnk6Om91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShsYXlvdXRDb250ZXh0LCAqdGhpcywg bGF5b3V0Qm94KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5k ZXggYWViMGUyZjlhM2EwNzcwZDBlNzY0MzIyOGUyZWYxMDkxM2VhMTIxOC4uMmQ2NTIwNjNlZjIx YTZkY2I2MjQ3Zjc3ODg0NDdkZDhmZTc1Zjc0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0LmgKQEAgLTc1LDkgKzc1LDYgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1 YWwgdm9pZCBjb21wdXRlU3RhdGljUG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYs IERpc3BsYXk6OkJveCYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUluRmxv d1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6 Qm94JikgY29uc3QgPSAwOwogCi0gICAgdm9pZCBjb21wdXRlRmxvYXRpbmdIZWlnaHRBbmRNYXJn aW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwotICAg IHZvaWQgY29tcHV0ZUZsb2F0aW5nV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0 IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwotCiAgICAgdm9pZCBjb21wdXRlQm9yZGVyQW5k UGFkZGluZyhMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7 CiAKICAgICB2b2lkIHBsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKExheW91dENvbnRleHQm LCBjb25zdCBDb250YWluZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IDExMTg0MjFhM2Q4YTRkNGZmYWFiNDcyOGUzZTJhYTFmY2Y4ZGIwYjAuLmE5Y2ZjYTkx ZGE4NmVlMDI5NTE4OGYyMWQyMGQ4MTkzODkzOWNkOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtMjQ0LDQ2ICsyNDQsNDUgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlSW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91dENvbnRleHQmIGxheW8K IAogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4oTGF5 b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6 OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKLSAgICBpZiAobGF5b3V0Qm94LmlzSW5GbG93KCkp Ci0gICAgICAgIHJldHVybiBjb21wdXRlSW5GbG93V2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4 dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKKyAgICBXaWR0aEFuZE1hcmdpbiB3aWR0aEFuZE1h cmdpbjsKIAotICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKLSAgICAg ICAgcmV0dXJuIGNvbXB1dGVGbG9hdGluZ1dpZHRoQW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxh eW91dEJveCwgZGlzcGxheUJveCk7CisgICAgaWYgKGxheW91dEJveC5pc0luRmxvdygpKQorICAg ICAgICB3aWR0aEFuZE1hcmdpbiA9IEdlb21ldHJ5OjppbkZsb3dXaWR0aEFuZE1hcmdpbihsYXlv dXRDb250ZXh0LCBsYXlvdXRCb3gpOworICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5n UG9zaXRpb25lZCgpKQorICAgICAgICB3aWR0aEFuZE1hcmdpbiA9IEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6ZmxvYXRpbmdXaWR0aEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCAqdGhpcywg bGF5b3V0Qm94KTsKKyAgICBlbHNlCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCi0g ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lk dGgod2lkdGhBbmRNYXJnaW4ud2lkdGgpOworICAgIGRpc3BsYXlCb3gubW92ZUhvcml6b250YWxs eSh3aWR0aEFuZE1hcmdpbi5tYXJnaW4ubGVmdCk7CisgICAgZGlzcGxheUJveC5zZXRIb3Jpem9u dGFsTWFyZ2luKHdpZHRoQW5kTWFyZ2luLm1hcmdpbik7CisgICAgZGlzcGxheUJveC5zZXRIb3Jp em9udGFsTm9uQ29tcHV0ZWRNYXJnaW4od2lkdGhBbmRNYXJnaW4ubm9uQ29tcHV0ZWRNYXJnaW4p OwogfQogCiB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJn aW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERp c3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKLSAgICBpZiAobGF5b3V0Qm94LmlzSW5G bG93KCkpCi0gICAgICAgIHJldHVybiBjb21wdXRlSW5GbG93SGVpZ2h0QW5kTWFyZ2luKGxheW91 dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgSGVpZ2h0QW5kTWFyZ2luIGhl aWdodEFuZE1hcmdpbjsKKyAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1hcmdpblRvcE9m ZnNldDsKIAotICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKLSAgICAg ICAgcmV0dXJuIGNvbXB1dGVGbG9hdGluZ0hlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBs YXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgIGlmIChsYXlvdXRCb3guaXNJbkZsb3coKSkgewor ICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2lu KGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiAKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LX0KKyAgICAgICAgLy8gSWYgdGhpcyBib3ggaGFzIGFscmVhZHkgYmVlbiBtb3ZlZCBieSB0aGUg ZXN0aW1hdGVkIHZlcnRpY2FsIG1hcmdpbiwgbm8gbmVlZCB0byBtb3ZlIGl0IGFnYWluLgorICAg ICAgICBpZiAoIWRpc3BsYXlCb3guZXN0aW1hdGVkTWFyZ2luVG9wKCkpCisgICAgICAgICAgICBt YXJnaW5Ub3BPZmZzZXQgPSBoZWlnaHRBbmRNYXJnaW4uY29sbGFwc2VkTWFyZ2luLnZhbHVlX29y KGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pLnRvcDsKKyAgICB9IGVsc2UgaWYgKGxheW91dEJveC5p c0Zsb2F0aW5nUG9zaXRpb25lZCgpKSB7CisgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IEZvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29u dGV4dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgQVNTRVJUKCFoZWlnaHRBbmRNYXJnaW4uY29sbGFw c2VkTWFyZ2luKTsKKworICAgICAgICBtYXJnaW5Ub3BPZmZzZXQgPSBoZWlnaHRBbmRNYXJnaW4u bWFyZ2luLnRvcDsKKyAgICB9IGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAK LXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd0hlaWdodEFuZE1hcmdp bihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlz cGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAotewotICAgIGF1dG8gaGVpZ2h0QW5kTWFyZ2lu ID0gR2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpOwogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChoZWlnaHRBbmRNYXJnaW4u aGVpZ2h0KTsKLSAgICBhdXRvIG1hcmdpblZhbHVlID0gaGVpZ2h0QW5kTWFyZ2luLmNvbGxhcHNl ZE1hcmdpbi52YWx1ZV9vcihoZWlnaHRBbmRNYXJnaW4ubWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94 LnNldFZlcnRpY2FsTWFyZ2luKG1hcmdpblZhbHVlKTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRp Y2FsTm9uQ29sbGFwc2VkTWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwotCi0gICAgLy8g VGhpcyBib3ggaGFzIGFscmVhZHkgYmVlbiBtb3ZlZCBieSB0aGUgZXN0aW1hdGVkIHZlcnRpY2Fs IG1hcmdpbi4gTm8gbmVlZCB0byBtb3ZlIGl0IGFnYWluLgotICAgIGlmICghZGlzcGxheUJveC5l c3RpbWF0ZWRNYXJnaW5Ub3AoKSkKLSAgICAgICAgZGlzcGxheUJveC5tb3ZlVmVydGljYWxseSht YXJnaW5WYWx1ZS50b3ApOwotfQotCi12b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVJbkZsb3dXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25z dCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAotewotICAg IGF1dG8gd2lkdGhBbmRNYXJnaW4gPSBHZW9tZXRyeTo6aW5GbG93V2lkdGhBbmRNYXJnaW4obGF5 b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKLSAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0 aCh3aWR0aEFuZE1hcmdpbi53aWR0aCk7Ci0gICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5 KHdpZHRoQW5kTWFyZ2luLm1hcmdpbi5sZWZ0KTsKLSAgICBkaXNwbGF5Qm94LnNldEhvcml6b250 YWxNYXJnaW4od2lkdGhBbmRNYXJnaW4ubWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldEhvcml6 b250YWxOb25Db21wdXRlZE1hcmdpbih3aWR0aEFuZE1hcmdpbi5ub25Db21wdXRlZE1hcmdpbik7 CisgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRBbmRNYXJnaW4uY29sbGFw c2VkTWFyZ2luLnZhbHVlX29yKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pKTsKKyAgICBpZiAobWFy Z2luVG9wT2Zmc2V0KQorICAgICAgICBkaXNwbGF5Qm94Lm1vdmVWZXJ0aWNhbGx5KCptYXJnaW5U b3BPZmZzZXQpOwogfQogCiBGb3JtYXR0aW5nQ29udGV4dDo6SW5zdHJpbnNpY1dpZHRoQ29uc3Ry YWludHMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMo TGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDdkNjAxYTE1M2ViN2ZiOGYwY2E0MzNj ZGM3YWNlYTM5NGRhNzg2NDguLjhmY2JiOTFlMjhiNWY1MWFjYWZiYTMyM2UwY2E1NmY0OWQ4MTc0 YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01OSw5ICs1OSw4IEBAIHByaXZh dGU6CiAgICAgdm9pZCBjb21wdXRlRmxvYXRpbmdQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgRmxv YXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAgICAgdm9p ZCBjb21wdXRlUG9zaXRpb25Ub0F2b2lkRmxvYXRzKExheW91dENvbnRleHQmLCBGbG9hdGluZ0Nv bnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKICAgICB2b2lkIGNvbXB1 dGVWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhcihMYXlvdXRDb250ZXh0JiwgY29uc3QgRmxv YXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CisKICAgICB2 b2lkIGNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0 IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZvaWQgY29tcHV0ZUlu Rmxvd1dpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpC b3gmKSBjb25zdDsKLSAgICB2b2lkIGNvbXB1dGVJbkZsb3dIZWlnaHRBbmRNYXJnaW4oTGF5b3V0 Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZvaWQgY29t cHV0ZUVzdGltYXRlZE1hcmdpblRvcChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxh eTo6Qm94JikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkTWFyZ2luVG9wRm9yQW5j ZXN0b3JzKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdDsKIAo=