203927 2019-11-06 16:12:42 -0800 [LFC][MarginCollapsing] Drag anonymous block level boxes into margin collapsing 2019-11-07 10:03:24 -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 1587972 0 zalan 2019-11-06 16:12:42 -0800 They were not really interesting in the context of BFC, but now with IFC... 1587974 1 webkit-bug-importer 2019-11-06 16:13:06 -0800 <rdar://problem/56963636> 1588102 2 383019 zalan 2019-11-06 20:44:32 -0800 Created attachment 383019 Patch 1588272 3 383019 commit-queue 2019-11-07 10:03:23 -0800 Comment on attachment 383019 Patch Clearing flags on attachment: 383019 Committed r252189: <https://trac.webkit.org/changeset/252189> 1588273 4 commit-queue 2019-11-07 10:03:24 -0800 All reviewed patches have been landed. Closing bug. 383019 2019-11-06 20:44:32 -0800 2019-11-07 10:03:23 -0800 Patch bug-203927-20191106204424.patch text/plain 10176 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODliYWYwM2RlNzE0YjZh MDQ2YWIxNTBlYjMyYTFjOTc3YjVlN2ZjZi4uZDI5YzdhNWU4ZjExYmRhN2U2OWJlMmJjYjMwZDRh YzI3OTYxNzEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTExLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bTWFyZ2luQ29sbGFw c2luZ10gRHJhZyBhbm9ueW1vdXMgYmxvY2sgbGV2ZWwgYm94ZXMgaW50byBtYXJnaW4gY29sbGFw c2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAz OTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81Njk2MzYzNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSd2ZSBiZWVuIGlnbm9yaW5nIGFub255 bW91cyBibG9jayBsZXZlbCBib3hlcyBpbiB0aGUgY29udGV4dCBvZiBtYXJnaW4gY29sbGFwc2lu Zy4gTm93IHdpdGggSUZDLCB3ZSBjYW4ndCByZWFsbHkgZG8gdGhhdCBhbnltb3JlLgorICAgICAg ICBUaGlzIHBhdGNoIHJlbW92ZXMgdGhlIGVhcmx5IGJhaWxvdXQgb24gYW5vbiBib3hlcyBhbmQg YWRkcmVzc2VzIHRoZSBmYWxsb3V0LgorCisgICAgICAgICogbGF5b3V0L01hcmdpblR5cGVzLmg6 CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFy Z2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFByZXZpb3VzU2libGlu Z01hcmdpbkFmdGVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhG aXJzdEluRmxvd0NoaWxkTWFyZ2luQmVmb3JlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFm dGVyQ29sbGFwc2VzV2l0aExhc3RJbkZsb3dDaGlsZE1hcmdpbkFmdGVyIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFw c2U6OnVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJsaW5nKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0 aXZlTmVnYXRpdmVNYXJnaW5BZnRlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjplc3RpbWF0ZWRNYXJnaW5C ZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlSWdub3JpbmdDb2xsYXBzaW5nVGhyb3VnaCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdp bkNvbGxhcHNlOjpjb2xsYXBzZWRWZXJ0aWNhbFZhbHVlcyk6CisKIDIwMTktMTEtMDUgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtNYXJnaW5Db2xsYXBz aW5nXSBBZGQgTGluZTo6aXNDb25zaWRlcmVkRW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9NYXJnaW5UeXBlcy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L01hcmdpblR5 cGVzLmgKaW5kZXggZTQyNDkyYmFjOTRhZGY0ZjA0MWVmMDkwNTM5M2MzMzI2ZWM5Yzk4Zi4uZTU5 ZGE2NTA1YzRhYzA4ODgzZGJhZTdiNmI4NmUzOGQyNDY4MmRlYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L01hcmdpblR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L01hcmdpblR5cGVzLmgKQEAgLTgyLDYgKzgyLDEyIEBAIHN0cnVjdCBFc3RpbWF0ZWRNYXJnaW5C ZWZvcmUgewogICAgIGJvb2wgaXNDb2xsYXBzZWRUaHJvdWdoIHsgZmFsc2UgfTsKIH07CiAKKy8v IEZJWE1FOiBUaGlzIHN0cnVjdHVyZSBtaWdodCBuZWVkIHRvIGNoYW5nZSB0byBpbmRpY2F0ZSB0 aGF0IHRoZSBjYWNoZWQgdmFsdWUgaXMgbm90IG5lY2Vzc2FyaWx5IHRoZSBzYW1lIGFzIHRoZSBi b3gncyBjb21wdXRlZCBtYXJnaW4gdmFsdWUuCisvLyBUaGlzIG9ubHkgbWF0dGVycyBpbiBjYXNl IG9mIGNvbGxhcHNlIHRocm91Z2ggbWFyZ2lucyB3aGVuIHRoZXkgY29sbGFwc2UgaW50byBhbm90 aGVyIHNpYmxpbmcgYm94LgorLy8gPGRpdiBzdHlsZT0ibWFyZ2luOiAxcHgiPjwvZGl2PjxkaXYg c3R5bGU9Im1hcmdpbjogMTBweCI+PC9kaXY+IDwtIHRoZSBzZWNvbmQgZGl2J3MgYmVmb3JlL2Fm dGVyIG1hcmluZ3MgY29sbGFwc2UgdGhyb3VnaCBhbmQgdGhlIHNhbWUgdGltZSB0aGV5IGNvbGxh cHNlIGludG8KKy8vIHRoZSBmaXJzdCBkaXYuIFdoZW4gdGhlIHBhcmVudCBjb21wdXRlcyBpdHMg YmVmb3JlIG1hcmdpbiwgaXQgc2hvdWxkIHNlZSB0aGUgc2Vjb25kIGRpdidzIGNvbGxhcHNlZCB0 aHJvdWdoIG1hcmdpbiBhcyB0aGUgdmFsdWUgdG8gY29sbGFwc2Ugd2lkdGggKGFkam9pbmluZyBt YXJnaW4gdmFsdWUpLgorLy8gU28gd2hpbGUgdGhlIGZpcnN0IGRpdidzIGJlZm9yZSBtYXJnaW4g aXMgbm90IDEwcHgsIHRoZSBjYWNoZWQgdmFsdWUgaXMgMTBweCBzbyB0aGF0IHdoZW4gd2UgY29t cHV0ZSB0aGUgcGFyZW50J3MgbWFyZ2luIHdlIGp1c3QgbmVlZCB0byBjaGVjayB0aGUgZmlzdAor Ly8gaW5mbG93IGNoaWxkJ3MgY2FjaGVkIG1hcmdpbiB2YWx1ZS4KIHN0cnVjdCBQb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4gewogICAgIHN0cnVjdCBWYWx1ZXMgewogICAgICAgICBi b29sIGlzTm9uWmVybygpIGNvbnN0IHsgcmV0dXJuIHBvc2l0aXZlLnZhbHVlT3IoMCkgfHwgbmVn YXRpdmUudmFsdWVPcigwKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggMmY0ZGEy ZDQ0OTE4MmI3NDFjZjM1ODNkYjllNDcwMmJmZmQ2Njk0Yy4uYjdjNTRhMTJiMjI2ZjkwYTVkMjlm ZWNhNWY4NTIyNGNlMWM0ZmVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC0xMTIs OSArMTEyLDYgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6 bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmcKIHsKICAgICAvLyBUaGUgZmlyc3Qg aW5mbG93IGNoaWxkIGNvdWxkIHByb3BhZ2F0ZSBpdHMgdG9wIG1hcmdpbiB0byBwYXJlbnQuCiAg ICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL0NTUzIxL2JveC5odG1sI2NvbGxhcHNpbmctbWFy Z2lucwotICAgIGlmIChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotCiAgICAgQVNTRVJUKGxheW91dEJveC5pc0Jsb2NrTGV2ZWxCb3goKSk7CiAKICAgICAv LyBNYXJnaW5zIGJldHdlZW4gYSBmbG9hdGVkIGJveCBhbmQgYW55IG90aGVyIGJveCBkbyBub3Qg Y29sbGFwc2UuCkBAIC0xNTUsMTYgKzE1MiwxMCBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJldmlvdXNTaQog ewogICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogCi0gICAgaWYgKGxh eW91dEJveC5pc0Fub255bW91cygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBpZiAo IWxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgYXV0byYgcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gKmxheW91dEJveC5wcmV2aW91 c0luRmxvd1NpYmxpbmcoKTsKLSAgICBpZiAocHJldmlvdXNJbkZsb3dTaWJsaW5nLmlzQW5vbnlt b3VzKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIC8vIE1hcmdpbnMgYmV0d2VlbiBh IGZsb2F0ZWQgYm94IGFuZCBhbnkgb3RoZXIgYm94IGRvIG5vdCBjb2xsYXBzZS4KICAgICBpZiAo bGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgcHJldmlvdXNJbkZsb3dTaWJsaW5n LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE4OCw5 ICsxNzksNiBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpt YXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJldmlvdXNTaQogCiBib29sIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoRmlyc3RJ bkZsb3dDaGlsZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKIHsKLSAg ICBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQog ICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogICAgIC8vIE1hcmdpbnMg b2YgZWxlbWVudHMgdGhhdCBlc3RhYmxpc2ggbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMg ZG8gbm90IGNvbGxhcHNlIHdpdGggdGhlaXIgaW4tZmxvdyBjaGlsZHJlbi4KICAgICBpZiAoZXN0 YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCkpCkBAIC0yNTksOSArMjQ3 LDYgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2kKIAogYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2lu QWZ0ZXIoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7Ci0gICAgaWYgKGxheW91dEJveC5p c0Fub255bW91cygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBBU1NFUlQobGF5b3V0 Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsKIAogICAgIC8vIE1hcmdpbnMgYmV0d2VlbiBhIGZsb2F0 ZWQgYm94IGFuZCBhbnkgb3RoZXIgYm94IGRvIG5vdCBjb2xsYXBzZS4KQEAgLTM1MCw2ICszMzUs MTEgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoTGFzdEluRmxvd0MKICAgICBpZiAobGFzdEluRmxvd0NoaWxkLmlz SW5saW5lQmxvY2tCb3goKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gVGhpcyBp cyBhIHF1aXJrIGJlaGF2aW9yOiBXaGVuIHRoZSBtYXJnaW4gYWZ0ZXIgb2YgdGhlIGxhc3QgaW5m bG93IGNoaWxkIChvciBhIHByZXZpb3VzIHNpYmxpbmcgd2l0aCBjb2xsYXBzZWQgdGhyb3VnaCBt YXJnaW5zKQorICAgIC8vIGNvbGxhcHNlcyB3aXRoIGEgcXVpcmsgcGFyZW50J3MgdGhlIG1hcmdp biBiZWZvcmUsIHRoZW4gdGhlIHNhbWUgbWFyZ2luIGFmdGVyIGRvZXMgbm90IGNvbGxhcHNlcyB3 aXRoIHRoZSBwYXJlbnQncyBtYXJnaW4gYWZ0ZXIuCisgICAgaWYgKGZvcm1hdHRpbmdDb250ZXh0 KCkucXVpcmtzKCkuc2hvdWxkSWdub3JlQ29sbGFwc2VkUXVpcmtNYXJnaW4obGF5b3V0Qm94KSAm JiBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUobGFzdEluRmxvd0No aWxkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAg LTQ3NSw3ICs0NjUsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxh cHNlOjp1cGRhdGVNYXJnaW5BZnRlckZvclByZXZpb3VzU2libGluZwogICAgIC8vIDEuIEdldCB0 aGUgbWFyZ2luIGJlZm9yZSB2YWx1ZSBmcm9tIHRoZSBuZXh0IGluLWZsb3cgc2libGluZy4gVGhp cyBpcyB0aGUgc2FtZSBhcyB0aGlzIGJveCdzIG1hcmdpbiBhZnRlciB2YWx1ZSBub3cgc2luY2Ug dGhleSBhcmUgY29sbGFwc2VkLgogICAgIC8vIDIuIFVwZGF0ZSB0aGUgY29sbGFwc2VkIG1hcmdp biBhZnRlciB2YWx1ZSBhcyB3ZWxsIGFzIHRoZSBwb3NpdGl2ZS9uZWdhdGl2ZSBjYWNoZS4KICAg ICAvLyAzLiBDaGVjayBpZiB0aGUgYm94J3MgbWFyZ2lucyBjb2xsYXBzZSB0aHJvdWdoLgotICAg IC8vIDQuIElmIHNvLCB1cGRhdGUgdGhlIGNvbGxhcHNlZCBtYXJnaW4gYmVmb3JlIHZhbHVlIGFz IHdlbGwgYXMgdGhlIHBvc2l0aXZlL25lZ2F0aXZlIGNhY2hlLgorICAgIC8vIDQuIElmIHNvLCB1 cGRhdGUgdGhlIHBvc2l0aXZlL25lZ2F0aXZlIGNhY2hlLgogICAgIC8vIDUuIEluIGNhc2Ugb2Yg Y29sbGFwc2VkIHRocm91Z2ggbWFyZ2lucyBjaGVjayBpZiB0aGUgYmVmb3JlIG1hcmdpbiBjb2xs YXBlcyB3aXRoIHRoZSBwcmV2aW91cyBpbmZsb3cgc2libGluZydzIGFmdGVyIG1hcmdpbi4KICAg ICAvLyA2LiBJZiBzbywganVtcCB0byAjMi4KICAgICAvLyA3LiBObyBuZWVkIHRvIHByb3BhZ2F0 ZSB0byBwYXJlbnQgYmVjYXVzZSBpdHMgbWFyZ2luIGlzIG5vdCBjb21wdXRlZCB5ZXQgKGVzdGlt YXRlZCBhdCBtb3N0KS4KQEAgLTQ5MywxMCArNDgzLDYgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxp bmcKICAgICAgICAgaWYgKG1hcmdpbnNDb2xsYXBzZVRocm91Z2gpCiAgICAgICAgICAgICBjb2xs YXBzZWRWZXJ0aWNhbE1hcmdpbkJlZm9yZSA9IGNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luQWZ0ZXI7 CiAKLSAgICAgICAgLy8gVXBkYXRlIGNvbGxhcHNlZCB2ZXJ0aWNhbCBtYXJnaW4gdmFsdWVzLgot ICAgICAgICBwcmV2aW91c1NpYmxpbmdWZXJ0aWNhbE1hcmdpbi5zZXRDb2xsYXBzZWRWYWx1ZXMo eyBjb2xsYXBzZWRWZXJ0aWNhbE1hcmdpbkJlZm9yZSwgY29sbGFwc2VkVmVydGljYWxNYXJnaW5B ZnRlciB9KTsKLSAgICAgICAgcHJldmlvdXNTaWJsaW5nRGlzcGxheUJveC5zZXRWZXJ0aWNhbE1h cmdpbihwcmV2aW91c1NpYmxpbmdWZXJ0aWNhbE1hcmdpbik7Ci0KICAgICAgICAgLy8gVXBkYXRl IHBvc2l0aXZlL25lZ2F0aXZlIGNhY2hlLgogICAgICAgICBhdXRvIHByZXZpb3VzU2libGluZ1Bv c2l0aXZlTmVnYXRpdmVNYXJnaW4gPSBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2ZUFuZE5l Z2F0aXZlVmVydGljYWxNYXJnaW4ocHJldmlvdXNTaWJsaW5nKTsKICAgICAgICAgYXV0byBwb3Np dGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlID0gYmxvY2tGb3JtYXR0aW5nU3RhdGUucG9zaXRpdmVB bmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKCpjdXJyZW50Qm94KS5iZWZvcmU7CkBAIC01NzIsNyAr NTU4LDcgQEAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2UKICAgICB9OwogCiAgICAgLy8gV2UgZG9u J3Qga25vdyB5ZXQgdGhlIG1hcmdpbiBiZWZvcmUgdmFsdWUgb2YgdGhlIG5leHQgc2libGluZy4g TGV0J3MganVzdCBwcmV0ZW5kIGl0IGRvZXMgbm90IGhhdmUgb25lIGFuZCAKLSAgICAvLyB1cGRh dGUgaXQgbGF0ZXIgd2hlbiB3ZSBjb21wdXRlIHRoZSBuZXh0IHNpYmxpbmcncyBtYXJnaW4gYmVm b3JlLiBTZWUgdXBkYXRlQ29sbGFwc2VkTWFyZ2luQWZ0ZXIuCisgICAgLy8gdXBkYXRlIGl0IGxh dGVyIHdoZW4gd2UgY29tcHV0ZSB0aGUgbmV4dCBzaWJsaW5nJ3MgbWFyZ2luIGJlZm9yZS4gU2Vl IHVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJsaW5nLgogICAgIFBvc2l0aXZlQW5kTmVn YXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIG5vbkNvbGxhcHNlZEFmdGVyOwogICAgIGlmIChu b25Db2xsYXBzZWRWYWx1ZXMuYWZ0ZXIgPiAwKQogICAgICAgICBub25Db2xsYXBzZWRBZnRlciA9 IHsgbm9uQ29sbGFwc2VkVmFsdWVzLmFmdGVyLCB7IH0sIGxheW91dEJveC5zdHlsZSgpLmhhc01h cmdpbkFmdGVyUXVpcmsoKSB9OwpAQCAtNTg0LDkgKzU3MCw2IEBAIFBvc2l0aXZlQW5kTmVnYXRp dmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNv bGxhcHNlCiAKIEVzdGltYXRlZE1hcmdpbkJlZm9yZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpN YXJnaW5Db2xsYXBzZTo6ZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyB1c2VkTm9uQ29sbGFwc2Vk TWFyZ2luKQogewotICAgIGlmIChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKLSAgICAgICAgcmV0 dXJuIHsgfTsKLQogICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogICAg IC8vIERvbid0IGVzdGltYXRlIHZlcnRpY2FsIG1hcmdpbnMgZm9yIG91dCBvZiBmbG93IGJveGVz LgogICAgIEFTU0VSVChsYXlvdXRCb3guaXNJbkZsb3coKSB8fCBsYXlvdXRCb3guaXNGbG9hdGlu Z1Bvc2l0aW9uZWQoKSk7CkBAIC02MDMsNyArNTg2LDYgQEAgRXN0aW1hdGVkTWFyZ2luQmVmb3Jl IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjplc3RpbWF0ZWRNYXJnaW5C ZWYKIAogTGF5b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6 bWFyZ2luQmVmb3JlSWdub3JpbmdDb2xsYXBzaW5nVGhyb3VnaChjb25zdCBCb3gmIGxheW91dEJv eCwgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgbm9uQ29sbGFwc2VkVmFs dWVzKQogewotICAgIEFTU0VSVCghbGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpOwogICAgIEFTU0VS VChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogICAgIHJldHVybiBtYXJnaW5WYWx1ZShw b3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGxheW91dEJveCwgbm9uQ29sbGFwc2VkVmFsdWVz KSkudmFsdWVPcihub25Db2xsYXBzZWRWYWx1ZXMuYmVmb3JlKTsKIH0KQEAgLTYyNSw5ICs2MDcs NiBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjp1cGRhdGVQ b3NpdGl2ZU5lZ2F0aXZlTWFyZ2luVmFsdWVzKAogCiBVc2VkVmVydGljYWxNYXJnaW46OkNvbGxh cHNlZFZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6Y29sbGFw c2VkVmVydGljYWxWYWx1ZXMoY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRWZXJ0aWNhbE1hcmdp bjo6Tm9uQ29sbGFwc2VkVmFsdWVzIG5vbkNvbGxhcHNlZFZhbHVlcykKIHsKLSAgICBpZiAobGF5 b3V0Qm94LmlzQW5vbnltb3VzKCkpCi0gICAgICAgIHJldHVybiB7IH07Ci0KICAgICBBU1NFUlQo bGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpKTsKICAgICAvLyAxLiBHZXQgbWluL21heCBtYXJn aW4gdG9wIHZhbHVlcyBmcm9tIHRoZSBmaXJzdCBpbi1mbG93IGNoaWxkIGlmIHdlIGFyZSBjb2xs YXBzaW5nIG1hcmdpbiB0b3Agd2l0aCBpdC4KICAgICAvLyAyLiBHZXQgbWluL21heCBtYXJnaW4g dG9wIHZhbHVlcyBmcm9tIHRoZSBwcmV2aW91cyBpbi1mbG93IHNpYmxpbmcsIGlmIHdlIGFyZSBj b2xsYXBzaW5nIG1hcmdpbiB0b3Agd2l0aCBpdC4K