185424 2018-05-08 08:56:30 -0700 [LFC] Start using BlockMarginCollapse 2018-05-08 09:33:27 -0700 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 1421728 0 zalan 2018-05-08 08:56:30 -0700 in BlockFormattingContext 1421729 1 339821 zalan 2018-05-08 08:58:18 -0700 Created attachment 339821 Patch 1421747 2 339821 commit-queue 2018-05-08 09:31:10 -0700 Comment on attachment 339821 Patch Clearing flags on attachment: 339821 Committed r231487: <https://trac.webkit.org/changeset/231487> 1421748 3 commit-queue 2018-05-08 09:31:12 -0700 All reviewed patches have been landed. Closing bug. 1421750 4 webkit-bug-importer 2018-05-08 09:33:27 -0700 <rdar://problem/40060416> 339821 2018-05-08 08:58:18 -0700 2018-05-08 09:31:10 -0700 Patch bug-185424-20180508085817.patch text/plain 13610 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTk3OGY5NjhhMDlhNmU5 NWYxMmJmYzgxMWM0NzExZjdkNTk1MWQ1Ny4uZGIyZWNiZjExMjY2OWIzYjQzM2RjYzU4YWRkNzIy OWNhYjhjYjUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE4LTA1LTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gU3RhcnQgdXNpbmcg QmxvY2tNYXJnaW5Db2xsYXBzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg1NDI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQmxvY2tNYXJnaW5Db2xsYXBzZSBjb3VsZCBiZSBhbGwgc3RhdGljLgorCisg ICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bWFy Z2luVG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6bWFyZ2luQm90dG9tIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 Ojppc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoU2libGluZyk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OmlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVudCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OmNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RD aGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5vbkNvbGxhcHNlZE1hcmdpblRvcCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Om1hcmdpblRvcCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJv dHRvbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6OkJs b2NrTWFyZ2luQ29sbGFwc2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja01hcmdpbkNvbGxhcHNlOjptYXJnaW5Ub3AgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdpbkNvbGxhcHNlOjptYXJnaW5Cb3R0b20gY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdpbkNvbGxhcHNl Ojppc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21D b2xsYXBzZWRXaXRoU2libGluZyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVu dCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2lu Q29sbGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudCBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Om5vbkNv bGxhcHNlZE1hcmdpblRvcCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6 OmNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2lu Qm90dG9tRnJvbUxhc3RDaGlsZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Omhhc0Fkam9pbmluZ01hcmdpblRvcEFuZEJvdHRv bSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmg6CisKIDIwMTgtMDUtMDcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBBZGQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91 dE9mRmxvd0Rlc2NlbmRhbnRzIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcAppbmRleCBkOTMzNjBkMTgwYzRjZWIxOTE0YmZiZDlkYTllYmI2ODI3YTg1NDE0Li40 N2JmNTkwOTk2ZTg5OTcyMDRlM2IzZTBkMGRlMWI1Mzk3YzMwY2U3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBFTkFCTEUoTEFZT1VUX0ZP Uk1BVFRJTkdfQ09OVEVYVCkKIAogI2luY2x1ZGUgIkJsb2NrRm9ybWF0dGluZ1N0YXRlLmgiCisj aW5jbHVkZSAiQmxvY2tNYXJnaW5Db2xsYXBzZS5oIgogI2luY2x1ZGUgIkRpc3BsYXlCb3guaCIK ICNpbmNsdWRlICJGbG9hdGluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJGbG9hdGluZ1N0YXRlLmgi CkBAIC0xNTAsMTQgKzE1MSwxNCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVJbkZsb3dIZWlnaHQoY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29ucwogewogfQogCi1M YXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Om1hcmdpblRvcChjb25zdCBCb3gmKSBj b25zdAorTGF5b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjptYXJnaW5Ub3AoY29uc3Qg Qm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIEJsb2Nr TWFyZ2luQ29sbGFwc2U6Om1hcmdpblRvcChsYXlvdXRCb3gpOwogfQogCi1MYXlvdXRVbml0IEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Om1hcmdpbkJvdHRvbShjb25zdCBCb3gmKSBjb25zdAorTGF5 b3V0VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjptYXJnaW5Cb3R0b20oY29uc3QgQm94JiBs YXlvdXRCb3gpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIEJsb2NrTWFyZ2lu Q29sbGFwc2U6Om1hcmdpbkJvdHRvbShsYXlvdXRCb3gpOwogfQogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNv bGxhcHNlLmNwcAppbmRleCBiZDQwNDZjZGM3NzNkYjRiNzVmMTdjZTZmYzlhNTJlZDhjYWFiMzlh Li44ZWNmY2JlM2Y5MWIxYzdhNzk0NWE3OThiZGJiMzU4YjAyNmFjMjk4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJn aW5Db2xsYXBzZS5jcHAKQEAgLTU1LDU1ICs1NSw3IEBAIHN0YXRpYyBMYXlvdXRVbml0IG1hcmdp blZhbHVlKExheW91dFVuaXQgY3VycmVudE1hcmdpblZhbHVlLCBMYXlvdXRVbml0IGNhbmRpZGF0 CiAgICAgcmV0dXJuIGN1cnJlbnRNYXJnaW5WYWx1ZSArIGNhbmRpZGF0ZU1hcmdpblZhbHVlOwog fQogCi1CbG9ja01hcmdpbkNvbGxhcHNlOjpCbG9ja01hcmdpbkNvbGxhcHNlKCkKLXsKLX0KLQot TGF5b3V0VW5pdCBCbG9ja01hcmdpbkNvbGxhcHNlOjptYXJnaW5Ub3AoY29uc3QgQm94JiBsYXlv dXRCb3gpIGNvbnN0Ci17Ci0gICAgaWYgKGxheW91dEJveC5pc0Fub255bW91cygpKQotICAgICAg ICByZXR1cm4gMDsKLSAgICAKLSAgICAvLyBUT0RPOiB0YWtlIF9oYXNBZGpvaW5pbmdNYXJnaW5U b3BBbmRCb3R0b20oKSBpbnRvIGFjY291bnQuCi0gICAgaWYgKGlzTWFyZ2luVG9wQ29sbGFwc2Vk V2l0aFBhcmVudChsYXlvdXRCb3gpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAgICAvLyBG bG9hdHMgYW5kIG91dCBvZiBmbG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNlIHRo ZWlyIG1hcmdpbnMuCi0gICAgaWYgKCFpc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nKGxh eW91dEJveCkpCi0gICAgICAgIHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Ub3AobGF5b3V0Qm94 KTsKLSAgICAKLSAgICAvLyBUaGUgYm90dG9tIG1hcmdpbiBvZiBhbiBpbi1mbG93IGJsb2NrLWxl dmVsIGVsZW1lbnQgYWx3YXlzIGNvbGxhcHNlcyB3aXRoIHRoZSB0b3AgbWFyZ2luIG9mIGl0cyBu ZXh0IGluLWZsb3cgYmxvY2stbGV2ZWwgc2libGluZywKLSAgICAvLyB1bmxlc3MgdGhhdCBzaWJs aW5nIGhhcyBjbGVhcmFuY2UuCi0gICAgYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5 b3V0Qm94LnByZXZpb3VzSW5GbG93U2libGluZygpOwotICAgIGlmICghcHJldmlvdXNJbkZsb3dT aWJsaW5nKQotICAgICAgICByZXR1cm4gbm9uQ29sbGFwc2VkTWFyZ2luVG9wKGxheW91dEJveCk7 Ci0KLSAgICBhdXRvIHByZXZpb3VzU2libGluZ01hcmdpbkJvdHRvbSA9IG5vbkNvbGxhcHNlZE1h cmdpbkJvdHRvbSgqcHJldmlvdXNJbkZsb3dTaWJsaW5nKTsKLSAgICBhdXRvIG1hcmdpblRvcCA9 IG5vbkNvbGxhcHNlZE1hcmdpblRvcChsYXlvdXRCb3gpOwotICAgIHJldHVybiBtYXJnaW5WYWx1 ZShtYXJnaW5Ub3AsIHByZXZpb3VzU2libGluZ01hcmdpbkJvdHRvbSk7Ci19Ci0KLUxheW91dFVu aXQgQmxvY2tNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQm90dG9tKGNvbnN0IEJveCYgbGF5b3V0Qm94 KSBjb25zdAotewotICAgIGlmIChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKLSAgICAgICAgcmV0 dXJuIDA7Ci0KLSAgICAvLyBUT0RPOiB0YWtlIF9oYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0 b20oKSBpbnRvIGFjY291bnQuCi0gICAgaWYgKGlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBh cmVudChsYXlvdXRCb3gpKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIC8vIEZsb2F0cyBhbmQg b3V0IG9mIGZsb3cgcG9zaXRpb25lZCBib3hlcyBkbyBub3QgY29sbGFwc2UgdGhlaXIgbWFyZ2lu cy4KLSAgICBpZiAoIWlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFNpYmxpbmcobGF5b3V0Qm94 KSkKLSAgICAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbShsYXlvdXRCb3gpOwot ICAgIAotICAgIC8vIFRoZSBib3R0b20gbWFyZ2luIG9mIGFuIGluLWZsb3cgYmxvY2stbGV2ZWwg ZWxlbWVudCBhbHdheXMgY29sbGFwc2VzIHdpdGggdGhlIHRvcCBtYXJnaW4gb2YgaXRzIG5leHQg aW4tZmxvdyBibG9jay1sZXZlbCBzaWJsaW5nLAotICAgIC8vIHVubGVzcyB0aGF0IHNpYmxpbmcg aGFzIGNsZWFyYW5jZS4KLSAgICBpZiAobGF5b3V0Qm94Lm5leHRJbkZsb3dTaWJsaW5nKCkpCi0g ICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Cb3R0b20obGF5 b3V0Qm94KTsKLX0KLQotYm9vbCBCbG9ja01hcmdpbkNvbGxhcHNlOjppc01hcmdpblRvcENvbGxh cHNlZFdpdGhTaWJsaW5nKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAorc3RhdGljIGJvb2wg aXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoU2libGluZyhjb25zdCBCb3gmIGxheW91dEJveCkKIHsK ICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKQEAgLTExNiw3ICs2OCw3IEBAIGJvb2wgQmxvY2tNYXJnaW5Db2xsYXBzZTo6aXNN YXJnaW5Ub3BDb2xsYXBzZWRXaXRoU2libGluZyhjb25zdCBCb3gmIGxheW91dEJveCkKICAgICBy ZXR1cm4gbGF5b3V0Qm94LnN0eWxlKCkudG9wKCkuaXNBdXRvKCk7CiB9CiAKLWJvb2wgQmxvY2tN YXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoU2libGluZyhjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QKK3N0YXRpYyBib29sIGlzTWFyZ2luQm90dG9tQ29sbGFwc2Vk V2l0aFNpYmxpbmcoY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgaWYgKGxheW91dEJveC5p c0Zsb2F0aW5nUG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMjksNyAr ODEsNyBAQCBib29sIEJsb2NrTWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2Vk V2l0aFNpYmxpbmcoY29uc3QgQm94JiBsYXlvdXRCbwogICAgIHJldHVybiBsYXlvdXRCb3guc3R5 bGUoKS5ib3R0b20oKS5pc0F1dG8oKTsKIH0KIAotYm9vbCBCbG9ja01hcmdpbkNvbGxhcHNlOjpp c01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJlbnQoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0 CitzdGF0aWMgYm9vbCBpc01hcmdpblRvcENvbGxhcHNlZFdpdGhQYXJlbnQoY29uc3QgQm94JiBs YXlvdXRCb3gpCiB7CiAgICAgLy8gVGhlIGZpcnN0IGluZmxvdyBjaGlsZCBjb3VsZCBwcm9wYWdh dGUgaXRzIHRvcCBtYXJnaW4gdG8gcGFyZW50LgogICAgIC8vIGh0dHBzOi8vd3d3LnczLm9yZy9U Ui9DU1MyMS9ib3guaHRtbCNjb2xsYXBzaW5nLW1hcmdpbnMKQEAgLTE2Miw3ICsxMTQsNyBAQCBi b29sIEJsb2NrTWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVudChj b25zdCBCb3gmIGxheW91dEJveCkgYwogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEJsb2Nr TWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudChjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QKK3N0YXRpYyBib29sIGlzTWFyZ2luQm90dG9tQ29sbGFwc2Vk V2l0aFBhcmVudChjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICAvLyBsYXN0IGluZmxvdyBi b3ggdG8gcGFyZW50LgogICAgIC8vIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9DU1MyMS9ib3guaHRt bCNjb2xsYXBzaW5nLW1hcmdpbnMKQEAgLTE5OCwxOSArMTUwLDcgQEAgYm9vbCBCbG9ja01hcmdp bkNvbGxhcHNlOjppc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdpdGhQYXJlbnQoY29uc3QgQm94JiBs YXlvdXRCb3gKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotTGF5b3V0VW5pdCBCbG9ja01hcmdpbkNv bGxhcHNlOjpub25Db2xsYXBzZWRNYXJnaW5Ub3AoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0 Ci17Ci0gICAgLy8gTm9uIGNvbGxhcHNlZCBtYXJnaW4gdG9wIGluY2x1ZGVzIGNvbGxhcHNlZCBt YXJnaW4gZnJvbSBpbmZsb3cgZmlyc3QgY2hpbGQuCi0gICAgcmV0dXJuIG1hcmdpblZhbHVlKGxh eW91dEJveC5zdHlsZSgpLm1hcmdpblRvcCgpLnZhbHVlKCksIGNvbGxhcHNlZE1hcmdpblRvcEZy b21GaXJzdENoaWxkKGxheW91dEJveCkpOwotfQotCi1MYXlvdXRVbml0IEJsb2NrTWFyZ2luQ29s bGFwc2U6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbShjb25zdCBCb3gmIGxheW91dEJveCkgY29u c3QKLXsKLSAgICAvLyBOb24gY29sbGFwc2VkIG1hcmdpbiBib3R0b20gaW5jbHVkZXMgY29sbGFw c2VkIG1hcmdpbiBmcm9tIGluZmxvdyBsYXN0IGNoaWxkLgotICAgIHJldHVybiBtYXJnaW5WYWx1 ZShsYXlvdXRCb3guc3R5bGUoKS5tYXJnaW5Cb3R0b20oKS52YWx1ZSgpLCBjb2xsYXBzZWRNYXJn aW5Cb3R0b21Gcm9tTGFzdENoaWxkKGxheW91dEJveCkpOwotfQotCi1MYXlvdXRVbml0IEJsb2Nr TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkKGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdAorc3RhdGljIExheW91dFVuaXQgY29sbGFwc2VkTWFyZ2luVG9w RnJvbUZpcnN0Q2hpbGQoY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgLy8gQ2hlY2sgaWYg dGhlIGZpcnN0IGNoaWxkIGNvbGxhcHNlcyBpdHMgbWFyZ2luIHRvcC4KICAgICBpZiAoIWlzPENv bnRhaW5lcj4obGF5b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmhh c0luRmxvd0NoaWxkKCkpCkBAIC0yMjQsNyArMTY0LDcgQEAgTGF5b3V0VW5pdCBCbG9ja01hcmdp bkNvbGxhcHNlOjpjb2xsYXBzZWRNYXJnaW5Ub3BGcm9tRmlyc3RDaGlsZChjb25zdCBCb3gmIGxh eW8KICAgICByZXR1cm4gbWFyZ2luVmFsdWUoZmlyc3RJbkZsb3dDaGlsZC5zdHlsZSgpLm1hcmdp blRvcCgpLnZhbHVlKCksIGNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxkKGZpcnN0SW5G bG93Q2hpbGQpKTsKIH0KIAotTGF5b3V0VW5pdCBCbG9ja01hcmdpbkNvbGxhcHNlOjpjb2xsYXBz ZWRNYXJnaW5Cb3R0b21Gcm9tTGFzdENoaWxkKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAor c3RhdGljIExheW91dFVuaXQgY29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RDaGlsZChjb25z dCBCb3gmIGxheW91dEJveCkKIHsKICAgICAvLyBDaGVjayBpZiB0aGUgbGFzdCBjaGlsZCBwcm9w YWdhdGVzIGl0cyBtYXJnaW4gYm90dG9tLgogICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlvdXRC b3gpIHx8ICFkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93Q2hpbGQoKSkK QEAgLTIzOCw3ICsxNzgsMTkgQEAgTGF5b3V0VW5pdCBCbG9ja01hcmdpbkNvbGxhcHNlOjpjb2xs YXBzZWRNYXJnaW5Cb3R0b21Gcm9tTGFzdENoaWxkKGNvbnN0IEJveCYgbGEKICAgICByZXR1cm4g bWFyZ2luVmFsdWUobGFzdEluRmxvd0NoaWxkLnN0eWxlKCkubWFyZ2luQm90dG9tKCkudmFsdWUo KSwgY29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RDaGlsZChsYXN0SW5GbG93Q2hpbGQpKTsK IH0KIAotYm9vbCBCbG9ja01hcmdpbkNvbGxhcHNlOjpoYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRC b3R0b20oY29uc3QgQm94JikgY29uc3QKK3N0YXRpYyBMYXlvdXRVbml0IG5vbkNvbGxhcHNlZE1h cmdpblRvcChjb25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICAvLyBOb24gY29sbGFwc2VkIG1h cmdpbiB0b3AgaW5jbHVkZXMgY29sbGFwc2VkIG1hcmdpbiBmcm9tIGluZmxvdyBmaXJzdCBjaGls ZC4KKyAgICByZXR1cm4gbWFyZ2luVmFsdWUobGF5b3V0Qm94LnN0eWxlKCkubWFyZ2luVG9wKCku dmFsdWUoKSwgY29sbGFwc2VkTWFyZ2luVG9wRnJvbUZpcnN0Q2hpbGQobGF5b3V0Qm94KSk7Cit9 CisKK3N0YXRpYyBMYXlvdXRVbml0IG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbShjb25zdCBCb3gm IGxheW91dEJveCkKK3sKKyAgICAvLyBOb24gY29sbGFwc2VkIG1hcmdpbiBib3R0b20gaW5jbHVk ZXMgY29sbGFwc2VkIG1hcmdpbiBmcm9tIGluZmxvdyBsYXN0IGNoaWxkLgorICAgIHJldHVybiBt YXJnaW5WYWx1ZShsYXlvdXRCb3guc3R5bGUoKS5tYXJnaW5Cb3R0b20oKS52YWx1ZSgpLCBjb2xs YXBzZWRNYXJnaW5Cb3R0b21Gcm9tTGFzdENoaWxkKGxheW91dEJveCkpOworfQorCisvKnN0YXRp YyBib29sIGhhc0Fkam9pbmluZ01hcmdpblRvcEFuZEJvdHRvbShjb25zdCBCb3gmKQogewogICAg IC8vIFR3byBtYXJnaW5zIGFyZSBhZGpvaW5pbmcgaWYgYW5kIG9ubHkgaWY6CiAgICAgLy8gMS4g Ym90aCBiZWxvbmcgdG8gaW4tZmxvdyBibG9jay1sZXZlbCBib3hlcyB0aGF0IHBhcnRpY2lwYXRl IGluIHRoZSBzYW1lIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dApAQCAtMjUxLDYgKzIwMyw1MCBA QCBib29sIEJsb2NrTWFyZ2luQ29sbGFwc2U6Omhhc0Fkam9pbmluZ01hcmdpblRvcEFuZEJvdHRv bShjb25zdCBCb3gmKSBjb25zdAogICAgIC8vICAgICAgICB6ZXJvIG9yICdhdXRvJyBjb21wdXRl ZCAnaGVpZ2h0JywgYW5kIG5vIGluLWZsb3cgY2hpbGRyZW4KICAgICAvLyBBIGNvbGxhcHNlZCBt YXJnaW4gaXMgY29uc2lkZXJlZCBhZGpvaW5pbmcgdG8gYW5vdGhlciBtYXJnaW4gaWYgYW55IG9m IGl0cyBjb21wb25lbnQgbWFyZ2lucyBpcyBhZGpvaW5pbmcgdG8gdGhhdCBtYXJnaW4uCiAgICAg cmV0dXJuIGZhbHNlOworfSovCisKK0xheW91dFVuaXQgQmxvY2tNYXJnaW5Db2xsYXBzZTo6bWFy Z2luVG9wKGNvbnN0IEJveCYgbGF5b3V0Qm94KQoreworICAgIGlmIChsYXlvdXRCb3guaXNBbm9u eW1vdXMoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICAvLyBUT0RPOiB0YWtlIF9oYXNBZGpv aW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oKSBpbnRvIGFjY291bnQuCisgICAgaWYgKGlzTWFyZ2lu VG9wQ29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRCb3gpKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIC8vIEZsb2F0cyBhbmQgb3V0IG9mIGZsb3cgcG9zaXRpb25lZCBib3hlcyBkbyBub3QgY29s bGFwc2UgdGhlaXIgbWFyZ2lucy4KKyAgICBpZiAoIWlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFNp YmxpbmcobGF5b3V0Qm94KSkKKyAgICAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdpblRvcChs YXlvdXRCb3gpOworCisgICAgLy8gVGhlIGJvdHRvbSBtYXJnaW4gb2YgYW4gaW4tZmxvdyBibG9j ay1sZXZlbCBlbGVtZW50IGFsd2F5cyBjb2xsYXBzZXMgd2l0aCB0aGUgdG9wIG1hcmdpbiBvZiBp dHMgbmV4dCBpbi1mbG93IGJsb2NrLWxldmVsIHNpYmxpbmcsCisgICAgLy8gdW5sZXNzIHRoYXQg c2libGluZyBoYXMgY2xlYXJhbmNlLgorICAgIGF1dG8qIHByZXZpb3VzSW5GbG93U2libGluZyA9 IGxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmcoKTsKKyAgICBpZiAoIXByZXZpb3VzSW5G bG93U2libGluZykKKyAgICAgICAgcmV0dXJuIG5vbkNvbGxhcHNlZE1hcmdpblRvcChsYXlvdXRC b3gpOworCisgICAgYXV0byBwcmV2aW91c1NpYmxpbmdNYXJnaW5Cb3R0b20gPSBub25Db2xsYXBz ZWRNYXJnaW5Cb3R0b20oKnByZXZpb3VzSW5GbG93U2libGluZyk7CisgICAgYXV0byBtYXJnaW5U b3AgPSBub25Db2xsYXBzZWRNYXJnaW5Ub3AobGF5b3V0Qm94KTsKKyAgICByZXR1cm4gbWFyZ2lu VmFsdWUobWFyZ2luVG9wLCBwcmV2aW91c1NpYmxpbmdNYXJnaW5Cb3R0b20pOworfQorCitMYXlv dXRVbml0IEJsb2NrTWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJvdHRvbShjb25zdCBCb3gmIGxheW91 dEJveCkKK3sKKyAgICBpZiAobGF5b3V0Qm94LmlzQW5vbnltb3VzKCkpCisgICAgICAgIHJldHVy biAwOworCisgICAgLy8gVE9ETzogdGFrZSBfaGFzQWRqb2luaW5nTWFyZ2luVG9wQW5kQm90dG9t KCkgaW50byBhY2NvdW50LgorICAgIGlmIChpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdpdGhQYXJl bnQobGF5b3V0Qm94KSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICAvLyBGbG9hdHMgYW5kIG91 dCBvZiBmbG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNlIHRoZWlyIG1hcmdpbnMu CisgICAgaWYgKCFpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdpdGhTaWJsaW5nKGxheW91dEJveCkp CisgICAgICAgIHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Cb3R0b20obGF5b3V0Qm94KTsKKwor ICAgIC8vIFRoZSBib3R0b20gbWFyZ2luIG9mIGFuIGluLWZsb3cgYmxvY2stbGV2ZWwgZWxlbWVu dCBhbHdheXMgY29sbGFwc2VzIHdpdGggdGhlIHRvcCBtYXJnaW4gb2YgaXRzIG5leHQgaW4tZmxv dyBibG9jay1sZXZlbCBzaWJsaW5nLAorICAgIC8vIHVubGVzcyB0aGF0IHNpYmxpbmcgaGFzIGNs ZWFyYW5jZS4KKyAgICBpZiAobGF5b3V0Qm94Lm5leHRJbkZsb3dTaWJsaW5nKCkpCisgICAgICAg IHJldHVybiAwOworICAgIHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Cb3R0b20obGF5b3V0Qm94 KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuaAppbmRleCA4ZGQyMjljOTFjOWUwODU3ZjY4 M2UxYTIxYTA0MDdlNDg0YmExZTI4Li43MmZlNTdjNTM1NTFhMzdiZTUzOTVkYTY1YjFlMGNkMDZl M2FhYjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrTWFyZ2luQ29sbGFwc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuaApAQCAtNDAsMjMgKzQwLDggQEAgY2xhc3Mg Qm94OwogY2xhc3MgQmxvY2tNYXJnaW5Db2xsYXBzZSB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9D QVRFRChCbG9ja01hcmdpbkNvbGxhcHNlKTsKIHB1YmxpYzoKLSAgICBCbG9ja01hcmdpbkNvbGxh cHNlKCk7Ci0KLSAgICBMYXlvdXRVbml0IG1hcmdpblRvcChjb25zdCBCb3gmKSBjb25zdDsKLSAg ICBMYXlvdXRVbml0IG1hcmdpbkJvdHRvbShjb25zdCBCb3gmKSBjb25zdDsKLQotcHJpdmF0ZToK LSAgICBib29sIGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFNpYmxpbmcoY29uc3QgQm94JikgY29u c3Q7Ci0gICAgYm9vbCBpc01hcmdpbkJvdHRvbUNvbGxhcHNlZFdpdGhTaWJsaW5nKGNvbnN0IEJv eCYpIGNvbnN0OwotICAgIGJvb2wgaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGNvbnN0 IEJveCYpIGNvbnN0OwotICAgIGJvb2wgaXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50 KGNvbnN0IEJveCYpIGNvbnN0OwotCi0gICAgTGF5b3V0VW5pdCBub25Db2xsYXBzZWRNYXJnaW5U b3AoY29uc3QgQm94JikgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBub25Db2xsYXBzZWRNYXJnaW5C b3R0b20oY29uc3QgQm94JikgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb2xsYXBzZWRNYXJnaW5U b3BGcm9tRmlyc3RDaGlsZChjb25zdCBCb3gmKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNvbGxh cHNlZE1hcmdpbkJvdHRvbUZyb21MYXN0Q2hpbGQoY29uc3QgQm94JikgY29uc3Q7Ci0KLSAgICBi b29sIGhhc0Fkam9pbmluZ01hcmdpblRvcEFuZEJvdHRvbShjb25zdCBCb3gmKSBjb25zdDsKKyAg ICBzdGF0aWMgTGF5b3V0VW5pdCBtYXJnaW5Ub3AoY29uc3QgQm94Jik7CisgICAgc3RhdGljIExh eW91dFVuaXQgbWFyZ2luQm90dG9tKGNvbnN0IEJveCYpOwogfTsKIAogfQo=