229436 2021-08-23 20:21:27 -0700 [IFC][Integration] Non-empty inline boxes may affect overflow scroll 2021-08-25 10:47:26 -0700 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 1786660 0 zalan 2021-08-23 20:21:27 -0700 ssia 1786661 1 436261 zalan 2021-08-23 20:22:21 -0700 Created attachment 436261 Patch 1786753 2 436292 zalan 2021-08-24 09:13:58 -0700 Created attachment 436292 Patch 1787214 3 ews-feeder 2021-08-25 10:46:41 -0700 Committed r281564 (240929@main): <https://commits.webkit.org/240929@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436292. 1787216 4 webkit-bug-importer 2021-08-25 10:47:26 -0700 <rdar://problem/82347344> 436261 2021-08-23 20:22:21 -0700 2021-08-24 09:13:57 -0700 Patch bug-229436-20210823202220.patch text/plain 5037 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UxMzI4MWNhNjRlMGE4 YzlkNjk1MTM1YzgxMzE3MTk5MDdmNTkxNC4uODUyZDQzNmNiNmMwMjNkYmY2NWZlODk3MDk0YTRk Y2MxYThjYzY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA4LTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g Tm9uLWVtcHR5IGlubGluZSBib3hlcyBtYXkgYWZmZWN0IG92ZXJmbG93IHNjcm9sbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0 ZURpc3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5lQm94ZXMg Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25Sb290SW5saW5l Qm94OjpOb25Sb290SW5saW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpOb25Sb290SW5saW5lQm94OjpjYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3cgY29uc3Qp OiBEZWxldGVkLgorCiAyMDIxLTA4LTIzICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFBDTTogU3VwcG9ydCBlcGhlbWVyYWwgbWVhc3VyZW1lbnQgd2l0aCBu b24tcGVyc2lzdGVudCBXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGZhYzA4ZGFi ZTNhOTE5ZjRlMjFlOTFkM2FmNWE1YWY1YWZiOWRhZDIuLjE1YWIwYjBlYTBlZTA1Y2JlOWRjNmYz MzY1N2MyMzIzOTg2NzQzYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVD b250ZW50QnVpbGRlci5jcHAKQEAgLTM1MSwxMSArMzUxLDggQEAgdm9pZCBJbmxpbmVDb250ZW50 QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExheW91dDo6SW5saW5lTGluZXMmIGxp bmVzLAogICAgICAgICAgICAgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC51bml0ZShjaGlsZFNjcm9s bGFibGVPdmVyZmxvdyk7CiAgICAgICAgIH0KICAgICAgICAgLy8gQ29sbGVjdCBzY3JvbGxhYmxl IG92ZXJmbG93IGZyb20gaW5saW5lIGJveGVzLiBBbGwgb3RoZXIgaW5saW5lIGxldmVsIGJveGVz IChlLmcgYXRvbWljIGlubGluZSBsZXZlbCBib3hlcykgc3RyZXRjaCB0aGUgbGluZS4KLSAgICAg ICAgd2hpbGUgKGlubGluZUJveEluZGV4IDwgbm9uUm9vdElubGluZUJveGVzLnNpemUoKSAmJiBu b25Sb290SW5saW5lQm94ZXNbaW5saW5lQm94SW5kZXhdLmxpbmVJbmRleCgpID09IGxpbmVJbmRl eCkgewotICAgICAgICAgICAgYXV0byYgaW5saW5lQm94ID0gbm9uUm9vdElubGluZUJveGVzW2lu bGluZUJveEluZGV4KytdOwotICAgICAgICAgICAgaWYgKGlubGluZUJveC5jYW5Db250cmlidXRl VG9MaW5lT3ZlcmZsb3coKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0 LnVuaXRlKGlubGluZUJveC5yZWN0KCkpOwotICAgICAgICB9CisgICAgICAgIHdoaWxlIChpbmxp bmVCb3hJbmRleCA8IG5vblJvb3RJbmxpbmVCb3hlcy5zaXplKCkgJiYgbm9uUm9vdElubGluZUJv eGVzW2lubGluZUJveEluZGV4XS5saW5lSW5kZXgoKSA9PSBsaW5lSW5kZXgpCisgICAgICAgICAg ICBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LnVuaXRlKG5vblJvb3RJbmxpbmVCb3hlc1tpbmxpbmVC b3hJbmRleCsrXS5yZWN0KCkpOwogCiAgICAgICAgIGF1dG8gYWRqdXN0ZWRMaW5lQm94UmVjdCA9 IEZsb2F0UmVjdCB7IGxpbmVCb3hMb2dpY2FsUmVjdCB9OwogICAgICAgICAvLyBGaW5hbCBlbmNs b3NpbmcgdG9wIGFuZCBib3R0b20gdmFsdWVzIGFyZSBpbiB0aGUgc2FtZSBjb29yZGluYXRlIHNw YWNlIGFzIHRoZSBsaW5lIGl0c2VsZi4KQEAgLTM3Miw4ICszNjksNiBAQCB2b2lkIElubGluZUNv bnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVMaW5l cyYgbGluZXMsCiAKIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25S b290SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGlu ZUZvcm1hdHRpbmdTdGF0ZSwgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCkgY29uc3QKIHsK LSAgICBhdXRvIGlubGluZUZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0OjpJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dCB7IG1fYm94VHJlZS5yb290TGF5b3V0Qm94KCksIGNvbnN0X2Nhc3Q8TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmPihpbmxpbmVGb3JtYXR0aW5nU3RhdGUpIH07Ci0gICAg YXV0byYgaW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5ID0gaW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Zm9ybWF0dGluZ0dlb21ldHJ5KCk7CiAgICAgZm9yIChzaXplX3QgbGluZUluZGV4ID0gMDsgbGlu ZUluZGV4IDwgaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLnNpemUoKTsgKytsaW5l SW5kZXgpIHsKICAgICAgICAgYXV0byYgbGluZUJveCA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5s aW5lQm94ZXMoKVtsaW5lSW5kZXhdOwogICAgICAgICBpZiAoIWxpbmVCb3guaGFzSW5saW5lQm94 KCkpCkBAIC0zODgsNyArMzgzLDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRl RGlzcGxheU5vblJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUYKICAgICAgICAg ICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGlu ZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgIGlubGluZUJveFJlY3Qu bW92ZUJ5KGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwogCi0gICAgICAgICAgICBpbmxp bmVDb250ZW50Lm5vblJvb3RJbmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lSW5kZXgsIGxheW91dEJv eCwgaW5saW5lQm94UmVjdCwgaW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94 QWZmZWN0c0xpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpIH0pOworICAgICAgICAgICAg aW5saW5lQ29udGVudC5ub25Sb290SW5saW5lQm94ZXMuYXBwZW5kKHsgbGluZUluZGV4LCBsYXlv dXRCb3gsIGlubGluZUJveFJlY3QgfSk7CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lLmgKaW5kZXggZDJkYzU3ZmM1M2JkOGExM2UxNjRmYWI5YmM1Y2JkZmRmMTk5ZDBmMi4uMTFm M2FmYjFlYzA0ZTIwZDdmZDFkOTk1YWJjYWU5ODZlODE5MjMyMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUu aApAQCAtODgsMTEgKzg4LDEwIEBAIHByaXZhdGU6CiAKIGNsYXNzIE5vblJvb3RJbmxpbmVCb3gg ewogcHVibGljOgotICAgIE5vblJvb3RJbmxpbmVCb3goc2l6ZV90IGxpbmVJbmRleCwgY29uc3Qg TGF5b3V0OjpCb3gmIGxheW91dEJveCwgY29uc3QgRmxvYXRSZWN0JiByZWN0LCBib29sIGNhbkNv bnRyaWJ1dGVUb0xpbmVPdmVyZmxvdykKKyAgICBOb25Sb290SW5saW5lQm94KHNpemVfdCBsaW5l SW5kZXgsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IEZsb2F0UmVjdCYgcmVj dCkKICAgICAgICAgOiBtX2xpbmVJbmRleChsaW5lSW5kZXgpCiAgICAgICAgICwgbV9sYXlvdXRC b3gobWFrZVdlYWtQdHIobGF5b3V0Qm94KSkKICAgICAgICAgLCBtX3JlY3QocmVjdCkKLSAgICAg ICAgLCBtX2NhbkNvbnRyaWJ1dGVUb0xpbmVPdmVyZmxvdyhjYW5Db250cmlidXRlVG9MaW5lT3Zl cmZsb3cpCiAgICAgewogICAgIH0KIApAQCAtMTAzLDEzICsxMDIsMTAgQEAgcHVibGljOgogCiAg ICAgRmxvYXRSZWN0IHJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KIAotICAgIGJvb2wg Y2FuQ29udHJpYnV0ZVRvTGluZU92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9jYW5Db250cmli dXRlVG9MaW5lT3ZlcmZsb3c7IH0KLQogcHJpdmF0ZToKICAgICBjb25zdCBzaXplX3QgbV9saW5l SW5kZXg7CiAgICAgV2Vha1B0cjxjb25zdCBMYXlvdXQ6OkJveD4gbV9sYXlvdXRCb3g7CiAgICAg RmxvYXRSZWN0IG1fcmVjdDsKLSAgICBib29sIG1fY2FuQ29udHJpYnV0ZVRvTGluZU92ZXJmbG93 IHsgZmFsc2UgfTsKIH07CiAKIH0K 436292 2021-08-24 09:13:58 -0700 2021-08-25 10:46:42 -0700 Patch bug-229436-20210824091358.patch text/plain 5665 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UxMzI4MWNhNjRlMGE4 YzlkNjk1MTM1YzgxMzE3MTk5MDdmNTkxNC4uNTE2ZmY5YTAwOTIxOTY4ZmY5N2NhMmVmOGM0MzYz NTA3NTE1MTQ4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA4LTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g Tm9uLWVtcHR5IGlubGluZSBib3hlcyBtYXkgYWZmZWN0IG92ZXJmbG93IHNjcm9sbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NDM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgbW9yZSBmb2N1 c2VkIGNoZWNrIHdoZXRoZXIgYW4gaW5saW5lIGJveCAoPHNwYW4+KSBzaG91bGQgY29udHJpYnV0 ZSB0byBzY3JvbGwgb3ZlcmZsb3cuCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlM aW5lcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5l Q29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5lQm94ZXMgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25Sb290SW5saW5lQm94OjpOb25S b290SW5saW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpOb25S b290SW5saW5lQm94OjpoYXNTY3JvbGxhYmxlQ29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Tm9uUm9vdElubGluZUJveDo6Y2FuQ29udHJpYnV0ZVRv TGluZU92ZXJmbG93IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0wOC0yMyAgSm9obiBXaWxhbmRl ciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBQQ006IFN1cHBvcnQgZXBoZW1lcmFs IG1lYXN1cmVtZW50IHdpdGggbm9uLXBlcnNpc3RlbnQgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVy LmNwcAppbmRleCBmYWMwOGRhYmUzYTkxOWY0ZTIxZTkxZDNhZjVhNWFmNWFmYjlkYWQyLi5lOTkx ZDNkOTJmNWM5NzQ2ZWQwMzIyZDViYjNiOWE2OWIxMjMzNWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0yOSw4ICsyOSw2IEBACiAj aWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKICNpbmNsdWRlICJCaWRpUmVz b2x2ZXIuaCIKLSNpbmNsdWRlICJJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIgotI2luY2x1ZGUg IklubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5oIgogI2luY2x1ZGUgIklubGluZUZvcm1hdHRpbmdT dGF0ZS5oIgogI2luY2x1ZGUgIkxheW91dEJveEdlb21ldHJ5LmgiCiAjaW5jbHVkZSAiTGF5b3V0 SW50ZWdyYXRpb25Cb3hUcmVlLmgiCkBAIC0zNTMsNyArMzUxLDcgQEAgdm9pZCBJbmxpbmVDb250 ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExheW91dDo6SW5saW5lTGluZXMm IGxpbmVzLAogICAgICAgICAvLyBDb2xsZWN0IHNjcm9sbGFibGUgb3ZlcmZsb3cgZnJvbSBpbmxp bmUgYm94ZXMuIEFsbCBvdGhlciBpbmxpbmUgbGV2ZWwgYm94ZXMgKGUuZyBhdG9taWMgaW5saW5l IGxldmVsIGJveGVzKSBzdHJldGNoIHRoZSBsaW5lLgogICAgICAgICB3aGlsZSAoaW5saW5lQm94 SW5kZXggPCBub25Sb290SW5saW5lQm94ZXMuc2l6ZSgpICYmIG5vblJvb3RJbmxpbmVCb3hlc1tp bmxpbmVCb3hJbmRleF0ubGluZUluZGV4KCkgPT0gbGluZUluZGV4KSB7CiAgICAgICAgICAgICBh dXRvJiBpbmxpbmVCb3ggPSBub25Sb290SW5saW5lQm94ZXNbaW5saW5lQm94SW5kZXgrK107Ci0g ICAgICAgICAgICBpZiAoaW5saW5lQm94LmNhbkNvbnRyaWJ1dGVUb0xpbmVPdmVyZmxvdygpKQor ICAgICAgICAgICAgaWYgKGlubGluZUJveC5oYXNTY3JvbGxhYmxlQ29udGVudCgpKQogICAgICAg ICAgICAgICAgIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QudW5pdGUoaW5saW5lQm94LnJlY3QoKSk7 CiAgICAgICAgIH0KIApAQCAtMzcyLDggKzM3MCw2IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxk ZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhjb25zdCBMYXlvdXQ6OklubGluZUxpbmVzJiBsaW5lcywK IAogdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheU5vblJvb3RJbmxpbmVC b3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5saW5lRm9ybWF0dGlu Z1N0YXRlLCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50KSBjb25zdAogewotICAgIGF1dG8g aW5saW5lRm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 IHsgbV9ib3hUcmVlLnJvb3RMYXlvdXRCb3goKSwgY29uc3RfY2FzdDxMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdTdGF0ZSY+KGlubGluZUZvcm1hdHRpbmdTdGF0ZSkgfTsKLSAgICBhdXRvJiBpbmxp bmVGb3JtYXR0aW5nR2VvbWV0cnkgPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5mb3JtYXR0aW5n R2VvbWV0cnkoKTsKICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXggPSAwOyBsaW5lSW5kZXggPCBp bmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkuc2l6ZSgpOyArK2xpbmVJbmRleCkgewog ICAgICAgICBhdXRvJiBsaW5lQm94ID0gaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygp W2xpbmVJbmRleF07CiAgICAgICAgIGlmICghbGluZUJveC5oYXNJbmxpbmVCb3goKSkKQEAgLTM4 OCw3ICszODQsMTEgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheU5v blJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUYKICAgICAgICAgICAgIGF1dG8g aW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJveChsYXlv dXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgIGlubGluZUJveFJlY3QubW92ZUJ5KGxp bmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwogCi0gICAgICAgICAgICBpbmxpbmVDb250ZW50 Lm5vblJvb3RJbmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lSW5kZXgsIGxheW91dEJveCwgaW5saW5l Qm94UmVjdCwgaW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xp bmVCb3goaW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpIH0pOworICAgICAgICAgICAgYXV0byBoYXNT Y3JvbGxhYmxlQ29udGVudCA9IFsmXSB7CisgICAgICAgICAgICAgICAgLy8gSW4gc3RhbmRhcmRz IG1vZGUsIGlubGluZSBib3hlcyBhbHdheXMgc3RhcnQgd2l0aCBhbiBpbWFnaW5hcnkgc3RydXQu CisgICAgICAgICAgICAgICAgcmV0dXJuIG1fbGF5b3V0U3RhdGUuaW5TdGFuZGFyZHNNb2RlKCkg fHwgaW5saW5lTGV2ZWxCb3guaGFzQ29udGVudCgpIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxC b3JkZXIoKSB8fCAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRy eS5ob3Jpem9udGFsUGFkZGluZygpLnZhbHVlKCkpOworICAgICAgICAgICAgfTsKKyAgICAgICAg ICAgIGlubGluZUNvbnRlbnQubm9uUm9vdElubGluZUJveGVzLmFwcGVuZCh7IGxpbmVJbmRleCwg bGF5b3V0Qm94LCBpbmxpbmVCb3hSZWN0LCBoYXNTY3JvbGxhYmxlQ29udGVudCgpIH0pOwogICAg ICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oCmluZGV4IGQyZGM1N2ZjNTNiZDhhMTNl MTY0ZmFiOWJjNWNiZGZkZjE5OWQwZjIuLjlhYzcxODI4MTkwMmUyZjYxOWEzYjcwYmNkMWJiYTI3 ODc1MzFmZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKQEAgLTg4LDExICs4OCwxMSBAQCBwcml2YXRl OgogCiBjbGFzcyBOb25Sb290SW5saW5lQm94IHsKIHB1YmxpYzoKLSAgICBOb25Sb290SW5saW5l Qm94KHNpemVfdCBsaW5lSW5kZXgsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0 IEZsb2F0UmVjdCYgcmVjdCwgYm9vbCBjYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3cpCisgICAg Tm9uUm9vdElubGluZUJveChzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6OkJveCYgbGF5 b3V0Qm94LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGJvb2wgaGFzU2Nyb2xsYWJsZUNvbnRlbnQp CiAgICAgICAgIDogbV9saW5lSW5kZXgobGluZUluZGV4KQogICAgICAgICAsIG1fbGF5b3V0Qm94 KG1ha2VXZWFrUHRyKGxheW91dEJveCkpCiAgICAgICAgICwgbV9yZWN0KHJlY3QpCi0gICAgICAg ICwgbV9jYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3coY2FuQ29udHJpYnV0ZVRvTGluZU92ZXJm bG93KQorICAgICAgICAsIG1faGFzU2Nyb2xsYWJsZUNvbnRlbnQoaGFzU2Nyb2xsYWJsZUNvbnRl bnQpCiAgICAgewogICAgIH0KIApAQCAtMTAzLDEzICsxMDMsMTMgQEAgcHVibGljOgogCiAgICAg RmxvYXRSZWN0IHJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlY3Q7IH0KIAotICAgIGJvb2wgY2Fu Q29udHJpYnV0ZVRvTGluZU92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9jYW5Db250cmlidXRl VG9MaW5lT3ZlcmZsb3c7IH0KKyAgICBib29sIGhhc1Njcm9sbGFibGVDb250ZW50KCkgY29uc3Qg eyByZXR1cm4gbV9oYXNTY3JvbGxhYmxlQ29udGVudDsgfQogCiBwcml2YXRlOgogICAgIGNvbnN0 IHNpemVfdCBtX2xpbmVJbmRleDsKICAgICBXZWFrUHRyPGNvbnN0IExheW91dDo6Qm94PiBtX2xh eW91dEJveDsKICAgICBGbG9hdFJlY3QgbV9yZWN0OwotICAgIGJvb2wgbV9jYW5Db250cmlidXRl VG9MaW5lT3ZlcmZsb3cgeyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNTY3JvbGxhYmxlQ29udGVu dCB7IGZhbHNlIH07CiB9OwogCiB9Cg==