192214 2018-11-29 21:11:32 -0800 [LFC][BFC][MarginCollapsing] Do not use computed display box values for border and padding 2018-11-30 07:23:37 -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 1483390 0 zalan 2018-11-29 21:11:32 -0800 they are not computed yet when we are trying to estimate margin top values. try to survive with the non-computed values. <body><div style="float: left"></div><div><div style="margin-top: 10px">foobar</div></div> when the floating box is placed, we need to know its final vertical position. We estimate margin tops all the way to the formatting context root. To computer margin-top for the <body>, we actually have to know if that nested div's margin gets collapsed all the way up. To find it out we need to know padding and border values. Unfortunately at the time when the float is placed we don't yet have that information. 1483397 1 356127 zalan 2018-11-29 21:27:43 -0800 Created attachment 356127 Patch 1483515 2 zalan 2018-11-30 07:22:46 -0800 Committed r238735: <https://trac.webkit.org/changeset/238735> 1483516 3 webkit-bug-importer 2018-11-30 07:23:37 -0800 <rdar://problem/46372648> 356127 2018-11-29 21:27:43 -0800 2018-11-30 07:11:11 -0800 Patch bug-192214-20181129212740.patch text/plain 12231 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzY1YTUwN2ViOGYwOTlj ZTVmZGJjYmI2YjFjNWNkOWJmZDMzMDRmNC4uZjhkNWIyMjFjY2RlYzlhNTRiY2ExYWY5ZWZlODRi ZWM0NDViODQ4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE4LTExLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5D b2xsYXBzaW5nXSBEbyBub3QgdXNlIGNvbXB1dGVkIGRpc3BsYXkgYm94IHZhbHVlcyBmb3IgYm9y ZGVyIGFuZCBwYWRkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTIyMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBCb3JkZXIgYW5kIHBhZGRpbmcgdmFsdWVzIGFyZSBub3QgbmVjZXNzYXJpbHkgY29t cHV0ZWQgeWV0IHdoZW4gd2UgdHJ5IHRvIGVzdGltYXRlIHRoZSBtYXJnaW4gdG9wIHZhbHVlLiBF c3RpbWF0aW5nIG1hcmdpbiB0b3AgaXMgcmVxdWlyZWQKKyAgICAgICAgdG8gYmUgYWJsZSB0byBw bGFjZSBmbG9hdHMgKHZlcnRpY2FsbHkpIHNvb25lciB0aGFuIHdlIHdvdWxkIGNvbXB1dGUgdGhl IGZpbmFsIHZlcnRpY2FsIHBvc2l0aW9uIGZvciBhIHJlZ3VsYXIgYmxvY2sgYm94LgorCisgICAg ICAgIDxib2R5PjxkaXYgc3R5bGU9ImZsb2F0OiBsZWZ0Ij48L2Rpdj48ZGl2PjxkaXYgc3R5bGU9 Im1hcmdpbjogMTBweDsiPjwvZGl2PjwvZGl2PgorCisgICAgICAgIEluIHRoZSBhYm92ZSBleGFt cGxlLCB0byBlc3RpbWF0ZSBhIGZpbmFsIHZlcnRpY2FsIHBvc2l0aW9uIG9mIHRoZSBmbG9hdGlu ZyBib3gsIHdlIG5lZWQgdG8ga25vdyB3aGV0aGVyIHRoZSBuZXN0ZWQgZGl2J3MgbWFyZ2luIGlz IGNvbGxhcHNlZAorICAgICAgICBhbGwgdGhlIHdheSB1cCB0byB0aGUgYm9keS4gSG93ZXZlciBp biBvcmRlciB0byBmaW5kIGl0IG91dCB3ZSBuZWVkIHRvIGNoZWNrIGZvciBib3JkZXJzIGFuZCBw YWRkaW5ncyAodGhleSBzdG9wIG1hcmdpbiBjb2xsYXBzaW5nKS4KKyAgICAgICAgQXQgdGhlIHRp bWUgd2hlbiB0aGUgZmxvYXRpbmcgYm94IGlzIGJlaW5nIGxhaWVkIG91dCwgdGhvc2UgPGRpdj4g YmxvY2sgYm94ZXMgYXJlIHN0aWxsIGZhciBkb3duIGluIHRoZSBsYXlvdXQgcXVldWUuCisKKyAg ICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoK KyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbik6CisgICAg ICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6aGFzQm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6aGFzUGFkZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Omhhc0JvcmRlckJl Zm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Omhhc0JvcmRlckFmdGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6aGFzUGFkZGluZ0JlZm9yZSk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6Omhhc1BhZGRpbmdBZnRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5U b3BDb2xsYXBzZWRXaXRoUGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNNYXJn aW5Cb3R0b21Db2xsYXBzZWRUaHJvdWdoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5Ub3Ap OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJvdHRvbSk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6 aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Ok1hcmdpbkNvbGxhcHNlOjpj b2xsYXBzZWRNYXJnaW5Cb3R0b21Gcm9tTGFzdENoaWxkKToKKwogMjAxOC0xMS0yOSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ11bUXVpcmtdIEJv ZHkgYW5kIGh0bWwgaGVpZ2h0IHN0cmV0Y2hpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5o CmluZGV4IDM4YmRjNDAwYTBjZTljODMyYjE1OWVjYzRlNDhjZTY5NjZjYTBhNzYuLmU2NzdlMDE3 NGYwZWQ1OGMxNjJmYjZiNzEzZGUwOTZiMTFmMGZkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5oCkBAIC04OSw3ICs4OSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBzdGF0aWMgTGF5 b3V0VW5pdCBtYXJnaW5Ub3AoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKICAgICAg ICAgICAgIHN0YXRpYyBMYXlvdXRVbml0IG1hcmdpbkJvdHRvbShjb25zdCBMYXlvdXRTdGF0ZSYs IGNvbnN0IEJveCYpOwogCi0gICAgICAgICAgICBzdGF0aWMgYm9vbCBpc01hcmdpbkJvdHRvbUNv bGxhcHNlZFdpdGhQYXJlbnQoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKKyAgICAg ICAgICAgIHN0YXRpYyBib29sIGlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudChjb25z dCBCb3gmKTsKICAgICAgICAgICAgIHN0YXRpYyBib29sIGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0 aFBhcmVudE1hcmdpbkJvdHRvbShjb25zdCBCb3gmKTsKIAogICAgICAgICBwcml2YXRlOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDg2Njk1ZGNm NTY1MWRlOTJmNzJkZTQ3N2FhOWVkZGEzNWZhNTU0Y2IuLjllNjk0Y2E2MGNhZDVkM2JhYWIyMjhm MGEyNGMxMzQ4ODhjZmQ3N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKQEAgLTgzLDcgKzgzLDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmcKICAg ICAgICAgLy8gMi4gdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBib3R0b20gKHBvc3NpYmx5IGNvbGxh cHNlZCkgbWFyZ2luIG9mIGl0cyBsYXN0IGluLWZsb3cgY2hpbGQsIGlmIHRoZSBjaGlsZCdzIGJv dHRvbSBtYXJnaW4uLi4KICAgICAgICAgYXV0byogbGFzdEluRmxvd0NoaWxkID0gZG93bmNhc3Q8 Q29udGFpbmVyPihsYXlvdXRCb3gpLmxhc3RJbkZsb3dDaGlsZCgpOwogICAgICAgICBBU1NFUlQo bGFzdEluRmxvd0NoaWxkKTsKLSAgICAgICAgaWYgKCFNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5C b3R0b21Db2xsYXBzZWRXaXRoUGFyZW50KGxheW91dFN0YXRlLCAqbGFzdEluRmxvd0NoaWxkKSkg eworICAgICAgICBpZiAoIU1hcmdpbkNvbGxhcHNlOjppc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdp dGhQYXJlbnQoKmxhc3RJbkZsb3dDaGlsZCkpIHsKICAgICAgICAgICAgIGF1dG8mIGxhc3RJbkZs b3dEaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveCgqbGFzdElu Rmxvd0NoaWxkKTsKICAgICAgICAgICAgIHJldHVybiB7IGxhc3RJbkZsb3dEaXNwbGF5Qm94LmJv dHRvbSgpICsgbGFzdEluRmxvd0Rpc3BsYXlCb3gubWFyZ2luQm90dG9tKCkgLSBib3JkZXJBbmRQ YWRkaW5nVG9wLCBub25Db2xsYXBzZWRNYXJnaW4sIGNvbGxhcHNlZE1hcmdpbiB9OwogICAgICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCA5ODA5OWI4MjIyM2Q0ODdjNDFjNTdi MmZlMjFkMmFhNDEyYmI2YTNkLi5lYjc5M2IzY2Q0ZjA2ZGJlZTU5N2RhOGI0NDViNjc5MDNkNDA3 YzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrTWFyZ2luQ29sbGFwc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKQEAgLTM2LDYgKzM2LDM5IEBACiBuYW1l c3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorc3RhdGljIGJvb2wgaGFzQm9y ZGVyKGNvbnN0IEJvcmRlclZhbHVlJiBib3JkZXJWYWx1ZSkKK3sKKyAgICBpZiAoYm9yZGVyVmFs dWUuc3R5bGUoKSA9PSBCb3JkZXJTdHlsZTo6Tm9uZSB8fCBib3JkZXJWYWx1ZS5zdHlsZSgpID09 IEJvcmRlclN0eWxlOjpIaWRkZW4pCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4g ISFib3JkZXJWYWx1ZS53aWR0aCgpOworfQorCitzdGF0aWMgYm9vbCBoYXNQYWRkaW5nKGNvbnN0 IExlbmd0aCYgcGFkZGluZ1ZhbHVlKQoreworICAgIC8vIEZJWE1FOiBDaGVjayBpZiBwZXJjZW50 IHZhbHVlIG5lZWRzIHRvIGJlIHJlc29sdmVkLgorICAgIHJldHVybiAhcGFkZGluZ1ZhbHVlLmlz WmVybygpOworfQorCitzdGF0aWMgYm9vbCBoYXNCb3JkZXJCZWZvcmUoY29uc3QgQm94JiBsYXlv dXRCb3gpCit7CisgICAgcmV0dXJuIGhhc0JvcmRlcihsYXlvdXRCb3guc3R5bGUoKS5ib3JkZXJC ZWZvcmUoKSk7Cit9CisKK3N0YXRpYyBib29sIGhhc0JvcmRlckFmdGVyKGNvbnN0IEJveCYgbGF5 b3V0Qm94KQoreworICAgIHJldHVybiBoYXNCb3JkZXIobGF5b3V0Qm94LnN0eWxlKCkuYm9yZGVy QWZ0ZXIoKSk7Cit9CisKK3N0YXRpYyBib29sIGhhc1BhZGRpbmdCZWZvcmUoY29uc3QgQm94JiBs YXlvdXRCb3gpCit7CisgICAgcmV0dXJuIGhhc1BhZGRpbmcobGF5b3V0Qm94LnN0eWxlKCkucGFk ZGluZ0JlZm9yZSgpKTsKK30KKworc3RhdGljIGJvb2wgaGFzUGFkZGluZ0FmdGVyKGNvbnN0IEJv eCYgbGF5b3V0Qm94KQoreworICAgIHJldHVybiBoYXNQYWRkaW5nKGxheW91dEJveC5zdHlsZSgp LnBhZGRpbmdBZnRlcigpKTsKK30KKwogc3RhdGljIExheW91dFVuaXQgbWFyZ2luVmFsdWUoTGF5 b3V0VW5pdCBjdXJyZW50TWFyZ2luVmFsdWUsIExheW91dFVuaXQgY2FuZGlkYXRlTWFyZ2luVmFs dWUpCiB7CiAgICAgaWYgKCFjYW5kaWRhdGVNYXJnaW5WYWx1ZSkKQEAgLTk0LDEzICsxMjcsMTMg QEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6 OmlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFAKICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdP ck91dE9mRmxvd1Bvc2l0aW9uZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgLy8g V2UgbmV2ZXIgbWFyZ2luIGNvbGxhcHNlIHRoZSBpbml0aWFsIGNvbnRhaW5pbmcgYmxvY2suCi0g ICAgQVNTRVJUKGxheW91dEJveC5wYXJlbnQoKSk7Ci0gICAgYXV0byYgcGFyZW50ID0gKmxheW91 dEJveC5wYXJlbnQoKTsKICAgICAvLyBPbmx5IHRoZSBmaXJzdCBpbmxmbG93IGNoaWxkIGNvbGxh cHNlcyB3aXRoIHBhcmVudC4KICAgICBpZiAobGF5b3V0Qm94LnByZXZpb3VzSW5GbG93U2libGlu ZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICAvLyBXZSBuZXZlciBtYXJnaW4gY29s bGFwc2UgdGhlIGluaXRpYWwgY29udGFpbmluZyBibG9jay4KKyAgICBBU1NFUlQobGF5b3V0Qm94 LnBhcmVudCgpKTsKKyAgICBhdXRvJiBwYXJlbnQgPSAqbGF5b3V0Qm94LnBhcmVudCgpOwogICAg IGlmIChwYXJlbnQuZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIApAQCAtMTA4LDExICsxNDEsMTAgQEAgYm9vbCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luVG9wQ29sbGFwc2Vk V2l0aFAKICAgICBpZiAocGFyZW50LmlzRG9jdW1lbnRCb3goKSB8fCBwYXJlbnQuaXNJbml0aWFs Q29udGFpbmluZ0Jsb2NrKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8mIHBh cmVudERpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KHBhcmVu dCk7Ci0gICAgaWYgKHBhcmVudERpc3BsYXlCb3guYm9yZGVyVG9wKCkpCisgICAgaWYgKGhhc0Jv cmRlckJlZm9yZShwYXJlbnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAocGFy ZW50RGlzcGxheUJveC5wYWRkaW5nVG9wKCkudmFsdWVfb3IoMCkpCisgICAgaWYgKGhhc1BhZGRp bmdCZWZvcmUocGFyZW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6c2hvdWxkSWdub3JlTWFyZ2luVG9wKGxheW91dFN0 YXRlLCBsYXlvdXRCb3gpKQpAQCAtMTIxLDE3ICsxNTMsMTUgQEAgYm9vbCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luVG9wQ29sbGFwc2Vk V2l0aFAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgaXNNYXJnaW5Cb3R0b21D b2xsYXBzZWRUaHJvdWdoKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94 JiBsYXlvdXRCb3gpCitzdGF0aWMgYm9vbCBpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFRocm91Z2go Y29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5pc0Jsb2NrTGV2 ZWxCb3goKSk7CiAKICAgICAvLyBJZiB0aGUgdG9wIGFuZCBib3R0b20gbWFyZ2lucyBvZiBhIGJv eCBhcmUgYWRqb2luaW5nLCB0aGVuIGl0IGlzIHBvc3NpYmxlIGZvciBtYXJnaW5zIHRvIGNvbGxh cHNlIHRocm91Z2ggaXQuCi0gICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3Bs YXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKLQotICAgIGlmIChkaXNwbGF5Qm94LmJvcmRl clRvcCgpIHx8IGRpc3BsYXlCb3guYm9yZGVyQm90dG9tKCkpCisgICAgaWYgKGhhc0JvcmRlckJl Zm9yZShsYXlvdXRCb3gpIHx8IGhhc0JvcmRlckFmdGVyKGxheW91dEJveCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIGlmIChkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKS52YWx1ZV9vcigw KSB8fCBkaXNwbGF5Qm94LnBhZGRpbmdCb3R0b20oKS52YWx1ZV9vcigwKSkKKyAgICBpZiAoaGFz UGFkZGluZ0JlZm9yZShsYXlvdXRCb3gpIHx8IGhhc1BhZGRpbmdBZnRlcihsYXlvdXRCb3gpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIWxheW91dEJveC5zdHlsZSgpLmhlaWdo dCgpLmlzQXV0bygpIHx8ICFsYXlvdXRCb3guc3R5bGUoKS5taW5IZWlnaHQoKS5pc0F1dG8oKSkK QEAgLTIxOSw3ICsyNDksNyBAQCBMYXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVG9wKGNvbnN0IExheQogICAgICAgICByZXR1 cm4gMDsKIAogICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoU2libGluZyhsYXlvdXRC b3gpKSB7Ci0gICAgICAgIGlmICghaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRUaHJvdWdoKGxheW91 dFN0YXRlLCBsYXlvdXRCb3gpKQorICAgICAgICBpZiAoIWlzTWFyZ2luQm90dG9tQ29sbGFwc2Vk VGhyb3VnaChsYXlvdXRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdp blRvcChsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKICAgICAgICAgLy8gQ29tcHV0ZSB0aGUgY29s bGFwc2VkIHRocm91Z2ggdmFsdWUuCiAgICAgICAgIGF1dG8gbWFyZ2luVG9wID0gbm9uQ29sbGFw c2VkTWFyZ2luVG9wKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwpAQCAtMjQ2LDEwICsyNzYsMTAg QEAgTGF5b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29s bGFwc2U6Om1hcmdpbkJvdHRvbShjb25zdAogICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xl dmVsQm94KCkpOwogCiAgICAgLy8gVE9ETzogdGFrZSBfaGFzQWRqb2luaW5nTWFyZ2luVG9wQW5k Qm90dG9tKCkgaW50byBhY2NvdW50LgotICAgIGlmIChpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdp dGhQYXJlbnQobGF5b3V0U3RhdGUsIGxheW91dEJveCkpCisgICAgaWYgKGlzTWFyZ2luQm90dG9t Q29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRCb3gpKQogICAgICAgICByZXR1cm4gMDsKIAotICAg IGlmIChpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFRocm91Z2gobGF5b3V0U3RhdGUsIGxheW91dEJv eCkpCisgICAgaWYgKGlzTWFyZ2luQm90dG9tQ29sbGFwc2VkVGhyb3VnaChsYXlvdXRCb3gpKQog ICAgICAgICByZXR1cm4gMDsKIAogICAgIC8vIEZsb2F0cyBhbmQgb3V0IG9mIGZsb3cgcG9zaXRp b25lZCBib3hlcyBkbyBub3QgY29sbGFwc2UgdGhlaXIgbWFyZ2lucy4KQEAgLTI2Myw3ICsyOTMs NyBAQCBMYXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5D b2xsYXBzZTo6bWFyZ2luQm90dG9tKGNvbnN0CiAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdp bkJvdHRvbShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKIH0KIAotYm9vbCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFw c2VkV2l0aFBhcmVudChjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEJveCYg bGF5b3V0Qm94KQorYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6TWFyZ2lu Q29sbGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudChjb25zdCBCb3gmIGxh eW91dEJveCkKIHsKICAgICAvLyBsYXN0IGluZmxvdyBib3ggdG8gcGFyZW50LgogICAgIC8vIGh0 dHBzOi8vd3d3LnczLm9yZy9UUi9DU1MyMS9ib3guaHRtbCNjb2xsYXBzaW5nLW1hcmdpbnMKQEAg LTI3NSw3ICszMDUsNyBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpN YXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaQogICAgIGlmIChsYXlvdXRC b3guaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBpZiAoaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRUaHJvdWdoKGxheW91dFN0YXRl LCBsYXlvdXRCb3gpKQorICAgIGlmIChpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFRocm91Z2gobGF5 b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gV2UgbmV2ZXIgbWFyZ2lu IGNvbGxhcHNlIHRoZSBpbml0aWFsIGNvbnRhaW5pbmcgYmxvY2suCkBAIC0yOTIsMTEgKzMyMiwx MCBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpNYXJnaW5Db2xsYXBz ZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaQogICAgIGlmIChwYXJlbnQuaXNEb2N1bWVudEJv eCgpIHx8IHBhcmVudC5pc0luaXRpYWxDb250YWluaW5nQmxvY2soKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgYXV0byYgcGFyZW50RGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3Bs YXlCb3hGb3JMYXlvdXRCb3gocGFyZW50KTsKLSAgICBpZiAocGFyZW50RGlzcGxheUJveC5ib3Jk ZXJUb3AoKSkKKyAgICBpZiAoaGFzQm9yZGVyQmVmb3JlKHBhcmVudCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIGlmIChwYXJlbnREaXNwbGF5Qm94LnBhZGRpbmdUb3AoKS52YWx1ZV9v cigwKSkKKyAgICBpZiAoaGFzUGFkZGluZ0JlZm9yZShwYXJlbnQpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBpZiAoIXBhcmVudC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpKQpAQCAt MzI0LDcgKzM1Myw3IEBAIExheW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Ok1hcmdpbkNvbGxhcHNlOjpjb2xsYXBzZWRNYXJnaW5Cb3R0CiAKICAgICAvLyBGSVhNRTog Q2hlY2sgZm9yIGNvbGxhcHNlZCB0aHJvdWdoIG1hcmdpbi4KICAgICBhdXRvJiBsYXN0SW5GbG93 Q2hpbGQgPSAqZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmxhc3RJbkZsb3dDaGlsZCgp OwotICAgIGlmICghaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50KGxheW91dFN0YXRl LCBsYXN0SW5GbG93Q2hpbGQpKQorICAgIGlmICghaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRo UGFyZW50KGxhc3RJbkZsb3dDaGlsZCkpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgLy8gQ29s bGVjdCBjb2xsYXBzZWQgbWFyZ2luIGJvdHRvbSByZWN1cnNpdmVseS4KZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhY2Y4ODg4M2Q1MWMwY2UzYzIw YjZhMWIyZDVmMTNjYjFjZmJjZTYyLi5lMzkwN2E3ZDBkNDI5N2UxYzRiNmJjZmIyYmMyNGY1ZDJm MzkzMzYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMTEtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KKworICAgICAgICBbTEZDXVtCRkNdW01hcmdpbkNvbGxhcHNpbmddIERvIG5vdCB1c2Ug Y29tcHV0ZWQgZGlzcGxheSBib3ggdmFsdWVzIGZvciBib3JkZXIgYW5kIHBhZGRpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjIxNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTGF5b3V0UmVsb2Fk ZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQ6CisKIDIwMTgtMTEtMjkgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdW1F1aXJrXSBCb2R5IGFu ZCBodG1sIGhlaWdodCBzdHJldGNoaW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNj L0xGQy1wYXNzaW5nLXRlc3RzLnR4dAppbmRleCBhNGUyNzJhYTFlNWZhODdjZTQzZGMxY2E4NmM1 YzBlNDg5ZjY4NmM1Li5jNzIxNjc3MWY5OWExMzc0OTlkZGYwYmZhZGQ5ODNkM2UyOGM0ZDZkIDEw MDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4 dAorKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dApA QCAtMTQwLDMgKzE0MCw0IEBAIGZhc3QvYmxvY2svcG9zaXRpb25pbmcvMDQ2Lmh0bWwKIGZhc3Qv YmxvY2svcG9zaXRpb25pbmcvMDQ5Lmh0bWwKIGZhc3QvYmxvY2svcG9zaXRpb25pbmcvMDUyLmh0 bWwKIGZhc3QvYmxvY2svcG9zaXRpb25pbmcvMDU0Lmh0bWwKK2Zhc3QvYmxvY2svaW5zaWRlLWlu bGluZXMvYmFzaWMtZmxvYXQtaW50cnVzaW9uLmh0bWwK