185036 2018-04-26 11:31:01 -0700 [LFC] Implement BlockMarginCollapse functions. 2018-04-28 16:13:17 -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 sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1418164 0 zalan 2018-04-26 11:31:01 -0700 ssia. 1418166 1 338898 zalan 2018-04-26 11:33:38 -0700 Created attachment 338898 Patch 1418829 2 338898 commit-queue 2018-04-28 16:12:37 -0700 Comment on attachment 338898 Patch Clearing flags on attachment: 338898 Committed r231140: <https://trac.webkit.org/changeset/231140> 1418830 3 commit-queue 2018-04-28 16:12:38 -0700 All reviewed patches have been landed. Closing bug. 1418834 4 webkit-bug-importer 2018-04-28 16:13:17 -0700 <rdar://problem/39820227> 338898 2018-04-26 11:33:38 -0700 2018-04-28 16:12:37 -0700 Patch bug-185036-20180426113337.patch text/plain 12208 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY0NjI5MmZjNjU2YWIw MjQzMzUwMzMzNjIyNmMzMmE2ODA1OTllYi4uZTVkMmRmODhhZGM3ODM1NjViM2UwMjlkNjMxNjUz YjM0ZWJlNDVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA0LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IEJs b2NrTWFyZ2luQ29sbGFwc2UgZnVuY3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2lu Q29sbGFwc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjptYXJnaW5WYWx1ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6OkJsb2NrTWFyZ2lu Q29sbGFwc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdpbkNvbGxhcHNl OjptYXJnaW5Ub3AgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdp bkNvbGxhcHNlOjptYXJnaW5Cb3R0b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpCbG9ja01hcmdpbkNvbGxhcHNlOjppc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tNYXJnaW5Db2xsYXBzZTo6aXNN YXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoU2libGluZyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6OmlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBh cmVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFw c2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Om5vbkNvbGxhcHNlZE1hcmdpblRv cCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6 Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZE1hcmdpblRvcEZyb21GaXJzdENoaWxk IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tNYXJnaW5Db2xsYXBzZTo6 Y29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrTWFyZ2luQ29sbGFwc2U6Omhhc0Fkam9pbmluZ01hcmdpblRvcEFu ZEJvdHRvbSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01h cmdpbkNvbGxhcHNlLmg6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94Lmg6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJveDo6c3R5bGUgY29uc3QpOgorCiAyMDE4LTA0 LTI1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gQWRk IHN1cHBvcnQgZm9yIGlzPD4gYW5kIGRvd25jYXN0PD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3Bw CmluZGV4IGY5YWIwZmJjNjY1MTY2NjM1ZTdlNTkxNWI0MWQ4YjVjZDgyODVkY2YuLmJkNDA0NmNk Yzc3M2RiNGI3NWYxN2NlNmZjOWE1MmVkOGNhYWIzOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNl LmNwcApAQCAtMjUsMyArMjUsMjM0IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJCbG9ja01hcmdpbkNvbGxhcHNlLmgiCisKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKKworI2luY2x1ZGUgIkxheW91dEJveC5oIgorI2luY2x1ZGUgIkxheW91dENvbnRh aW5lci5oIgorI2luY2x1ZGUgIkxheW91dFVuaXQuaCIKKyNpbmNsdWRlICJSZW5kZXJTdHlsZS5o IgorI2luY2x1ZGUgPHd0Zi9Jc29NYWxsb2NJbmxpbmVzLmg+CisKK25hbWVzcGFjZSBXZWJDb3Jl IHsKK25hbWVzcGFjZSBMYXlvdXQgeworCitXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoQmxv Y2tNYXJnaW5Db2xsYXBzZSk7CisKK3N0YXRpYyBMYXlvdXRVbml0IG1hcmdpblZhbHVlKExheW91 dFVuaXQgY3VycmVudE1hcmdpblZhbHVlLCBMYXlvdXRVbml0IGNhbmRpZGF0ZU1hcmdpblZhbHVl KQoreworICAgIGlmICghY2FuZGlkYXRlTWFyZ2luVmFsdWUpCisgICAgICAgIHJldHVybiBjdXJy ZW50TWFyZ2luVmFsdWU7CisgICAgaWYgKCFjdXJyZW50TWFyZ2luVmFsdWUpCisgICAgICAgIHJl dHVybiBjYW5kaWRhdGVNYXJnaW5WYWx1ZTsKKyAgICAvLyBCb3RoIG1hcmdpbnMgYXJlIHBvc2l0 aXZlLgorICAgIGlmIChjYW5kaWRhdGVNYXJnaW5WYWx1ZSA+IDAgJiYgY3VycmVudE1hcmdpblZh bHVlID4gMCkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNhbmRpZGF0ZU1hcmdpblZhbHVlLCBj dXJyZW50TWFyZ2luVmFsdWUpOworICAgIC8vIEJvdGggbWFyZ2lucyBhcmUgbmVnYXRpdmUuCisg ICAgaWYgKGNhbmRpZGF0ZU1hcmdpblZhbHVlIDwgMCAmJiBjdXJyZW50TWFyZ2luVmFsdWUgPCAw KQorICAgICAgICByZXR1cm4gMCAtIHN0ZDo6bWF4KHN0ZDo6YWJzKGNhbmRpZGF0ZU1hcmdpblZh bHVlLnRvRmxvYXQoKSksIHN0ZDo6YWJzKGN1cnJlbnRNYXJnaW5WYWx1ZS50b0Zsb2F0KCkpKTsK KyAgICAvLyBPbmUgb2YgdGhlIG1hcmdpbnMgaXMgbmVnYXRpdmUuCisgICAgcmV0dXJuIGN1cnJl bnRNYXJnaW5WYWx1ZSArIGNhbmRpZGF0ZU1hcmdpblZhbHVlOworfQorCitCbG9ja01hcmdpbkNv bGxhcHNlOjpCbG9ja01hcmdpbkNvbGxhcHNlKCkKK3sKK30KKworTGF5b3V0VW5pdCBCbG9ja01h cmdpbkNvbGxhcHNlOjptYXJnaW5Ub3AoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0Cit7Cisg ICAgaWYgKGxheW91dEJveC5pc0Fub255bW91cygpKQorICAgICAgICByZXR1cm4gMDsKKyAgICAK KyAgICAvLyBUT0RPOiB0YWtlIF9oYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oKSBpbnRv IGFjY291bnQuCisgICAgaWYgKGlzTWFyZ2luVG9wQ29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRC b3gpKQorICAgICAgICByZXR1cm4gMDsKKyAgICAKKyAgICAvLyBGbG9hdHMgYW5kIG91dCBvZiBm bG93IHBvc2l0aW9uZWQgYm94ZXMgZG8gbm90IGNvbGxhcHNlIHRoZWlyIG1hcmdpbnMuCisgICAg aWYgKCFpc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nKGxheW91dEJveCkpCisgICAgICAg IHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Ub3AobGF5b3V0Qm94KTsKKyAgICAKKyAgICAvLyBU aGUgYm90dG9tIG1hcmdpbiBvZiBhbiBpbi1mbG93IGJsb2NrLWxldmVsIGVsZW1lbnQgYWx3YXlz IGNvbGxhcHNlcyB3aXRoIHRoZSB0b3AgbWFyZ2luIG9mIGl0cyBuZXh0IGluLWZsb3cgYmxvY2st bGV2ZWwgc2libGluZywKKyAgICAvLyB1bmxlc3MgdGhhdCBzaWJsaW5nIGhhcyBjbGVhcmFuY2Uu CisgICAgYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5b3V0Qm94LnByZXZpb3VzSW5G bG93U2libGluZygpOworICAgIGlmICghcHJldmlvdXNJbkZsb3dTaWJsaW5nKQorICAgICAgICBy ZXR1cm4gbm9uQ29sbGFwc2VkTWFyZ2luVG9wKGxheW91dEJveCk7CisKKyAgICBhdXRvIHByZXZp b3VzU2libGluZ01hcmdpbkJvdHRvbSA9IG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSgqcHJldmlv dXNJbkZsb3dTaWJsaW5nKTsKKyAgICBhdXRvIG1hcmdpblRvcCA9IG5vbkNvbGxhcHNlZE1hcmdp blRvcChsYXlvdXRCb3gpOworICAgIHJldHVybiBtYXJnaW5WYWx1ZShtYXJnaW5Ub3AsIHByZXZp b3VzU2libGluZ01hcmdpbkJvdHRvbSk7Cit9CisKK0xheW91dFVuaXQgQmxvY2tNYXJnaW5Db2xs YXBzZTo6bWFyZ2luQm90dG9tKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIGlm IChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICAvLyBU T0RPOiB0YWtlIF9oYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oKSBpbnRvIGFjY291bnQu CisgICAgaWYgKGlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFBhcmVudChsYXlvdXRCb3gpKQor ICAgICAgICByZXR1cm4gMDsKKworICAgIC8vIEZsb2F0cyBhbmQgb3V0IG9mIGZsb3cgcG9zaXRp b25lZCBib3hlcyBkbyBub3QgY29sbGFwc2UgdGhlaXIgbWFyZ2lucy4KKyAgICBpZiAoIWlzTWFy Z2luQm90dG9tQ29sbGFwc2VkV2l0aFNpYmxpbmcobGF5b3V0Qm94KSkKKyAgICAgICAgcmV0dXJu IG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbShsYXlvdXRCb3gpOworICAgIAorICAgIC8vIFRoZSBi b3R0b20gbWFyZ2luIG9mIGFuIGluLWZsb3cgYmxvY2stbGV2ZWwgZWxlbWVudCBhbHdheXMgY29s bGFwc2VzIHdpdGggdGhlIHRvcCBtYXJnaW4gb2YgaXRzIG5leHQgaW4tZmxvdyBibG9jay1sZXZl bCBzaWJsaW5nLAorICAgIC8vIHVubGVzcyB0aGF0IHNpYmxpbmcgaGFzIGNsZWFyYW5jZS4KKyAg ICBpZiAobGF5b3V0Qm94Lm5leHRJbkZsb3dTaWJsaW5nKCkpCisgICAgICAgIHJldHVybiAwOwor ICAgIHJldHVybiBub25Db2xsYXBzZWRNYXJnaW5Cb3R0b20obGF5b3V0Qm94KTsKK30KKworYm9v bCBCbG9ja01hcmdpbkNvbGxhcHNlOjppc01hcmdpblRvcENvbGxhcHNlZFdpdGhTaWJsaW5nKGNv bnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGlu Z1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFsYXlvdXRC b3guaXNQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzSW5GbG93UG9zaXRpb25lZCgpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIE91dCBvZiBmbG93IHBvc2l0aW9uZWQuCisgICAg QVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgcmV0dXJuIGxh eW91dEJveC5zdHlsZSgpLnRvcCgpLmlzQXV0bygpOworfQorCitib29sIEJsb2NrTWFyZ2luQ29s bGFwc2U6OmlzTWFyZ2luQm90dG9tQ29sbGFwc2VkV2l0aFNpYmxpbmcoY29uc3QgQm94JiBsYXlv dXRCb3gpIGNvbnN0Cit7CisgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWxheW91dEJveC5pc1Bvc2l0aW9u ZWQoKSB8fCBsYXlvdXRCb3guaXNJbkZsb3dQb3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybiB0 cnVlOworCisgICAgLy8gT3V0IG9mIGZsb3cgcG9zaXRpb25lZC4KKyAgICBBU1NFUlQobGF5b3V0 Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKKyAgICByZXR1cm4gbGF5b3V0Qm94LnN0eWxl KCkuYm90dG9tKCkuaXNBdXRvKCk7Cit9CisKK2Jvb2wgQmxvY2tNYXJnaW5Db2xsYXBzZTo6aXNN YXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAor eworICAgIC8vIFRoZSBmaXJzdCBpbmZsb3cgY2hpbGQgY291bGQgcHJvcGFnYXRlIGl0cyB0b3Ag bWFyZ2luIHRvIHBhcmVudC4KKyAgICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvQ1NTMjEvYm94 Lmh0bWwjY29sbGFwc2luZy1tYXJnaW5zCisgICAgaWYgKGxheW91dEJveC5pc0Fub255bW91cygp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdP ck91dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8g V2UgbmV2ZXIgbWFyZ2luIGNvbGxhcHNlIHRoZSBpbml0aWFsIGNvbnRhaW5pbmcgYmxvY2suCisg ICAgQVNTRVJUKGxheW91dEJveC5wYXJlbnQoKSk7CisgICAgYXV0byYgcGFyZW50ID0gKmxheW91 dEJveC5wYXJlbnQoKTsKKyAgICAvLyBJcyB0aGlzIGJveCB0aGUgZmlyc3QgaW5sZmxvdyBjaGls ZD8KKyAgICBpZiAocGFyZW50LmZpcnN0SW5GbG93Q2hpbGQoKSAhPSAmbGF5b3V0Qm94KQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocGFyZW50LmVzdGFibGlzaGVzQmxvY2tGb3Jt YXR0aW5nQ29udGV4dCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBNYXJnaW5z IG9mIHRoZSByb290IGVsZW1lbnQncyBib3ggZG8gbm90IGNvbGxhcHNlLgorICAgIGlmIChwYXJl bnQuaXNJbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIGlmICghcGFyZW50LnN0eWxlKCkuYm9yZGVyVG9wKCkubm9uWmVybygpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIXBhcmVudC5zdHlsZSgpLnBhZGRpbmdUb3AoKS5pc1pl cm8oKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jv b2wgQmxvY2tNYXJnaW5Db2xsYXBzZTo6aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50 KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIC8vIGxhc3QgaW5mbG93IGJveCB0 byBwYXJlbnQuCisgICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL0NTUzIxL2JveC5odG1sI2Nv bGxhcHNpbmctbWFyZ2lucworICAgIGlmIChsYXlvdXRCb3guaXNBbm9ueW1vdXMoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nT3JPdXRPZkZs b3dQb3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIFdlIG5ldmVy IG1hcmdpbiBjb2xsYXBzZSB0aGUgaW5pdGlhbCBjb250YWluaW5nIGJsb2NrLgorICAgIEFTU0VS VChsYXlvdXRCb3gucGFyZW50KCkpOworICAgIGF1dG8mIHBhcmVudCA9ICpsYXlvdXRCb3gucGFy ZW50KCk7CisgICAgLy8gSXMgdGhpcyB0aGUgbGFzdCBpbmxmbG93IGNoaWxkPworICAgIGlmIChw YXJlbnQubGFzdEluRmxvd0NoaWxkKCkgIT0gJmxheW91dEJveCkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworCisgICAgaWYgKHBhcmVudC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQo KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gTWFyZ2lucyBvZiB0aGUgcm9vdCBl bGVtZW50J3MgYm94IGRvIG5vdCBjb2xsYXBzZS4KKyAgICBpZiAocGFyZW50LmlzSW5pdGlhbENv bnRhaW5pbmdCbG9jaygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIXBhcmVu dC5zdHlsZSgpLmJvcmRlclRvcCgpLm5vblplcm8oKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgaWYgKCFwYXJlbnQuc3R5bGUoKS5wYWRkaW5nVG9wKCkuaXNaZXJvKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIGlmICghcGFyZW50LnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRv KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOworfQorCitMYXlv dXRVbml0IEJsb2NrTWFyZ2luQ29sbGFwc2U6Om5vbkNvbGxhcHNlZE1hcmdpblRvcChjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QKK3sKKyAgICAvLyBOb24gY29sbGFwc2VkIG1hcmdpbiB0b3Ag aW5jbHVkZXMgY29sbGFwc2VkIG1hcmdpbiBmcm9tIGluZmxvdyBmaXJzdCBjaGlsZC4KKyAgICBy ZXR1cm4gbWFyZ2luVmFsdWUobGF5b3V0Qm94LnN0eWxlKCkubWFyZ2luVG9wKCkudmFsdWUoKSwg Y29sbGFwc2VkTWFyZ2luVG9wRnJvbUZpcnN0Q2hpbGQobGF5b3V0Qm94KSk7Cit9CisKK0xheW91 dFVuaXQgQmxvY2tNYXJnaW5Db2xsYXBzZTo6bm9uQ29sbGFwc2VkTWFyZ2luQm90dG9tKGNvbnN0 IEJveCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIC8vIE5vbiBjb2xsYXBzZWQgbWFyZ2luIGJv dHRvbSBpbmNsdWRlcyBjb2xsYXBzZWQgbWFyZ2luIGZyb20gaW5mbG93IGxhc3QgY2hpbGQuCisg ICAgcmV0dXJuIG1hcmdpblZhbHVlKGxheW91dEJveC5zdHlsZSgpLm1hcmdpbkJvdHRvbSgpLnZh bHVlKCksIGNvbGxhcHNlZE1hcmdpbkJvdHRvbUZyb21MYXN0Q2hpbGQobGF5b3V0Qm94KSk7Cit9 CisKK0xheW91dFVuaXQgQmxvY2tNYXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luVG9wRnJv bUZpcnN0Q2hpbGQoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0Cit7CisgICAgLy8gQ2hlY2sg aWYgdGhlIGZpcnN0IGNoaWxkIGNvbGxhcHNlcyBpdHMgbWFyZ2luIHRvcC4KKyAgICBpZiAoIWlz PENvbnRhaW5lcj4obGF5b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gp Lmhhc0luRmxvd0NoaWxkKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgYXV0byYgZmlyc3RJ bkZsb3dDaGlsZCA9ICpkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuZmlyc3RJbkZsb3dD aGlsZCgpOworICAgIGlmICghaXNNYXJnaW5Ub3BDb2xsYXBzZWRXaXRoUGFyZW50KGZpcnN0SW5G bG93Q2hpbGQpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIC8vIENvbGxlY3QgY29sbGFwc2Vk IG1hcmdpbiB0b3AgcmVjdXJzaXZlbHkuCisgICAgcmV0dXJuIG1hcmdpblZhbHVlKGZpcnN0SW5G bG93Q2hpbGQuc3R5bGUoKS5tYXJnaW5Ub3AoKS52YWx1ZSgpLCBjb2xsYXBzZWRNYXJnaW5Ub3BG cm9tRmlyc3RDaGlsZChmaXJzdEluRmxvd0NoaWxkKSk7Cit9CisKK0xheW91dFVuaXQgQmxvY2tN YXJnaW5Db2xsYXBzZTo6Y29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RDaGlsZChjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QKK3sKKyAgICAvLyBDaGVjayBpZiB0aGUgbGFzdCBjaGlsZCBw cm9wYWdhdGVzIGl0cyBtYXJnaW4gYm90dG9tLgorICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlv dXRCb3gpIHx8ICFkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93Q2hpbGQo KSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBhdXRvJiBsYXN0SW5GbG93Q2hpbGQgPSAqZG93 bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmxhc3RJbkZsb3dDaGlsZCgpOworICAgIGlmICgh aXNNYXJnaW5Cb3R0b21Db2xsYXBzZWRXaXRoUGFyZW50KGxhc3RJbkZsb3dDaGlsZCkpCisgICAg ICAgIHJldHVybiAwOworCisgICAgLy8gQ29sbGVjdCBjb2xsYXBzZWQgbWFyZ2luIGJvdHRvbSBy ZWN1cnNpdmVseS4KKyAgICByZXR1cm4gbWFyZ2luVmFsdWUobGFzdEluRmxvd0NoaWxkLnN0eWxl KCkubWFyZ2luQm90dG9tKCkudmFsdWUoKSwgY29sbGFwc2VkTWFyZ2luQm90dG9tRnJvbUxhc3RD aGlsZChsYXN0SW5GbG93Q2hpbGQpKTsKK30KKworYm9vbCBCbG9ja01hcmdpbkNvbGxhcHNlOjpo YXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oY29uc3QgQm94JikgY29uc3QKK3sKKyAgICAv LyBUd28gbWFyZ2lucyBhcmUgYWRqb2luaW5nIGlmIGFuZCBvbmx5IGlmOgorICAgIC8vIDEuIGJv dGggYmVsb25nIHRvIGluLWZsb3cgYmxvY2stbGV2ZWwgYm94ZXMgdGhhdCBwYXJ0aWNpcGF0ZSBp biB0aGUgc2FtZSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQKKyAgICAvLyAyLiBubyBsaW5lIGJv eGVzLCBubyBjbGVhcmFuY2UsIG5vIHBhZGRpbmcgYW5kIG5vIGJvcmRlciBzZXBhcmF0ZSB0aGVt IChOb3RlIHRoYXQgY2VydGFpbiB6ZXJvLWhlaWdodCBsaW5lIGJveGVzIChzZWUgOS40LjIpIGFy ZSBpZ25vcmVkIGZvciB0aGlzIHB1cnBvc2UuKQorICAgIC8vIDMuIGJvdGggYmVsb25nIHRvIHZl cnRpY2FsbHktYWRqYWNlbnQgYm94IGVkZ2VzLCBpLmUuIGZvcm0gb25lIG9mIHRoZSBmb2xsb3dp bmcgcGFpcnM6CisgICAgLy8gICAgICAgIHRvcCBtYXJnaW4gb2YgYSBib3ggYW5kIHRvcCBtYXJn aW4gb2YgaXRzIGZpcnN0IGluLWZsb3cgY2hpbGQKKyAgICAvLyAgICAgICAgYm90dG9tIG1hcmdp biBvZiBib3ggYW5kIHRvcCBtYXJnaW4gb2YgaXRzIG5leHQgaW4tZmxvdyBmb2xsb3dpbmcgc2li bGluZworICAgIC8vICAgICAgICBib3R0b20gbWFyZ2luIG9mIGEgbGFzdCBpbi1mbG93IGNoaWxk IGFuZCBib3R0b20gbWFyZ2luIG9mIGl0cyBwYXJlbnQgaWYgdGhlIHBhcmVudCBoYXMgJ2F1dG8n IGNvbXB1dGVkIGhlaWdodAorICAgIC8vICAgICAgICB0b3AgYW5kIGJvdHRvbSBtYXJnaW5zIG9m IGEgYm94IHRoYXQgZG9lcyBub3QgZXN0YWJsaXNoIGEgbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29u dGV4dCBhbmQgdGhhdCBoYXMgemVybyBjb21wdXRlZCAnbWluLWhlaWdodCcsCisgICAgLy8gICAg ICAgIHplcm8gb3IgJ2F1dG8nIGNvbXB1dGVkICdoZWlnaHQnLCBhbmQgbm8gaW4tZmxvdyBjaGls ZHJlbgorICAgIC8vIEEgY29sbGFwc2VkIG1hcmdpbiBpcyBjb25zaWRlcmVkIGFkam9pbmluZyB0 byBhbm90aGVyIG1hcmdpbiBpZiBhbnkgb2YgaXRzIGNvbXBvbmVudCBtYXJnaW5zIGlzIGFkam9p bmluZyB0byB0aGF0IG1hcmdpbi4KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK30KK30KKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrTWFyZ2luQ29sbGFwc2UuaAppbmRleCBiMjBmYWI4MTk4ZTBjYzA3MWMzOTJlNTI3Nzg5 MjY3MmE5OWE1NDdkLi44ZGQyMjljOTFjOWUwODU3ZjY4M2UxYTIxYTA0MDdlNDg0YmExZTI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFy Z2luQ29sbGFwc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrTWFyZ2luQ29sbGFwc2UuaApAQCAtNTUsNyArNTUsNiBAQCBwcml2YXRlOgogICAgIExh eW91dFVuaXQgbm9uQ29sbGFwc2VkTWFyZ2luQm90dG9tKGNvbnN0IEJveCYpIGNvbnN0OwogICAg IExheW91dFVuaXQgY29sbGFwc2VkTWFyZ2luVG9wRnJvbUZpcnN0Q2hpbGQoY29uc3QgQm94Jikg Y29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb2xsYXBzZWRNYXJnaW5Cb3R0b21Gcm9tTGFzdENoaWxk KGNvbnN0IEJveCYpIGNvbnN0OwotICAgIExheW91dFVuaXQgbWFyZ2luVmFsdWUoTGF5b3V0VW5p dCBjdXJyZW50TWFyZ2luVmFsdWUsIExheW91dFVuaXQgY2FuZGlkYXRlTWFyZ2luVmFsdWUpIGNv bnN0OwogCiAgICAgYm9vbCBoYXNBZGpvaW5pbmdNYXJnaW5Ub3BBbmRCb3R0b20oY29uc3QgQm94 JikgY29uc3Q7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRC b3guaAppbmRleCBkMzEyNGE1NzQ3ZTk1ZGIwMDM5MGVkNjNhZGZkMDYxNTFkOWUzY2I3Li5kOGZk Yjc2ZjIxNmEwYWJiMmQ0MmU0YjRjODlhZjZkNWJhOWIxOTAyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaApAQCAtODcsNiArODcsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBpc0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZVR5cGVGbGFncyAm IElubGluZUJveEZsYWc7IH0KICAgICBib29sIGlzSW5saW5lQ29udGFpbmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9iYXNlVHlwZUZsYWdzICYgSW5saW5lQ29udGFpbmVyRmxhZzsgfQogCisgICAgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZTsgfQogICAgIGF1 dG8mIHdlYWtQdHJGYWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV93ZWFrRmFjdG9yeTsgfQogCiBw cm90ZWN0ZWQ6Cg==