193375 2019-01-11 18:45:05 -0800 [LFC][BFC][MarginCollapsing] Move estimatedMarginBefore flag from state/display box to BlockFormattingContext 2019-01-12 07:32:29 -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 1493924 0 zalan 2019-01-11 18:45:05 -0800 the estimated margin before should not outlive one layout frame. 1493935 1 358974 zalan 2019-01-11 19:16:05 -0800 Created attachment 358974 Patch 1493974 2 zalan 2019-01-12 07:31:07 -0800 Committed r239899: <https://trac.webkit.org/changeset/239899> 1493975 3 webkit-bug-importer 2019-01-12 07:32:29 -0800 <rdar://problem/47232557> 358974 2019-01-11 19:16:05 -0800 2019-01-12 03:41:55 -0800 Patch bug-193375-20190111191553.patch text/plain 15219 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE4MzdlNzY0MzY0YTgz NjdkZDE4MGE4YTQ1NmRhYTA1OTQ2NjM2YS4uMDI4NGJlOTA5NDE3MTIxMzRiYWQ4YmYzZTZjODM2 ODBiZjc1MTBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE5LTAxLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5D b2xsYXBzaW5nXSBNb3ZlIGVzdGltYXRlZE1hcmdpbkJlZm9yZSBmbGFnIGZyb20gc3RhdGUvZGlz cGxheSBib3ggdG8gQmxvY2tGb3JtYXR0aW5nQ29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGVzdGltYXRlZCBtYXJnaW5CZWZvcmUgaXMg YSBwcmUtY29tcHV0ZWQsIHRlbXBvcmFyeSB2YWx1ZS4gV2UgbmVlZCB0byBrZWVwIGl0IGFyb3Vu ZCB1bnRpbCB0aGUgZmluYWwgdmVydGljYWwgbWFyZ2luIHZhbHVlIGlzIGNvbXB1dGVkLgorICAg ICAgICBOZWl0aGVyIEJsb2NrRm9ybWF0dGluZ1N0YXRlIG5vciBEaXNwbGF5IHNob3VsZCBob2xk IHRlbXBvcmFyeSB2YWx1ZXMuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkTWFyZ2luQmVmb3JlIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUVzdGltYXRlZE1hcmdpbkJlZm9yZUZvckFuY2VzdG9ycyBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Omhhc1ByZWNvbXB1dGVkTWFyZ2lu QmVmb3JlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZUZsb2F0aW5nUG9zaXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlUG9zaXRpb25Ub0F2b2lk RmxvYXRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhl aWdodEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OnNldEVzdGltYXRlZE1hcmdpbkJlZm9yZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Omhhc0VzdGltYXRlZE1h cmdpbkJlZm9yZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Omhhc1ByZWNvbXB1 dGVkTWFyZ2luQmVmb3JlKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cmVtb3ZlRXN0aW1hdGVkTWFyZ2luQmVmb3JlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6ZXN0 aW1hdGVkTWFyZ2luQmVmb3JlIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJs b2NrRm9ybWF0dGluZ1N0YXRlOjpzZXRIYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6Y2xlYXJI YXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6aGFzRXN0aW1hdGVkTWFyZ2luQmVmb3JlIGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OkJveCk6CisgICAgICAgICogbGF5b3V0 L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJv eDo6c2V0SGFzRXN0aW1hdGVkTWFyZ2luQmVmb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3Bs YXk6OkJveDo6aW52YWxpZGF0ZUVzdGltYXRlZE1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJD b3JlOjpEaXNwbGF5OjpCb3g6OnRvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5 OjpCb3g6OnRvcExlZnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94Ojpz ZXRFc3RpbWF0ZWRNYXJnaW5CZWZvcmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGlz cGxheTo6Qm94Ojplc3RpbWF0ZWRNYXJnaW5CZWZvcmUgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjps YXlvdXRVc2luZ0Zvcm1hdHRpbmdDb250ZXh0KToKKwogMjAxOS0wMS0xMSAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2lu Z10gQWRqdXN0IHZlcnRpY2FsIHBvc2l0aW9uIHdoZW4gYm94IG1hcmdpbiBjb2xsYXBzZXMgdGhy b3VnaC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGMzYjFkODIzMTI0MDY5 YjAxMjE4MDY3YjRkY2NlNTJjYTU0YmJmZGEuLjc2NWJhZjliOTMyZmY1YTQwM2Y2NzA1MzlmYTBm YTk5YzVhOThjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTg4LDcg KzE4OCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZE1h cmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBhdXRvJiBsYXlvdXRTdGF0 ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CiAgICAgYXV0byBlc3RpbWF0ZWRNYXJnaW5CZWZvcmUg PSBNYXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dFN0YXRlLCBsYXlv dXRCb3gpOwotICAgIGJsb2NrRm9ybWF0dGluZ1N0YXRlKCkuc2V0SGFzRXN0aW1hdGVkTWFyZ2lu QmVmb3JlKGxheW91dEJveCk7CisgICAgc2V0RXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dEJv eCwgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKTsKIAogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlv dXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgYXV0byBub25D b2xsYXBzZWRWYWx1ZXMgPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyB7 IGVzdGltYXRlZE1hcmdpbkJlZm9yZS5ub25Db2xsYXBzZWRWYWx1ZSwgeyB9IH07CkBAIC0xOTYs NyArMTk2LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVk TWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94KQogICAgIGF1dG8gdmVydGljYWxNYXJn aW4gPSBVc2VkVmVydGljYWxNYXJnaW4geyBub25Db2xsYXBzZWRWYWx1ZXMsIGNvbGxhcHNlZFZh bHVlcyB9OwogICAgIGRpc3BsYXlCb3guc2V0VG9wKGFkanVzdGVkVmVydGljYWxQb3NpdGlvbkFm dGVyTWFyZ2luQ29sbGFwc2luZyhsYXlvdXRCb3gsIHZlcnRpY2FsTWFyZ2luKSk7CiAjaWYgIUFT U0VSVF9ESVNBQkxFRAotICAgIGRpc3BsYXlCb3guc2V0RXN0aW1hdGVkTWFyZ2luQmVmb3JlKGVz dGltYXRlZE1hcmdpbkJlZm9yZSk7CisgICAgZGlzcGxheUJveC5zZXRIYXNFc3RpbWF0ZWRNYXJn aW5CZWZvcmUoKTsKICNlbmRpZgogfQogCkBAIC0yMTQsMTAgKzIxNCw5IEBAIHZvaWQgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZE1hcmdpbkJlZm9yZUZvckFuY2VzdG9y cyhjb25zdCBCb3gmCiAgICAgLy8gU28gd2hlbiB3ZSBnZXQgdG8gdGhlIHBvaW50IHdoZXJlIHdl IGludGVyc2VjdCB0aGUgYm94IHdpdGggdGhlIGZsb2F0IHRvIGRlY2lkZSBpZiB0aGUgYm94IG5l ZWRzIHRvIG1vdmUsIHdlIGRvbid0IHlldCBoYXZlIHRoZSBmaW5hbCB2ZXJ0aWNhbCBwb3NpdGlv bi4KICAgICAvLwogICAgIC8vIFRoZSBpZGVhIGhlcmUgaXMgdGhhdCBhcyBsb25nIGFzIHdlIGRv bid0IGNyb3NzIHRoZSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgYm91bmRhcnksIHdlIHNob3Vs ZCBiZSBhYmxlIHRvIHByZS1jb21wdXRlIHRoZSBmaW5hbCB0b3AgbWFyZ2luLgotICAgIGF1dG8m IGZvcm1hdHRpbmdTdGF0ZSA9IGJsb2NrRm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgZm9yIChhdXRv KiBhbmNlc3RvciA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsgYW5jZXN0b3IgJiYgIWFu Y2VzdG9yLT5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKTsgYW5jZXN0b3IgPSBh bmNlc3Rvci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKICAgICAgICAgLy8gRklYTUU6IHdpdGggaW5j cmVtZW50YWwgbGF5b3V0LCB3ZSBtaWdodCBhY3R1YWxseSBoYXZlIGEgdmFsaWQgKG5vbi1lc3Rp bWF0ZWQpIG1hcmdpbiB0b3AgYXMgd2VsbC4KLSAgICAgICAgaWYgKGZvcm1hdHRpbmdTdGF0ZS5o YXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKmFuY2VzdG9yKSkKKyAgICAgICAgaWYgKGhhc0VzdGlt YXRlZE1hcmdpbkJlZm9yZSgqYW5jZXN0b3IpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIGNvbXB1dGVFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKmFuY2VzdG9yKTsKQEAgLTI0MiwxMCAr MjQxLDEwIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cHJlY29tcHV0ZVZlcnRpY2Fs UG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkCiB9CiAKICNpZm5kZWYgTkRFQlVHCi1z dGF0aWMgYm9vbCBoYXNQcmVjb21wdXRlZE1hcmdpbkJlZm9yZShjb25zdCBCbG9ja0Zvcm1hdHRp bmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCkKK2Jvb2wgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6aGFzUHJlY29tcHV0ZWRNYXJnaW5CZWZvcmUoY29uc3QgQm94 JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgZm9yIChhdXRvKiBhbmNlc3RvciA9IGxheW91dEJv eC5jb250YWluaW5nQmxvY2soKTsgYW5jZXN0b3IgJiYgIWFuY2VzdG9yLT5lc3RhYmxpc2hlc0Js b2NrRm9ybWF0dGluZ0NvbnRleHQoKTsgYW5jZXN0b3IgPSBhbmNlc3Rvci0+Y29udGFpbmluZ0Js b2NrKCkpIHsKLSAgICAgICAgaWYgKGZvcm1hdHRpbmdTdGF0ZS5oYXNFc3RpbWF0ZWRNYXJnaW5C ZWZvcmUoKmFuY2VzdG9yKSkKKyAgICAgICAgaWYgKGhhc0VzdGltYXRlZE1hcmdpbkJlZm9yZSgq YW5jZXN0b3IpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CkBAIC0yNTcsNyArMjU2LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlRmxvYXRpbmdQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2EKIHsKICAg ICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CiAgICAgQVNTRVJUKGxh eW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKTsKLSAgICBBU1NFUlQoaGFzUHJlY29tcHV0 ZWRNYXJnaW5CZWZvcmUoYmxvY2tGb3JtYXR0aW5nU3RhdGUoKSwgbGF5b3V0Qm94KSk7CisgICAg QVNTRVJUKGhhc1ByZWNvbXB1dGVkTWFyZ2luQmVmb3JlKGxheW91dEJveCkpOwogCiAgICAgYXV0 byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0 Qm94KTsKICAgICAvLyA4LjMuMSBDb2xsYXBzaW5nIG1hcmdpbnMKQEAgLTI3Nyw3ICsyNzYsNyBA QCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVQb3NpdGlvblRvQXZvaWRGbG9h dHMoY29uc3QgRmxvYXRpbmdDb250ZXh0JgogICAgIEFTU0VSVChsYXlvdXRCb3guZXN0YWJsaXNo ZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgIEFTU0VSVCghbGF5b3V0Qm94LmlzRmxv YXRpbmdQb3NpdGlvbmVkKCkpOwogICAgIEFTU0VSVCghbGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIo KSk7Ci0gICAgQVNTRVJUKGhhc1ByZWNvbXB1dGVkTWFyZ2luQmVmb3JlKGJsb2NrRm9ybWF0dGlu Z1N0YXRlKCksIGxheW91dEJveCkpOworICAgIEFTU0VSVChoYXNQcmVjb21wdXRlZE1hcmdpbkJl Zm9yZShsYXlvdXRCb3gpKTsKIAogICAgIGlmIChmbG9hdGluZ0NvbnRleHQuZmxvYXRpbmdTdGF0 ZSgpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjk2LDcgKzI5NSw3IEBAIHZvaWQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENs ZWFyKGNvbnN0IEZsb2F0aW5nCiAgICAgLy8gRm9yIGZvcm1hdHRpbmcgcm9vdHMsIHdlIGFscmVh ZHkgcHJlY29tcHV0ZWQgZmluYWwgcG9zaXRpb24uCiAgICAgaWYgKCFsYXlvdXRCb3guZXN0YWJs aXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQogICAgICAgICBjb21wdXRlRXN0aW1hdGVkTWFyZ2lu QmVmb3JlRm9yQW5jZXN0b3JzKGxheW91dEJveCk7Ci0gICAgQVNTRVJUKGhhc1ByZWNvbXB1dGVk TWFyZ2luQmVmb3JlKGJsb2NrRm9ybWF0dGluZ1N0YXRlKCksIGxheW91dEJveCkpOworICAgIEFT U0VSVChoYXNQcmVjb21wdXRlZE1hcmdpbkJlZm9yZShsYXlvdXRCb3gpKTsKIAogICAgIGlmIChh dXRvIHZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlID0gZmxvYXRpbmdDb250ZXh0LnZlcnRp Y2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGxheW91dEJveCkpCiAgICAgICAgIGxheW91dFN0YXRl LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5zZXRUb3AoKnZlcnRpY2FsUG9zaXRp b25XaXRoQ2xlYXJhbmNlKTsKQEAgLTM4NCwxOCArMzgzLDE1IEBAIHZvaWQgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCkg Y29uc3QKIAogICAgIC8vIE91dCBvZiBmbG93IGJveGVzIGRvbid0IG5lZWQgdmVydGljYWwgYWRq dXN0bWVudCBhZnRlciBtYXJnaW4gY29sbGFwc2luZy4KICAgICBpZiAobGF5b3V0Qm94LmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpKSB7CisgICAgICAgIEFTU0VSVCghaGFzRXN0aW1hdGVkTWFyZ2lu QmVmb3JlKGxheW91dEJveCkpOwogICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWln aHQoaGVpZ2h0QW5kTWFyZ2luLmhlaWdodCk7CiAgICAgICAgIGRpc3BsYXlCb3guc2V0VmVydGlj YWxNYXJnaW4odmVydGljYWxNYXJnaW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg YXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+YmxvY2tGb3JtYXR0aW5nU3RhdGUoKTsKLSAg ICBpZiAoZm9ybWF0dGluZ1N0YXRlLmhhc0VzdGltYXRlZE1hcmdpbkJlZm9yZShsYXlvdXRCb3gp KSB7Ci0gICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5jbGVhckhhc0VzdGltYXRlZE1hcmdpbkJlZm9y ZShsYXlvdXRCb3gpOwotICAgICAgICBBU1NFUlQoZGlzcGxheUJveC5lc3RpbWF0ZWRNYXJnaW5C ZWZvcmUoKS0+dXNlZFZhbHVlKCkgPT0gdmVydGljYWxNYXJnaW4uYmVmb3JlKCkpOwotICAgIH0g ZWxzZQotICAgICAgICBkaXNwbGF5Qm94LnNldFRvcChhZGp1c3RlZFZlcnRpY2FsUG9zaXRpb25B ZnRlck1hcmdpbkNvbGxhcHNpbmcobGF5b3V0Qm94LCB2ZXJ0aWNhbE1hcmdpbikpOwotCisgICAg QVNTRVJUKCFoYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KSB8fCBlc3RpbWF0ZWRN YXJnaW5CZWZvcmUobGF5b3V0Qm94KS51c2VkVmFsdWUoKSA9PSB2ZXJ0aWNhbE1hcmdpbi5iZWZv cmUoKSk7CisgICAgcmVtb3ZlRXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dEJveCk7CisgICAg ZGlzcGxheUJveC5zZXRUb3AoYWRqdXN0ZWRWZXJ0aWNhbFBvc2l0aW9uQWZ0ZXJNYXJnaW5Db2xs YXBzaW5nKGxheW91dEJveCwgdmVydGljYWxNYXJnaW4pKTsKICAgICAvLyBBZGp1c3QgdGhlIHBy ZXZpb3VzIHNpYmxpbmcncyBtYXJnaW4gYm90dG9tIG5vdyB0aGF0IHRoaXMgYm94J3MgdmVydGlj YWwgbWFyZ2luIGlzIGNvbXB1dGVkLgogICAgIGlmIChNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVm b3JlQ29sbGFwc2VzV2l0aFByZXZpb3VzU2libGluZ01hcmdpbkFmdGVyKGxheW91dFN0YXRlLCBs YXlvdXRCb3gpKQogICAgICAgICBNYXJnaW5Db2xsYXBzZTo6dXBkYXRlQ29sbGFwc2VkTWFyZ2lu QWZ0ZXIobGF5b3V0U3RhdGUsICpsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCksIHZl cnRpY2FsTWFyZ2luKTsKQEAgLTUyNCw2ICs1MjAsMjAgQEAgTGF5b3V0VW5pdCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjphZGp1c3RlZFZlcnRpY2FsUG9zaXRpb25BZnRlck1hcmdpbkNvbGxhcHNp bmcKICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveFRvcCArIHZlcnRpY2FsTWFy Z2luLmJlZm9yZSgpOwogfQogCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OnNldEVzdGlt YXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgRXN0aW1hdGVkTWFy Z2luQmVmb3JlJiBlc3RpbWF0ZWRNYXJnaW5CZWZvcmUpIGNvbnN0Cit7IAorICAgIC8vIENhbid0 IGNyb3NzIGZvcm1hdHRpbmcgY29udGV4dCBib3VuZGFyeS4KKyAgICBBU1NFUlQoJmxheW91dFN0 YXRlKCkuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkgPT0gJmZvcm1hdHRpbmdTdGF0 ZSgpKTsKKyAgICBtX2VzdGltYXRlZE1hcmdpbkJlZm9yZUxpc3Quc2V0KCZsYXlvdXRCb3gsIGVz dGltYXRlZE1hcmdpbkJlZm9yZSk7Cit9CisKK2Jvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 aGFzRXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAorewor ICAgIC8vIENhbid0IGNyb3NzIGZvcm1hdHRpbmcgY29udGV4dCBib3VuZGFyeS4KKyAgICBBU1NF UlQoJmxheW91dFN0YXRlKCkuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkgPT0gJmZv cm1hdHRpbmdTdGF0ZSgpKTsKKyAgICByZXR1cm4gbV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmVMaXN0 LmNvbnRhaW5zKCZsYXlvdXRCb3gpOworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmgKaW5kZXggYTJjZmRhZDIwMTdmYWU3NzEwM2U4MDgxYzMxMWU2ZjU1NjYwOGUxMC4uOGM4 MzdiMGFiZmUzM2VjNjZmMzcwMmQxNmY2OTU2ZDhmMjc5ODhiMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0LmgKQEAgLTI4LDYgKzI4LDggQEAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJ TkdfQ09OVEVYVCkKIAogI2luY2x1ZGUgIkZvcm1hdHRpbmdDb250ZXh0LmgiCisjaW5jbHVkZSAi TWFyZ2luVHlwZXMuaCIKKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9J c29NYWxsb2MuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTI2LDYgKzEyOCwxNyBAQCBw cml2YXRlOgogICAgICAgICBzdGF0aWMgYm9vbCBzaG91bGRJZ25vcmVNYXJnaW5CZWZvcmUoY29u c3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKICAgICAgICAgc3RhdGljIGJvb2wgc2hvdWxk SWdub3JlTWFyZ2luQWZ0ZXIoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKICAgICB9 OworCisgICAgdm9pZCBzZXRFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoY29uc3QgQm94JiwgY29uc3Qg RXN0aW1hdGVkTWFyZ2luQmVmb3JlJikgY29uc3Q7CisgICAgdm9pZCByZW1vdmVFc3RpbWF0ZWRN YXJnaW5CZWZvcmUoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgbV9lc3RpbWF0ZWRNYXJn aW5CZWZvcmVMaXN0LnJlbW92ZSgmbGF5b3V0Qm94KTsgfQorICAgIGJvb2wgaGFzRXN0aW1hdGVk TWFyZ2luQmVmb3JlKGNvbnN0IEJveCYpIGNvbnN0OworI2lmbmRlZiBOREVCVUcKKyAgICBFc3Rp bWF0ZWRNYXJnaW5CZWZvcmUgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0 Qm94KSBjb25zdCB7IHJldHVybiBtX2VzdGltYXRlZE1hcmdpbkJlZm9yZUxpc3QuZ2V0KCZsYXlv dXRCb3gpOyB9CisgICAgYm9vbCBoYXNQcmVjb21wdXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gm KSBjb25zdDsKKyNlbmRpZgorCitwcml2YXRlOgorICAgIG11dGFibGUgSGFzaE1hcDxjb25zdCBC b3gqLCBFc3RpbWF0ZWRNYXJnaW5CZWZvcmU+IG1fZXN0aW1hdGVkTWFyZ2luQmVmb3JlTGlzdDsK IH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuaAppbmRleCBiYjQ1NmI1OTI3ZmVmZTQ1YzYz NzgzMWQ1YjI0ZjcxNzA5MmJhZDJhLi5iMjhlZjY5NWYxNDhjM2Y5MWFmYWJkODM4Yzk4Yjc3NzZk ZjQzNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCkBAIC0yOCw3ICsyOCw2IEBACiAjaWYg RU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKICNpbmNsdWRlICJGb3JtYXR0aW5n U3RhdGUuaCIKLSNpbmNsdWRlICJNYXJnaW5UeXBlcy5oIgogI2luY2x1ZGUgPHd0Zi9Jc29NYWxs b2MuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDgsMTMgKzQ3LDggQEAgcHVibGljOgog ICAgIGJvb2wgaGFzUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKGNvbnN0IEJveCYg bGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1h cmdpbi5jb250YWlucygmbGF5b3V0Qm94KTsgfQogICAgIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0 aWNhbE1hcmdpbiBwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4oY29uc3QgQm94JiBs YXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuIG1fcG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFy Z2luLmdldCgmbGF5b3V0Qm94KTsgfQogCi0gICAgdm9pZCBzZXRIYXNFc3RpbWF0ZWRNYXJnaW5C ZWZvcmUoY29uc3QgQm94JiBsYXlvdXRCb3gpIHsgbV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmVMaXN0 LmFkZCgmbGF5b3V0Qm94KTsgfQotICAgIHZvaWQgY2xlYXJIYXNFc3RpbWF0ZWRNYXJnaW5CZWZv cmUoY29uc3QgQm94JiBsYXlvdXRCb3gpIHsgbV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmVMaXN0LnJl bW92ZSgmbGF5b3V0Qm94KTsgfQotICAgIGJvb2wgaGFzRXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNv bnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX2VzdGltYXRlZE1hcmdpbkJlZm9y ZUxpc3QuY29udGFpbnMoJmxheW91dEJveCk7IH0KLQogcHJpdmF0ZToKICAgICBIYXNoTWFwPGNv bnN0IEJveCosIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbj4gbV9wb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW47Ci0gICAgSGFzaFNldDxjb25zdCBCb3gqPiBtX2VzdGlt YXRlZE1hcmdpbkJlZm9yZUxpc3Q7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAKaW5kZXggNjMxZWY3MWI5ODNjNzE1YWQ3ZTJl YWQ1NGMwYzE1MmVjOTUxMDJlYS4uMGVlZWFlY2QzNzRhYWJkYjNhZWVmMDBjOGYzMTI0YTZjYWUw YWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3Bs YXlCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5 Qm94LmNwcApAQCAtNzQsNyArNzQsNyBAQCBCb3g6OkJveChjb25zdCBCb3gmIG90aGVyKQogICAg ICwgbV9oYXNWYWxpZFBhZGRpbmcob3RoZXIubV9oYXNWYWxpZFBhZGRpbmcpCiAgICAgLCBtX2hh c1ZhbGlkQ29udGVudEhlaWdodChvdGhlci5tX2hhc1ZhbGlkQ29udGVudEhlaWdodCkKICAgICAs IG1faGFzVmFsaWRDb250ZW50V2lkdGgob3RoZXIubV9oYXNWYWxpZENvbnRlbnRXaWR0aCkKLSAg ICAsIG1fZXN0aW1hdGVkTWFyZ2luQmVmb3JlKG90aGVyLm1fZXN0aW1hdGVkTWFyZ2luQmVmb3Jl KQorICAgICwgbV9oYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUob3RoZXIubV9oYXNFc3RpbWF0ZWRN YXJnaW5CZWZvcmUpCiAjZW5kaWYKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlz cGxheXRyZWUvRGlzcGxheUJveC5oCmluZGV4IDlhZWZiMThkNzc1OTczNTgyMGYzNGIwYTAzMzMz MDJlNWRjNzI3MTkuLjE2NzgyYzQ0ZWJjYjc2NTg2OWYxNjkxMTc0MTMxNTcyYjE3ZGYwNjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApAQCAt MTc1LDggKzE3NSw3IEBAIHB1YmxpYzoKICAgICBSZWN0IGNvbnRlbnRCb3goKSBjb25zdDsKIAog I2lmICFBU1NFUlRfRElTQUJMRUQKLSAgICB2b2lkIHNldEVzdGltYXRlZE1hcmdpbkJlZm9yZShM YXlvdXQ6OkVzdGltYXRlZE1hcmdpbkJlZm9yZSBtYXJnaW5CZWZvcmUpIHsgbV9lc3RpbWF0ZWRN YXJnaW5CZWZvcmUgPSBtYXJnaW5CZWZvcmU7IH0KLSAgICBPcHRpb25hbDxMYXlvdXQ6OkVzdGlt YXRlZE1hcmdpbkJlZm9yZT4gZXN0aW1hdGVkTWFyZ2luQmVmb3JlKCkgY29uc3QgeyByZXR1cm4g bV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmU7IH0KKyAgICB2b2lkIHNldEhhc0VzdGltYXRlZE1hcmdp bkJlZm9yZSgpIHsgbV9oYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUgPSB0cnVlOyB9CiAjZW5kaWYK IAogcHJpdmF0ZToKQEAgLTIwNyw3ICsyMDYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgaW52YWxp ZGF0ZU1hcmdpbigpOwogICAgIHZvaWQgaW52YWxpZGF0ZUJvcmRlcigpIHsgbV9oYXNWYWxpZEJv cmRlciA9IGZhbHNlOyB9CiAgICAgdm9pZCBpbnZhbGlkYXRlUGFkZGluZygpIHsgbV9oYXNWYWxp ZFBhZGRpbmcgPSBmYWxzZTsgfQotICAgIHZvaWQgaW52YWxpZGF0ZUVzdGltYXRlZE1hcmdpbkJl Zm9yZSgpIHsgbV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmUgPSB7IH07IH0KKyAgICB2b2lkIGludmFs aWRhdGVFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKSB7IG1faGFzRXN0aW1hdGVkTWFyZ2luQmVmb3Jl ID0gZmFsc2U7IH0KIAogICAgIHZvaWQgc2V0SGFzVmFsaWRUb3AoKSB7IG1faGFzVmFsaWRUb3Ag PSB0cnVlOyB9CiAgICAgdm9pZCBzZXRIYXNWYWxpZExlZnQoKSB7IG1faGFzVmFsaWRMZWZ0ID0g dHJ1ZTsgfQpAQCAtMjQ4LDcgKzI0Nyw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc1ZhbGlk UGFkZGluZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1ZhbGlkQ29udGVudEhlaWdodCB7IGZh bHNlIH07CiAgICAgYm9vbCBtX2hhc1ZhbGlkQ29udGVudFdpZHRoIHsgZmFsc2UgfTsKLSAgICBP cHRpb25hbDxMYXlvdXQ6OkVzdGltYXRlZE1hcmdpbkJlZm9yZT4gbV9lc3RpbWF0ZWRNYXJnaW5C ZWZvcmU7CisgICAgYm9vbCBtX2hhc0VzdGltYXRlZE1hcmdpbkJlZm9yZSB7IGZhbHNlIH07CiAj ZW5kaWYKIH07CiAKQEAgLTQ0Myw3ICs0NDIsNyBAQCBpbmxpbmUgQm94OjpSZWN0OjpvcGVyYXRv ciBMYXlvdXRSZWN0KCkgY29uc3QKIAogaW5saW5lIExheW91dFVuaXQgQm94Ojp0b3AoKSBjb25z dAogewotICAgIEFTU0VSVChtX2hhc1ZhbGlkVG9wICYmIChtX2VzdGltYXRlZE1hcmdpbkJlZm9y ZSB8fCBtX2hhc1ZhbGlkVmVydGljYWxNYXJnaW4pKTsKKyAgICBBU1NFUlQobV9oYXNWYWxpZFRv cCAmJiAobV9oYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUgfHwgbV9oYXNWYWxpZFZlcnRpY2FsTWFy Z2luKSk7CiAgICAgcmV0dXJuIG1fdG9wTGVmdC55KCk7CiB9CiAKQEAgLTQ1NSw3ICs0NTQsNyBA QCBpbmxpbmUgTGF5b3V0VW5pdCBCb3g6OmxlZnQoKSBjb25zdAogCiBpbmxpbmUgTGF5b3V0UG9p bnQgQm94Ojp0b3BMZWZ0KCkgY29uc3QKIHsKLSAgICBBU1NFUlQobV9oYXNWYWxpZFRvcCAmJiAo bV9lc3RpbWF0ZWRNYXJnaW5CZWZvcmUgfHwgbV9oYXNWYWxpZFZlcnRpY2FsTWFyZ2luKSk7Cisg ICAgQVNTRVJUKG1faGFzVmFsaWRUb3AgJiYgKG1faGFzRXN0aW1hdGVkTWFyZ2luQmVmb3JlIHx8 IG1faGFzVmFsaWRWZXJ0aWNhbE1hcmdpbikpOwogICAgIEFTU0VSVChtX2hhc1ZhbGlkTGVmdCAm JiBtX2hhc1ZhbGlkSG9yaXpvbnRhbE1hcmdpbik7CiAgICAgcmV0dXJuIG1fdG9wTGVmdDsKIH0K