201848 2019-09-16 16:17:35 -0700 [LFC[MarginCollapsing] MarginCollapse::estimatedMarginBefore should take pre-computed non-collapsed margin values. 2019-09-17 08:57:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201795 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1571319 0 zalan 2019-09-16 16:17:35 -0700 and not trying to compute them. 1571320 1 webkit-bug-importer 2019-09-16 16:17:58 -0700 <rdar://problem/55419419> 1571324 2 378912 zalan 2019-09-16 16:25:29 -0700 Created attachment 378912 Patch 1571550 3 378912 commit-queue 2019-09-17 08:57:21 -0700 Comment on attachment 378912 Patch Clearing flags on attachment: 378912 Committed r249955: <https://trac.webkit.org/changeset/249955> 1571551 4 commit-queue 2019-09-17 08:57:22 -0700 All reviewed patches have been landed. Closing bug. 378912 2019-09-16 16:25:29 -0700 2019-09-17 08:57:21 -0700 Patch bug-201848-20190916162528.patch text/plain 10100 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFlNjBiYjJjMWI3MjJi ZjFlNjRlNWZhMDExMTY4NWYyYmJmNGQ2Yi4uMmY2N2VlZmZkYmIzYmIxODNlNDI0ZmExOGUzNDVl ZjRjZmNmM2M1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA5LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ1tNYXJnaW5Db2xsYXBz aW5nXSBNYXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlIHNob3VsZCB0YWtlIHBy ZS1jb21wdXRlZCBub24tY29sbGFwc2VkIG1hcmdpbiB2YWx1ZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE4NDgKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzU1NDE5NDE5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHVzaW5nIGNvbnN0cmFpbnQgdmFs dWVzIGluc3RlYWQgb2YgcXVlcnlpbmcgdGhlIGRpc3BsYXkgdHJlZSBmb3IgY29udGFpbmluZyBi bG9jayBnZW9tZXRyeSBpbmZvcm1hdGlvbi4KKyAgICAgICAgU2VlIHdlYmtpdC5vcmcvYi8yMDE3 OTUKKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKToKKyAgICAgICAgKiBsYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6cG9z aXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwb3NpdGl2ZU5lZ2F0aXZlTWFy Z2luQWZ0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0OjpNYXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlKToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1h cmdpbkJlZm9yZUlnbm9yaW5nQ29sbGFwc2luZ1Rocm91Z2gpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2Vk VmVydGljYWxWYWx1ZXMpOgorCiAyMDE5LTA5LTE2ICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2tA d2Via2l0Lm9yZz4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgR3JhcGhpY3NDb250ZXh0M0QgZGVw ZW5kZW5jeSBmcm9tIHRoZSBvdXRzaWRlIG9mIFdlYkdMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcAppbmRleCAwM2ExODk0MGY4OGU5N2NlMTY2ZWNmOTFiZGQyNzMxYjk1MTZhNGVhLi4y ZjI0ZWY0MzhkMmQzZGJlYzdhNmNjOGI0MmViMWRjYjY2MmY3OTljIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTIzMSw3ICsyMzEsMTAgQEAgdm9pZCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb24oY29uc3QgRmxvYXRpbmdDb250ZXh0JiBm bG9hdGkKIAogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVy dGljYWxQb3NpdGlvbihjb25zdCBCb3gmIGxheW91dEJveCkKIHsKLSAgICBhdXRvIGVzdGltYXRl ZE1hcmdpbkJlZm9yZSA9IG1hcmdpbkNvbGxhcHNlKCkuZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxh eW91dEJveCk7CisgICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9IFVzZWRIb3Jpem9udGFs VmFsdWVzIHsgZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29u dGVudEJveFdpZHRoKCkgfTsKKyAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBnZW9t ZXRyeSgpLmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZh bHVlcyk7CisgICAgYXV0byB1c2VkTm9uQ29sbGFwc2VkTWFyZ2luID0gVXNlZFZlcnRpY2FsTWFy Z2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgeyBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmJlZm9yZS52 YWx1ZU9yKDApLCBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmFmdGVyLnZhbHVlT3IoMCkgfTsKKyAg ICBhdXRvIGVzdGltYXRlZE1hcmdpbkJlZm9yZSA9IG1hcmdpbkNvbGxhcHNlKCkuZXN0aW1hdGVk TWFyZ2luQmVmb3JlKGxheW91dEJveCwgdXNlZE5vbkNvbGxhcHNlZE1hcmdpbik7CiAgICAgc2V0 RXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dEJveCwgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKTsK IAogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KGxh eW91dEJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDhmYTljNDcwNjllNzRk NDFjN2QxZTk3ZTZjMzlmZTE3NzE0ZjNjOGIuLjI5NGUyNmU1ODFiNDYwNDU5MjliOWQ5M2EzMDcz MjJkYTUxNzIzMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMDAsMTAgKzEw MCwxMCBAQCBwcml2YXRlOgogICAgIC8vIFRoaXMgY2xhc3MgaW1wbGVtZW50cyBtYXJnaW4gY29s bGFwc2luZyBmb3IgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0LgogICAgIGNsYXNzIE1hcmdpbkNv bGxhcHNlIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Q29sbGFw c2VkVmFsdWVzIGNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzKGNvbnN0IEJveCYsIGNvbnN0IFVzZWRW ZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzJik7CisgICAgICAgIFVzZWRWZXJ0aWNh bE1hcmdpbjo6Q29sbGFwc2VkVmFsdWVzIGNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzKGNvbnN0IEJv eCYsIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzKTsKIAotICAgICAgICBF c3RpbWF0ZWRNYXJnaW5CZWZvcmUgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYpOwot ICAgICAgICBMYXlvdXRVbml0IG1hcmdpbkJlZm9yZUlnbm9yaW5nQ29sbGFwc2luZ1Rocm91Z2go Y29uc3QgQm94JiwgY29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMm KTsKKyAgICAgICAgRXN0aW1hdGVkTWFyZ2luQmVmb3JlIGVzdGltYXRlZE1hcmdpbkJlZm9yZShj b25zdCBCb3gmLCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyk7CisgICAg ICAgIExheW91dFVuaXQgbWFyZ2luQmVmb3JlSWdub3JpbmdDb2xsYXBzaW5nVGhyb3VnaChjb25z dCBCb3gmLCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyk7CiAgICAgICAg IHZvaWQgdXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcoY29uc3QgQm94JikgY29u c3Q7CiAgICAgICAgIHZvaWQgdXBkYXRlUG9zaXRpdmVOZWdhdGl2ZU1hcmdpblZhbHVlcyhjb25z dCBCb3gmKTsKIApAQCAtMTI2LDggKzEyNiw4IEBAIHByaXZhdGU6CiAKICAgICAgICAgZW51bSBj bGFzcyBNYXJnaW5UeXBlIHsgQmVmb3JlLCBBZnRlciB9OwogICAgICAgICBQb3NpdGl2ZUFuZE5l Z2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNvbnN0 IEJveCYsIE1hcmdpblR5cGUpOwotICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW46OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIGNv bnN0IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzJik7Ci0gICAgICAgIFBv c2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIHBvc2l0aXZlTmVnYXRpdmVN YXJnaW5BZnRlcihjb25zdCBCb3gmLCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxh cHNlZFZhbHVlcyYpOworICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46 OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIFVzZWRWZXJ0 aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzKTsKKyAgICAgICAgUG9zaXRpdmVBbmROZWdh dGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVyKGNv bnN0IEJveCYsIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzKTsKICAgICAg ICAgYm9vbCBoYXNDbGVhcmFuY2UoY29uc3QgQm94JikgY29uc3Q7CiAKICAgICAgICAgTGF5b3V0 U3RhdGUmIGxheW91dFN0YXRlKCkgeyByZXR1cm4gbV9ibG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmxh eW91dFN0YXRlKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4IGE4ZTAyODQ5N2Y5 NzNmYjg5ZGI4NGVkMGE4MWM5YmRiMzVmNWUzMTkuLmJhODhiNTRjM2NkNWQ4ZDNkODBjOGFiYmZm ZDAwZWMyYWRmNDcwYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAtNTI4LDcgKzUy OCw3IEBAIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlCiAgICAgcmV0dXJuIHBvc2l0aXZlTmVnYXRp dmVNYXJnaW5BZnRlcihsYXlvdXRCb3gsIG5vbkNvbGxhcHNlZE1hcmdpbik7CiB9CiAKLVBvc2l0 aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Ok1hcmdpbkNvbGxhcHNlOjpwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJv eCYgbGF5b3V0Qm94LCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVl cyYgbm9uQ29sbGFwc2VkVmFsdWVzKQorUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2lu OjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZl TmVnYXRpdmVNYXJnaW5CZWZvcmUoY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRWZXJ0aWNhbE1h cmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIG5vbkNvbGxhcHNlZFZhbHVlcykKIHsKICAgICBhdXRv IGZpcnN0Q2hpbGRDb2xsYXBzZWRNYXJnaW5CZWZvcmUgPSBbJl0oKSAtPiBQb3NpdGl2ZUFuZE5l Z2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyB7CiAgICAgICAgIGlmICghbWFyZ2luQmVmb3Jl Q29sbGFwc2VzV2l0aEZpcnN0SW5GbG93Q2hpbGRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KSkKQEAg LTU1OCw3ICs1NTgsNyBAQCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVl cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZQogICAgIHJldHVybiBjb21w dXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4oY29sbGFwc2VkTWFyZ2luQmVmb3JlLCBub25D b2xsYXBzZWRCZWZvcmUpOwogfQogCi1Qb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46 OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6cG9zaXRpdmVO ZWdhdGl2ZU1hcmdpbkFmdGVyKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBVc2VkVmVydGlj YWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyYgbm9uQ29sbGFwc2VkVmFsdWVzKQorUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVNYXJnaW5BZnRlcihjb25zdCBCb3gm IGxheW91dEJveCwgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgbm9uQ29s bGFwc2VkVmFsdWVzKQogewogICAgIGF1dG8gbGFzdENoaWxkQ29sbGFwc2VkTWFyZ2luQWZ0ZXIg PSBbJl0oKSAtPiBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyB7CiAg ICAgICAgIGlmICghbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoTGFzdEluRmxvd0NoaWxkTWFyZ2lu QWZ0ZXIobGF5b3V0Qm94KSkKQEAgLTU3Nyw3ICs1NzcsNyBAQCBQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW46OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xs YXBzZQogICAgIHJldHVybiBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4obGFzdENo aWxkQ29sbGFwc2VkTWFyZ2luQWZ0ZXIoKSwgbm9uQ29sbGFwc2VkQWZ0ZXIpOwogfQogCi1Fc3Rp bWF0ZWRNYXJnaW5CZWZvcmUgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6 OmVzdGltYXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkKK0VzdGltYXRlZE1h cmdpbkJlZm9yZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6ZXN0aW1h dGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkVmVydGljYWxNYXJnaW46 Ok5vbkNvbGxhcHNlZFZhbHVlcyB1c2VkTm9uQ29sbGFwc2VkTWFyZ2luKQogewogICAgIGlmIChs YXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKQEAgLTU4NywxOSAr NTg3LDE2IEBAIEVzdGltYXRlZE1hcmdpbkJlZm9yZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpN YXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmCiAgICAgQVNTRVJUKGxheW91dEJveC5p c0luRmxvdygpIHx8IGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKTsKICAgICBBU1NF UlQoIWxheW91dEJveC5yZXBsYWNlZCgpKTsKIAotICAgIGF1dG8gdXNlZFZhbHVlcyA9IFVzZWRI b3Jpem9udGFsVmFsdWVzIHsgZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveCgqbGF5 b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94V2lkdGgoKSB9OwotICAgIGF1dG8g Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbiA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnkoKS5j b21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgdXNlZFZhbHVlcyk7Ci0gICAgYXV0byBu b25Db2xsYXBzZWRNYXJnaW4gPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVl cyB7IGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3JlLnZhbHVlT3IoMCksIGNvbXB1dGVkVmVy dGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigwKSB9OwogICAgIGF1dG8gbWFyZ2luc0NvbGxhcHNl VGhyb3VnaCA9IHRoaXMtPm1hcmdpbnNDb2xsYXBzZVRocm91Z2gobGF5b3V0Qm94KTsKLSAgICBh dXRvIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSB0aGlzLT5wb3NpdGl2ZU5lZ2F0aXZl TWFyZ2luQmVmb3JlKGxheW91dEJveCwgbm9uQ29sbGFwc2VkTWFyZ2luKTsKKyAgICBhdXRvIHBv c2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSB0aGlzLT5wb3NpdGl2ZU5lZ2F0aXZlTWFyZ2lu QmVmb3JlKGxheW91dEJveCwgdXNlZE5vbkNvbGxhcHNlZE1hcmdpbik7CiAKICAgICBhdXRvIGNv bGxhcHNlZE1hcmdpbkJlZm9yZSA9IG1hcmdpblZhbHVlKCFtYXJnaW5zQ29sbGFwc2VUaHJvdWdo ID8gcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZQotICAgICAgICA6IGNvbXB1dGVkUG9zaXRp dmVBbmROZWdhdGl2ZU1hcmdpbihwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlLCBwb3NpdGl2 ZU5lZ2F0aXZlTWFyZ2luQWZ0ZXIobGF5b3V0Qm94LCBub25Db2xsYXBzZWRNYXJnaW4pKSk7Cisg ICAgICAgIDogY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRp dmVNYXJnaW5CZWZvcmUsIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5BZnRlcihsYXlvdXRCb3gsIHVz ZWROb25Db2xsYXBzZWRNYXJnaW4pKSk7CiAKLSAgICByZXR1cm4geyBub25Db2xsYXBzZWRNYXJn aW4uYmVmb3JlLCBjb2xsYXBzZWRNYXJnaW5CZWZvcmUsIG1hcmdpbnNDb2xsYXBzZVRocm91Z2gg fTsKKyAgICByZXR1cm4geyB1c2VkTm9uQ29sbGFwc2VkTWFyZ2luLmJlZm9yZSwgY29sbGFwc2Vk TWFyZ2luQmVmb3JlLCBtYXJnaW5zQ29sbGFwc2VUaHJvdWdoIH07CiB9CiAKLUxheW91dFVuaXQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUlnbm9y aW5nQ29sbGFwc2luZ1Rocm91Z2goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFVzZWRWZXJ0 aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzJiBub25Db2xsYXBzZWRWYWx1ZXMpCitMYXlv dXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZv cmVJZ25vcmluZ0NvbGxhcHNpbmdUaHJvdWdoKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkVmVy dGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyBub25Db2xsYXBzZWRWYWx1ZXMpCiB7CiAg ICAgQVNTRVJUKCFsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSk7CiAgICAgQVNTRVJUKGxheW91dEJv eC5pc0Jsb2NrTGV2ZWxCb3goKSk7CkBAIC02MjIsNyArNjE5LDcgQEAgdm9pZCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6dXBkYXRlUG9zaXRpdmVOZWdhdGl2ZU1hcmdp blZhbHVlcygKICAgICBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5zZXRQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB7IHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUs IHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5BZnRlciB9KTsKIH0KIAotVXNlZFZlcnRpY2FsTWFyZ2lu OjpDb2xsYXBzZWRWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6 OmNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBVc2Vk VmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyYgbm9uQ29sbGFwc2VkVmFsdWVzKQor VXNlZFZlcnRpY2FsTWFyZ2luOjpDb2xsYXBzZWRWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzKGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyBub25Db2xsYXBz ZWRWYWx1ZXMpCiB7CiAgICAgaWYgKGxheW91dEJveC5pc0Fub255bW91cygpKQogICAgICAgICBy ZXR1cm4geyB9Owo=