193670 2019-01-22 08:27:33 -0800 [LFC][Floats] Decouple clearance computation and margin collapsing reset. 2019-01-22 09:27:28 -0800 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 1496769 0 zalan 2019-01-22 08:27:33 -0800 Clearance inhibits margin collapsing. 1496773 1 359738 zalan 2019-01-22 08:39:18 -0800 Created attachment 359738 Patch 1496785 2 359738 commit-queue 2019-01-22 09:26:05 -0800 Comment on attachment 359738 Patch Clearing flags on attachment: 359738 Committed r240253: <https://trac.webkit.org/changeset/240253> 1496786 3 commit-queue 2019-01-22 09:26:06 -0800 All reviewed patches have been landed. Closing bug. 1496787 4 webkit-bug-importer 2019-01-22 09:27:28 -0800 <rdar://problem/47448280> 359738 2019-01-22 08:39:18 -0800 2019-01-22 09:26:05 -0800 Patch bug-193670-20190122083911.patch text/plain 12777 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzVlODIwZjk4MDVmMzdk ZjBiNjRiY2Q2YTNhNmE1OGNmMWI1ODY1My4uNjRjNDJjYWQzYjgzMGI2YzYwNjVjZDA2MzFhODhi ZDNkNDAyYWU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRzXSBEZWNv dXBsZSBjbGVhcmFuY2UgY29tcHV0YXRpb24gYW5kIG1hcmdpbiBjb2xsYXBzaW5nIHJlc2V0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNjcwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBtYXJn aW4gY29sbGFwc2luZyByZXNldCBsb2dpYyBmcm9tIEZsb2F0aW5nQ29udGV4dCB0byBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0LiBJdCdzIHRoZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0J3Mgam9iIHRv IGRvLgorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBjbGVh ciB0byBzdGF0aWMgcG9zaXRpb24uCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bWFw VG9wVG9BbmNlc3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0OjptYXBUb3BMZWZ0VG9BbmNlc3Rvcik6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyIGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlvbldp dGhDbGVhcmFuY2UgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRpbmdDb250 ZXh0Lmg6CisKIDIwMTktMDEtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtGbG9hdHNdIFRha2UgZmxvYXQgdG9wIHBvc2l0aW9uIGludG8gYWNjb3Vu dCB3aGVuIGNvbXB1dGluZyBjb250YWluaW5nIGJsb2NrIGhlaWdodC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDJiYjRhZGI4OWExMTY3OWIzNjU0 NDA3ZWNjNTVlMmVlMDJjODkwMmIuLjFiMGRhODIxZDA1YjQ1MzljNmUwZjJmZGFkODIzNTgxMjhm MDljODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApA QCAtMTg0LDEwICsxODQsMTQgQEAgRGlzcGxheTo6Qm94IEZvcm1hdHRpbmdDb250ZXh0OjptYXBC b3hUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwKICAgICByZXR1cm4g bWFwcGVkRGlzcGxheUJveDsKIH0KIAotUG9pbnQgRm9ybWF0dGluZ0NvbnRleHQ6Om1hcFRvcExl ZnRUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBs YXlvdXRCb3gsIGNvbnN0IENvbnRhaW5lciYgYW5jZXN0b3IpCitMYXlvdXRVbml0IEZvcm1hdHRp bmdDb250ZXh0OjptYXBUb3BUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0 ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnRhaW5lciYgYW5jZXN0b3IpCiB7CiAg ICAgQVNTRVJUKGxheW91dEJveC5pc0Rlc2NlbmRhbnRPZihhbmNlc3RvcikpOwotICAgIHJldHVy biBtYXBDb29yZGluYXRlVG9BbmNlc3RvcihsYXlvdXRTdGF0ZSwgbGF5b3V0U3RhdGUuZGlzcGxh eUJveEZvckxheW91dEJveChsYXlvdXRCb3gpLnRvcExlZnQoKSwgKmxheW91dEJveC5jb250YWlu aW5nQmxvY2soKSwgYW5jZXN0b3IpOworICAgIGF1dG8gdG9wID0gbGF5b3V0U3RhdGUuZGlzcGxh eUJveEZvckxheW91dEJveChsYXlvdXRCb3gpLnRvcCgpOworICAgIGF1dG8qIGNvbnRhaW5lciA9 IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKKyAgICBmb3IgKDsgY29udGFpbmVyICYmIGNv bnRhaW5lciAhPSAmYW5jZXN0b3I7IGNvbnRhaW5lciA9IGNvbnRhaW5lci0+Y29udGFpbmluZ0Js b2NrKCkpCisgICAgICAgIHRvcCArPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94 KCpjb250YWluZXIpLnRvcCgpOworICAgIHJldHVybiB0b3A7CiB9CiAKIFBvaW50IEZvcm1hdHRp bmdDb250ZXh0OjptYXBDb29yZGluYXRlVG9BbmNlc3Rvcihjb25zdCBMYXlvdXRTdGF0ZSYgbGF5 b3V0U3RhdGUsIFBvaW50IHBvc2l0aW9uLCBjb25zdCBDb250YWluZXImIGNvbnRhaW5pbmdCbG9j aywgY29uc3QgQ29udGFpbmVyJiBhbmNlc3RvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmgKaW5kZXggMzRhYWU5Nzg4N2JjYzQyYjMyMjViZWQ2NGRiMzAxNjlkNjdj YzI4Yi4uY2NiMjc5MGMyYTU1NTVjMGQzNmIxNDBjMTZlZTQ4M2FiNDk1MDMwOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgSW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMoKSBjb25zdCA9IDA7CiAKICAgICBzdGF0aWMgRGlzcGxheTo6Qm94IG1h cEJveFRvQW5jZXN0b3IoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmLCBjb25zdCBDb250 YWluZXImIGFuY2VzdG9yKTsKLSAgICBzdGF0aWMgUG9pbnQgbWFwVG9wTGVmdFRvQW5jZXN0b3Io Y29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmLCBjb25zdCBDb250YWluZXImIGFuY2VzdG9y KTsKKyAgICBzdGF0aWMgTGF5b3V0VW5pdCBtYXBUb3BUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0 YXRlJiwgY29uc3QgQm94JiwgY29uc3QgQ29udGFpbmVyJiBhbmNlc3Rvcik7CiAgICAgc3RhdGlj IFBvaW50IG1hcENvb3JkaW5hdGVUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0YXRlJiwgUG9pbnQs IGNvbnN0IENvbnRhaW5lciYgY29udGFpbmluZ0Jsb2NrLCBjb25zdCBDb250YWluZXImIGFuY2Vz dG9yKTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXgg MTg3NzdkMzlhY2VmN2ExZTE3YzdmOWMzYjcxMDQ1ZDI4MTRkZmVlYy4uNTMxN2Q3NWM2OTBiMjhh ZDAwYjQxYmQzYWNmMTExMWY4MjllZjEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC0yOTEsMTQgKzI5MSw0NiBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhcihjb25zdCBGbG9hdGluZwogICAgIGlm IChmbG9hdGluZ0NvbnRleHQuZmxvYXRpbmdTdGF0ZSgpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwogICAg IC8vIEZvciBmb3JtYXR0aW5nIHJvb3RzLCB3ZSBhbHJlYWR5IHByZWNvbXB1dGVkIGZpbmFsIHBv c2l0aW9uLgogICAgIGlmICghbGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSkKICAgICAgICAgY29tcHV0ZUVzdGltYXRlZE1hcmdpbkJlZm9yZUZvckFuY2VzdG9ycyhsYXlv dXRCb3gpOwogICAgIEFTU0VSVChoYXNQcmVjb21wdXRlZE1hcmdpbkJlZm9yZShsYXlvdXRCb3gp KTsKIAotICAgIGlmIChhdXRvIHZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlID0gZmxvYXRp bmdDb250ZXh0LnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGxheW91dEJveCkpCi0gICAg ICAgIGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KS5zZXRUb3Ao KnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKTsKKyAgICAvLyAxLiBDb21wdXRlIGFuZCBh ZGp1c3QgdGhlIHZlcnRpY2FsIHBvc2l0aW9uIHdpdGggY2xlYXJhbmNlLgorICAgIC8vIDIuIFJl c2V0IG1hcmdpbiBjb2xsYXBzaW5nIHdpdGggcHJldmlvdXMgaW4tZmxvdyBzaWJsaW5nIGlmIGNs ZXJhbmNlIGlzIHByZXNlbnQuCisgICAgYXV0byB2ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNl ID0gZmxvYXRpbmdDb250ZXh0LnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGxheW91dEJv eCk7CisgICAgaWYgKCF2ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNlLnBvc2l0aW9uKQorICAg ICAgICByZXR1cm47CisKKyAgICAvLyBBZGp1c3QgdmVydGljYWwgcG9zaXRpb24gZmlyc3QuCisg ICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOworICAgIGF1dG8mIGRp c3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7 CisgICAgZGlzcGxheUJveC5zZXRUb3AoKnZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UucG9z aXRpb24pOworICAgIGlmICghdmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZS5jbGVhcmFuY2Up CisgICAgICAgIHJldHVybjsKKworICAgIGRpc3BsYXlCb3guc2V0SGFzQ2xlYXJhbmNlKCk7Cisg ICAgLy8gQWRqdXN0IG1hcmdpbiBjb2xsYXBzaW5nIHdpdGggY2xlYXJhbmNlLgorICAgIGF1dG8q IHByZXZpb3VzSW5GbG93U2libGluZyA9IGxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmco KTsKKyAgICBpZiAoIXByZXZpb3VzSW5GbG93U2libGluZykKKyAgICAgICAgcmV0dXJuOworCisg ICAgLy8gQ2xlYXJhbmNlIGluaGliaXRzIG1hcmdpbiBjb2xsYXBzaW5nLiBMZXQncyByZXNldCB0 aGUgcmVsZXZhbnQgYWRqb2luaW5nIG1hcmdpbnMuCisgICAgLy8gRG9lcyB0aGlzIGJveCB3aXRo IGNsZWFyYW5jZSBhY3R1YWxseSBjb2xsYXBzZSBpdHMgbWFyZ2luIGJlZm9yZSB3aXRoIHRoZSBw cmV2aW91cyBpbmZsb3cgYm94J3MgbWFyZ2luIGFmdGVyPyAKKyAgICBhdXRvIHZlcnRpY2FsTWFy Z2luID0gZGlzcGxheUJveC52ZXJ0aWNhbE1hcmdpbigpOworICAgIGlmICghdmVydGljYWxNYXJn aW4uaGFzQ29sbGFwc2VkVmFsdWVzKCkgfHwgIXZlcnRpY2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVl cygpLmJlZm9yZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gUmVzZXQgcHJldmlvdXMgYWZ0 ZXIgYW5kIGN1cnJlbnQgYmVmb3JlIG1hcmdpbiB2YWx1ZXMgdG8gbm9uLWNvbGxhcHNpbmcuCisg ICAgYXV0byYgcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJv eEZvckxheW91dEJveCgqcHJldmlvdXNJbkZsb3dTaWJsaW5nKTsgCisgICAgYXV0byBwcmV2aW91 c1ZlcnRpY2FsTWFyZ2luID0gcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94LnZlcnRpY2FsTWFyZ2lu KCk7CisgICAgQVNTRVJUKHByZXZpb3VzVmVydGljYWxNYXJnaW4uaGFzQ29sbGFwc2VkVmFsdWVz KCkgJiYgcHJldmlvdXNWZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5hZnRlcik7CisK KyAgICBwcmV2aW91c1ZlcnRpY2FsTWFyZ2luLnNldENvbGxhcHNlZFZhbHVlcyh7IHByZXZpb3Vz VmVydGljYWxNYXJnaW4uY29sbGFwc2VkVmFsdWVzKCkuYmVmb3JlLCB7IH0gfSk7CisgICAgdmVy dGljYWxNYXJnaW4uc2V0Q29sbGFwc2VkVmFsdWVzKHsgeyB9LCB2ZXJ0aWNhbE1hcmdpbi5jb2xs YXBzZWRWYWx1ZXMoKS5hZnRlciB9KTsKKworICAgIHByZXZpb3VzSW5GbG93RGlzcGxheUJveC5z ZXRWZXJ0aWNhbE1hcmdpbihwcmV2aW91c1ZlcnRpY2FsTWFyZ2luKTsKKyAgICBkaXNwbGF5Qm94 LnNldFZlcnRpY2FsTWFyZ2luKHZlcnRpY2FsTWFyZ2luKTsKIH0KIAogdm9pZCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4 dC5jcHAKaW5kZXggMDg2YTVkMWQ5NGYwODg3MWZkNDNjMjQ5M2I2YjBjZDJkZjMxODk3NS4uNTc1 NjRkNjNiOWEwNjJjY2E5NjcwMTI2MjkxMTRjODYzNGVhNjcwYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcApAQCAtMTkxLDcgKzE5MSw3 IEBAIE9wdGlvbmFsPFBvaW50PiBGbG9hdGluZ0NvbnRleHQ6OnBvc2l0aW9uRm9yRmxvYXRBdm9p ZGluZyhjb25zdCBCb3gmIGxheW91dEJveCkKICAgICByZXR1cm4geyBmbG9hdEF2b2lkZXIucmVj dEluQ29udGFpbmluZ0Jsb2NrKCkudG9wTGVmdCgpIH07CiB9CiAKLU9wdGlvbmFsPFBvc2l0aW9u PiBGbG9hdGluZ0NvbnRleHQ6OnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdAorRmxvYXRpbmdDb250ZXh0OjpDbGVhcmFuY2VQb3NpdGlvbiBG bG9hdGluZ0NvbnRleHQ6OnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGNvbnN0IEJveCYg bGF5b3V0Qm94KSBjb25zdAogewogICAgIEFTU0VSVChsYXlvdXRCb3guaGFzRmxvYXRDbGVhcigp KTsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsKQEAgLTIwMCw3ICsy MDAsNyBAQCBPcHRpb25hbDxQb3NpdGlvbj4gRmxvYXRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFBvc2l0 aW9uV2l0aENsZWFyYW5jZShjb25zdCBCb3gmIGxheQogICAgIGlmIChtX2Zsb2F0aW5nU3RhdGUu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBib3R0b20gPSBbJl0o T3B0aW9uYWw8UG9zaXRpb25JbkNvbnRleHRSb290PiBmbG9hdEJvdHRvbSkgLT4gT3B0aW9uYWw8 UG9zaXRpb24+IHsKKyAgICBhdXRvIGJvdHRvbSA9IFsmXShPcHRpb25hbDxQb3NpdGlvbkluQ29u dGV4dFJvb3Q+IGZsb2F0Qm90dG9tKSAtPiBDbGVhcmFuY2VQb3NpdGlvbiB7CiAgICAgICAgIC8v ICdib3R0b20nIGlzIGluIHRoZSBmb3JtYXR0aW5nIHJvb3QncyBjb29yZGluYXRlIHN5c3RlbS4K ICAgICAgICAgaWYgKCFmbG9hdEJvdHRvbSkKICAgICAgICAgICAgIHJldHVybiB7IH07CkBAIC0y MTAsMzcgKzIxMCwyMyBAQCBPcHRpb25hbDxQb3NpdGlvbj4gRmxvYXRpbmdDb250ZXh0Ojp2ZXJ0 aWNhbFBvc2l0aW9uV2l0aENsZWFyYW5jZShjb25zdCBCb3gmIGxheQogICAgICAgICAvLwogICAg ICAgICAvLyAxLiBUaGUgYW1vdW50IG5lY2Vzc2FyeSB0byBwbGFjZSB0aGUgYm9yZGVyIGVkZ2Ug b2YgdGhlIGJsb2NrIGV2ZW4gd2l0aCB0aGUgYm90dG9tIG91dGVyIGVkZ2Ugb2YgdGhlIGxvd2Vz dCBmbG9hdCB0aGF0IGlzIHRvIGJlIGNsZWFyZWQuCiAgICAgICAgIC8vIDIuIFRoZSBhbW91bnQg bmVjZXNzYXJ5IHRvIHBsYWNlIHRoZSB0b3AgYm9yZGVyIGVkZ2Ugb2YgdGhlIGJsb2NrIGF0IGl0 cyBoeXBvdGhldGljYWwgcG9zaXRpb24uCi0KICAgICAgICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0 aGlzLT5sYXlvdXRTdGF0ZSgpOwotICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3Rh dGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gpOwotICAgICAgICBhdXRvIHJvb3RS ZWxhdGl2ZVRvcCA9IEZvcm1hdHRpbmdDb250ZXh0OjptYXBUb3BMZWZ0VG9BbmNlc3RvcihsYXlv dXRTdGF0ZSwgbGF5b3V0Qm94LCBkb3duY2FzdDxDb250YWluZXI+KG1fZmxvYXRpbmdTdGF0ZS5y b290KCkpKS55OworICAgICAgICBhdXRvIHJvb3RSZWxhdGl2ZVRvcCA9IEZvcm1hdHRpbmdDb250 ZXh0OjptYXBUb3BUb0FuY2VzdG9yKGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIGRvd25jYXN0PENv bnRhaW5lcj4obV9mbG9hdGluZ1N0YXRlLnJvb3QoKSkpOwogICAgICAgICBhdXRvIGNsZWFyYW5j ZSA9ICpmbG9hdEJvdHRvbSAtIHJvb3RSZWxhdGl2ZVRvcDsKICAgICAgICAgaWYgKGNsZWFyYW5j ZSA8PSAwKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgICAgICBkaXNwbGF5Qm94LnNl dEhhc0NsZWFyYW5jZSgpOwotICAgICAgICAvLyBDbGVhcmFuY2UgaW5oaWJpdHMgbWFyZ2luIGNv bGxhcHNpbmcuIExldCdzIHJlc2V0IHRoZSByZWxldmFudCBhZGpvaW5pbmcgbWFyZ2lucy4KKyAg ICAgICAgLy8gQ2xlYXJhbmNlIGluaGliaXRzIG1hcmdpbiBjb2xsYXBzaW5nLgogICAgICAgICBp ZiAoYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5b3V0Qm94LnByZXZpb3VzSW5GbG93 U2libGluZygpKSB7Ci0gICAgICAgICAgICBhdXRvJiBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3gg PSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpwcmV2aW91c0luRmxvd1NpYmxp bmcpOwogICAgICAgICAgICAgLy8gRG9lcyB0aGlzIGJveCB3aXRoIGNsZWFyYW5jZSBhY3R1YWxs eSBjb2xsYXBzZSBpdHMgbWFyZ2luIGJlZm9yZSB3aXRoIHRoZSBwcmV2aW91cyBpbmZsb3cgYm94 J3MgbWFyZ2luIGFmdGVyPyAKLSAgICAgICAgICAgIGF1dG8gdmVydGljYWxNYXJnaW4gPSBkaXNw bGF5Qm94LnZlcnRpY2FsTWFyZ2luKCk7CisgICAgICAgICAgICBhdXRvIHZlcnRpY2FsTWFyZ2lu ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gpLnZlcnRpY2Fs TWFyZ2luKCk7CiAgICAgICAgICAgICBpZiAodmVydGljYWxNYXJnaW4uaGFzQ29sbGFwc2VkVmFs dWVzKCkgJiYgdmVydGljYWxNYXJnaW4uY29sbGFwc2VkVmFsdWVzKCkuYmVmb3JlKSB7Ci0gICAg ICAgICAgICAgICAgLy8gUmVzZXQgcHJldmlvdXMgYm90dG9tIGFmdGVyIGFuZCBjdXJyZW50IG1h cmdpbiBiZWZvcmUgdG8gbm9uLWNvbGxhcHNpbmcuCi0gICAgICAgICAgICAgICAgYXV0byBwcmV2 aW91c1ZlcnRpY2FsTWFyZ2luID0gcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94LnZlcnRpY2FsTWFy Z2luKCk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKHByZXZpb3VzVmVydGljYWxNYXJnaW4uaGFz Q29sbGFwc2VkVmFsdWVzKCkgJiYgcHJldmlvdXNWZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1 ZXMoKS5hZnRlcik7Ci0KKyAgICAgICAgICAgICAgICBhdXRvIHByZXZpb3VzVmVydGljYWxNYXJn aW4gPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpwcmV2aW91c0luRmxvd1Np YmxpbmcpLnZlcnRpY2FsTWFyZ2luKCk7CiAgICAgICAgICAgICAgICAgYXV0byBjb2xsYXBzZWRN YXJnaW4gPSAqdmVydGljYWxNYXJnaW4uY29sbGFwc2VkVmFsdWVzKCkuYmVmb3JlOwotICAgICAg ICAgICAgICAgIHByZXZpb3VzVmVydGljYWxNYXJnaW4uc2V0Q29sbGFwc2VkVmFsdWVzKHsgcHJl dmlvdXNWZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5iZWZvcmUsIHsgfSB9KTsKLSAg ICAgICAgICAgICAgICBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4o cHJldmlvdXNWZXJ0aWNhbE1hcmdpbik7Ci0KLSAgICAgICAgICAgICAgICB2ZXJ0aWNhbE1hcmdp bi5zZXRDb2xsYXBzZWRWYWx1ZXMoeyB7IH0sIHZlcnRpY2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVl cygpLmFmdGVyIH0pOwotICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJn aW4odmVydGljYWxNYXJnaW4pOwotCiAgICAgICAgICAgICAgICAgYXV0byBub25Db2xsYXBzZWRN YXJnaW4gPSBwcmV2aW91c1ZlcnRpY2FsTWFyZ2luLmFmdGVyKCkgKyB2ZXJ0aWNhbE1hcmdpbi5i ZWZvcmUoKTsKICAgICAgICAgICAgICAgICBhdXRvIG1hcmdpbkRpZmZlcmVuY2UgPSBub25Db2xs YXBzZWRNYXJnaW4gLSBjb2xsYXBzZWRNYXJnaW47CiAgICAgICAgICAgICAgICAgLy8gTW92ZSB0 aGUgYm94IHRvIHRoZSBwb3NpdGlvbiB3aGVyZSBpdCB3b3VsZCBiZSB3aXRoIG5vbi1jb2xsYXBz ZWQgbWFyZ2lucy4KICAgICAgICAgICAgICAgICByb290UmVsYXRpdmVUb3AgKz0gbWFyZ2luRGlm ZmVyZW5jZTsKLQogICAgICAgICAgICAgICAgIC8vIEhhdmluZyBuZWdhdGl2ZSBjbGVhcmFuY2Ug aXMgYWxzbyBub3JtYWwuIEl0IGp1c3QgbWVhbnMgdGhhdCB0aGUgYm94IHdpdGggdGhlIG5vbi1j b2xsYXBzZWQgbWFyZ2lucyBpcyBub3cgbG93ZXIgdGhhbiBpdCBuZWVkcyB0byBiZS4KICAgICAg ICAgICAgICAgICBjbGVhcmFuY2UgLT0gbWFyZ2luRGlmZmVyZW5jZTsKICAgICAgICAgICAgIH0K QEAgLTI1MSwxMCArMjM3LDEwIEBAIE9wdGlvbmFsPFBvc2l0aW9uPiBGbG9hdGluZ0NvbnRleHQ6 OnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGNvbnN0IEJveCYgbGF5CiAKICAgICAgICAg Ly8gVGhlIHJldHVybiB2ZXJ0aWNhbCBwb3NpdGlvbiBpcyBpbiB0aGUgY29udGFpbmluZyBibG9j aydzIGNvb3JkaW5hdGUgc3lzdGVtLiBDb252ZXJ0IGl0IHRvIHRoZSBmb3JtYXR0aW5nIHJvb3Qn cyBjb29yZGluYXRlIHN5c3RlbSBpZiBuZWVkZWQuCiAgICAgICAgIGlmIChsYXlvdXRCb3guY29u dGFpbmluZ0Jsb2NrKCkgPT0gJm1fZmxvYXRpbmdTdGF0ZS5yb290KCkpCi0gICAgICAgICAgICBy ZXR1cm4gUG9zaXRpb24geyByb290UmVsYXRpdmVUb3AgfTsKKyAgICAgICAgICAgIHJldHVybiB7 IFBvc2l0aW9uIHsgcm9vdFJlbGF0aXZlVG9wIH0sIGNsZWFyYW5jZSB9OwogCi0gICAgICAgIGF1 dG8gY29udGFpbmluZ0Jsb2NrUm9vdFJlbGF0aXZlVG9wID0gRm9ybWF0dGluZ0NvbnRleHQ6Om1h cFRvcExlZnRUb0FuY2VzdG9yKGxheW91dFN0YXRlLCAqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9j aygpLCBkb3duY2FzdDxDb250YWluZXI+KG1fZmxvYXRpbmdTdGF0ZS5yb290KCkpKS55OwotICAg ICAgICByZXR1cm4gUG9zaXRpb24geyByb290UmVsYXRpdmVUb3AgLSBjb250YWluaW5nQmxvY2tS b290UmVsYXRpdmVUb3AgfTsKKyAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tSb290UmVsYXRp dmVUb3AgPSBGb3JtYXR0aW5nQ29udGV4dDo6bWFwVG9wVG9BbmNlc3RvcihsYXlvdXRTdGF0ZSwg KmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSwgZG93bmNhc3Q8Q29udGFpbmVyPihtX2Zsb2F0 aW5nU3RhdGUucm9vdCgpKSk7CisgICAgICAgIHJldHVybiB7IFBvc2l0aW9uIHsgcm9vdFJlbGF0 aXZlVG9wIC0gY29udGFpbmluZ0Jsb2NrUm9vdFJlbGF0aXZlVG9wIH0sIGNsZWFyYW5jZSB9Owog ICAgIH07CiAKICAgICBhdXRvIGNsZWFyID0gbGF5b3V0Qm94LnN0eWxlKCkuY2xlYXIoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5oCmluZGV4IGVh OGVkZTA0ZTJhZjVmMTNlMDY3ZGM0YzY5MmIzZWI4YTMxYzViNzkuLjJmNDYwZTBhZDM1NDU5MWQ4 NzMxMjllOTQ4NDQyYmUzZTJiYzc1NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zs b2F0cy9GbG9hdGluZ0NvbnRleHQuaApAQCAtNTIsNyArNTIsMTIgQEAgcHVibGljOgogCiAgICAg UG9pbnQgcG9zaXRpb25Gb3JGbG9hdChjb25zdCBCb3gmKSBjb25zdDsKICAgICBPcHRpb25hbDxQ b2ludD4gcG9zaXRpb25Gb3JGbG9hdEF2b2lkaW5nKGNvbnN0IEJveCYpIGNvbnN0OwotICAgIE9w dGlvbmFsPFBvc2l0aW9uPiB2ZXJ0aWNhbFBvc2l0aW9uV2l0aENsZWFyYW5jZShjb25zdCBCb3gm KSBjb25zdDsKKworICAgIHN0cnVjdCBDbGVhcmFuY2VQb3NpdGlvbiB7CisgICAgICAgIE9wdGlv bmFsPFBvc2l0aW9uPiBwb3NpdGlvbjsKKyAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY2xl YXJhbmNlOworICAgIH07CisgICAgQ2xlYXJhbmNlUG9zaXRpb24gdmVydGljYWxQb3NpdGlvbldp dGhDbGVhcmFuY2UoY29uc3QgQm94JikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgTGF5b3V0U3Rh dGUmIGxheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGluZ1N0YXRlLmxheW91dFN0 YXRlKCk7IH0K