239692 2022-04-23 10:03:32 -0700 [FFC][Integration] Add integration API to FlexFormattingContext 2022-04-24 15:07:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham fujii koivisto ross.kirsling simon.fraser webkit-bug-importer zalan oldest_to_newest 1863898 0 zalan 2022-04-23 10:03:32 -0700 ssia 1863899 1 458214 zalan 2022-04-23 10:06:46 -0700 Created attachment 458214 Patch 1863934 2 ews-feeder 2022-04-23 16:04:40 -0700 Committed r293297 (249922@main): <https://commits.webkit.org/249922@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458214. 1863935 3 webkit-bug-importer 2022-04-23 16:05:14 -0700 <rdar://problem/92222456> 1863943 4 ross.kirsling 2022-04-23 19:33:21 -0700 This caused Windows builds to break. 1863945 5 zalan 2022-04-23 20:55:29 -0700 (In reply to Ross Kirsling from comment #4) > This caused Windows builds to break. Sorry about that. Hopefully https://trac.webkit.org/changeset/293300/webkit is going to address it. 1863982 6 fujii 2022-04-24 13:29:16 -0700 Committed r293306 (249929@trunk): <https://commits.webkit.org/249929@trunk> 1863997 7 zalan 2022-04-24 15:07:21 -0700 (In reply to Fujii Hironori from comment #6) > Committed r293306 (249929@trunk): <https://commits.webkit.org/249929@trunk> thank you. 458214 2022-04-23 10:06:46 -0700 2022-04-23 16:04:41 -0700 Patch bug-239692-20220423100644.patch text/plain 10804 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM0N2Q4NGM4YzZkM2U4 ODdhYmQ0MTljMTQ1ODAyOWI0NTU0MjM2MS4uOWQ2NTM4ODhmOTliYWY1ZDQxZDAyZDNkMDRjNTRi MDNiOTZkMDMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTA0LTIzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbRkZDXVtJbnRlZ3JhdGlvbl0g QWRkIGludGVncmF0aW9uIEFQSSB0byBGbGV4Rm9ybWF0dGluZ0NvbnRleHQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTY5MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpbnRlZ3JhdGlvbiBjb2Rl cGF0aCBuZWVkcyBkZWRpY2F0ZWQgKGFuZCB0ZW1wb3JhcnkpQVBJcyBvbiB0aGUgZm9ybWF0dGlu ZyBjb250ZXh0cy4KKyAgICAgICAgKFRoaXMgaXMgZXhhY3RseSBob3cgaW5saW5lIGxheW91dCBo YXMgYmVlbiBpbnRlZ3JhdGVkLikKKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlcmdy YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckludGVncmF0aW9uKToKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 Lmg6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVyZ3JhdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0 Rm9ySW50ZXJncmF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91 dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6RmxleExheW91dDo6RmxleExheW91dCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6RmxleExheW91dDo6Y29tcHV0 ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OkZsZXhMYXlvdXQ6OmxheW91dCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0 aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6RmxleExheW91dDo6cm9vdExheW91dEJveCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6RmxleExheW91dDo6cm9vdExheW91 dEJveCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmVMYXlvdXQ6OmxheW91dCk6CisKIDIwMjItMDQtMjIgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtGRkNdW0ludGVncmF0aW9uXSBDb25zdHJ1Y3QgYW5kIHVw ZGF0ZSB0aGUgbGF5b3V0IHRyZWUgZm9yIHRoZSBmbGV4IGl0ZW1zCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDNjNWQyNjJkNzExZmI5YzcxN2I5NDli MGE4YjZiMmMyZWJhY2Q1NGQuLmJlOWZlNWZkMGI5ZDY3YWFmNjg4NWM1OWEyYmM5NTYxZjc1ZGJi MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0x MTgsNiArMTE4LDE1IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmlu c2ljV2lkdGhDb25zdHJhaW50c0ZvckZsZXhJdGVtcygpCiAgICAgfQogfQogCit2b2lkIEZsZXhG b3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVyZ3JhdGlvbihjb25z dCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmKQoreworfQorCitJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzRm9ySW50ZWdyYXRpb24oKQoreworICAgIHJldHVybiB7IH07Cit9CisKIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9m bGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGJmMWUyOWNh MDk5ZjcwZDQ2NWRjNGFjODA2NTA5OWZhY2ZkOGI2YWEuLjIwM2U4OTU4YWY4OGE4NzlkYzc0ZWQ4 NzY5ODA2ODk2ODZhMjJiMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTQyLDEzICs0MiwxNSBAQCBjbGFzcyBGbGV4Rm9ybWF0dGluZ0NvbnRleHQgZmlu YWwgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQgewogcHVibGljOgogICAgIEZsZXhGb3JtYXR0 aW5nQ29udGV4dChjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgRmxl eEZvcm1hdHRpbmdTdGF0ZSYpOwogICAgIHZvaWQgbGF5b3V0SW5GbG93Q29udGVudChjb25zdCBD b25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmKSBvdmVycmlkZTsKLSAgICBMYXlvdXRVbml0IHVz ZWRDb250ZW50SGVpZ2h0KCkgY29uc3Qgb3ZlcnJpZGU7Ci0KICAgICBJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygpIG92ZXJyaWRlOwor ICAgIExheW91dFVuaXQgdXNlZENvbnRlbnRIZWlnaHQoKSBjb25zdCBvdmVycmlkZTsKIAogICAg IGNvbnN0IEZsZXhGb3JtYXR0aW5nR2VvbWV0cnkmIGZvcm1hdHRpbmdHZW9tZXRyeSgpIGNvbnN0 IGZpbmFsIHsgcmV0dXJuIG1fZmxleEZvcm1hdHRpbmdHZW9tZXRyeTsgfQogICAgIGNvbnN0IEZv cm1hdHRpbmdRdWlya3MmIGZvcm1hdHRpbmdRdWlya3MoKSBjb25zdCBmaW5hbCB7IHJldHVybiBt X2ZsZXhGb3JtYXR0aW5nUXVpcmtzOyB9CiAKKyAgICB2b2lkIGxheW91dEluRmxvd0NvbnRlbnRG b3JJbnRlcmdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CisgICAg SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHNGb3JJbnRlZ3JhdGlvbigpOworCiBwcml2YXRlOgogICAgIHZvaWQgc2l6ZUFuZFBsYWNlRmxl eEl0ZW1zKGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYpOwogICAgIHZvaWQgY29t cHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBkMWE4NDMzMDNm NmZmZWRkNDRmOWI3OGNjMWJmNDdjMzFjZWI1NjY0Li43YTBkMWQ5Zjk4MWM3NmE0YmY0OTBmZTA1 MjlmN2UyZGNjODQ4YTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwCkBAIC0xNTAsNyArMTUwLDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0Nv bnQKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8 PCAiW0VuZF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3Qo IiA8PCAmcm9vdCgpIDw8ICIpIik7CiB9CiAKLXZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmxpbmVMYXlvdXRGb3JJbnRlcmdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250 ZW50JiBjb25zdHJhaW50cykKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlcmdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250 ZW50JiBjb25zdHJhaW50cykKIHsKICAgICBpbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKCk7CiAg ICAgY29sbGVjdENvbnRlbnRJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZjhmZjYwNmYwY2JkMTQ4NzJiODZmZGZjNmE0ODE5 YjI2ZGRkNDg2YS4uYWYwZTUzMjQwMDc5NTIyN2ExOTE0ZTI1MDYzZGExNjBmM2JiMjdjNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC00Nywx OSArNDcsMTggQEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZmluYWwgOiBwdWJsaWMg Rm9ybWF0dGluZ0NvbnRleHQgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoSW5saW5lRm9y bWF0dGluZ0NvbnRleHQpOwogcHVibGljOgogICAgIElubGluZUZvcm1hdHRpbmdDb250ZXh0KGNv bnN0IENvbnRhaW5lckJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBJbmxpbmVGb3JtYXR0aW5n U3RhdGUmLCBjb25zdCBJbmxpbmVEYW1hZ2UqID0gbnVsbHB0cik7CisKICAgICB2b2lkIGxheW91 dEluRmxvd0NvbnRlbnQoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jikgb3ZlcnJp ZGU7CisgICAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb21wdXRlZEludHJpbnNpY1dpZHRo Q29uc3RyYWludHMoKSBvdmVycmlkZTsKICAgICBMYXlvdXRVbml0IHVzZWRDb250ZW50SGVpZ2h0 KCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGZv cm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PElubGluZUZvcm1hdHRpbmdT dGF0ZT4oRm9ybWF0dGluZ0NvbnRleHQ6OmZvcm1hdHRpbmdTdGF0ZSgpKTsgfQogICAgIElubGlu ZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8SW5s aW5lRm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkp OyB9Ci0KLSAgICB2b2lkIGxpbmVMYXlvdXRGb3JJbnRlcmdyYXRpb24oY29uc3QgQ29uc3RyYWlu dHNGb3JJbkZsb3dDb250ZW50Jik7Ci0gICAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb21w dXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JJbnRlZ3JhdGlvbigpOwotCiAgICAgY29u c3QgSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5JiBmb3JtYXR0aW5nR2VvbWV0cnkoKSBjb25zdCBm aW5hbCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdHZW9tZXRyeTsgfQogICAgIGNvbnN0IElu bGluZUZvcm1hdHRpbmdRdWlya3MmIGZvcm1hdHRpbmdRdWlya3MoKSBjb25zdCBmaW5hbCB7IHJl dHVybiBtX2lubGluZUZvcm1hdHRpbmdRdWlya3M7IH0KIAotICAgIEludHJpbnNpY1dpZHRoQ29u c3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7Cisg ICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZXJncmF0aW9uKGNvbnN0IENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudCYpOworICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29t cHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50ZWdyYXRpb24oKTsKIAogcHJpdmF0 ZToKICAgICB2b2lkIGxpbmVMYXlvdXQoSW5saW5lSXRlbXMmLCBMaW5lQnVpbGRlcjo6SW5saW5l SXRlbVJhbmdlLCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0 aW9uRmxleExheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxl eC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwCmluZGV4IGY2NTU3YTc0MTI1YzFiMmVj NzEyZThkM2MwMmMyYzc3MzZlMmE3ZjcuLmM1YWNlZGZhZmNmY2ViMTg1ZTAyNDQzNDk4YWI2NTlk OWNlZTNhZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9m bGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcApA QCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQp CiAKKyNpbmNsdWRlICJGbGV4Rm9ybWF0dGluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJIaXRUZXN0 TG9jYXRpb24uaCIKICNpbmNsdWRlICJIaXRUZXN0UmVxdWVzdC5oIgogI2luY2x1ZGUgIkhpdFRl c3RSZXN1bHQuaCIKQEAgLTM5LDcgKzQwLDggQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9u IHsKIAogRmxleExheW91dDo6RmxleExheW91dChSZW5kZXJGbGV4aWJsZUJveCYgZmxleEJveFJl bmRlcmVyKQogICAgIDogbV9ib3hUcmVlKGZsZXhCb3hSZW5kZXJlcikKLSAgICAsIG1fbGF5b3V0 U3RhdGUoZmxleEJveFJlbmRlcmVyLmRvY3VtZW50KCksIG1fYm94VHJlZS5yb290TGF5b3V0Qm94 KCkpCisgICAgLCBtX2xheW91dFN0YXRlKGZsZXhCb3hSZW5kZXJlci5kb2N1bWVudCgpLCByb290 TGF5b3V0Qm94KCkpCisgICAgLCBtX2ZsZXhGb3JtYXR0aW5nU3RhdGUobV9sYXlvdXRTdGF0ZS5l bnN1cmVGbGV4Rm9ybWF0dGluZ1N0YXRlKHJvb3RMYXlvdXRCb3goKSkpCiB7CiB9CiAKQEAgLTY1 LDExICs2NywxOSBAQCB2b2lkIEZsZXhMYXlvdXQ6OnVwZGF0ZVN0eWxlKGNvbnN0IFJlbmRlckJs b2NrJiwgY29uc3QgUmVuZGVyU3R5bGUmKQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0 VW5pdD4gRmxleExheW91dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKQogewot ICAgIHJldHVybiB7IH07CisgICAgYXV0byBmbGV4Rm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXQ6 OkZsZXhGb3JtYXR0aW5nQ29udGV4dCB7IHJvb3RMYXlvdXRCb3goKSwgbV9mbGV4Rm9ybWF0dGlu Z1N0YXRlIH07CisgICAgYXV0byBjb25zdHJhaW50cyA9IGZsZXhGb3JtYXR0aW5nQ29udGV4dC5j b21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JJbnRlZ3JhdGlvbigpOworCisgICAg cmV0dXJuIHsgY29uc3RyYWludHMubWluaW11bSwgY29uc3RyYWludHMubWF4aW11bSB9OwogfQog CiB2b2lkIEZsZXhMYXlvdXQ6OmxheW91dCgpCiB7CisgICAgYXV0byYgcm9vdEdlb21ldHJ5ID0g bV9sYXlvdXRTdGF0ZS5nZW9tZXRyeUZvckJveChyb290TGF5b3V0Qm94KCkpOworICAgIGF1dG8g ZmxleEZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQgeyBy b290TGF5b3V0Qm94KCksIG1fZmxleEZvcm1hdHRpbmdTdGF0ZSB9OworICAgIGF1dG8gaG9yaXpv bnRhbENvbnN0cmFpbnRzID0gTGF5b3V0OjpIb3Jpem9udGFsQ29uc3RyYWludHMgeyByb290R2Vv bWV0cnkuY29udGVudEJveExlZnQoKSwgcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hXaWR0aCgpIH07 CisKKyAgICBmbGV4Rm9ybWF0dGluZ0NvbnRleHQubGF5b3V0SW5GbG93Q29udGVudEZvckludGVy Z3JhdGlvbih7IGhvcml6b250YWxDb25zdHJhaW50cywgcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hU b3AoKSB9KTsKIH0KIAogdm9pZCBGbGV4TGF5b3V0OjpwYWludChQYWludEluZm8mLCBjb25zdCBM YXlvdXRQb2ludCYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5oCmluZGV4 IDFlMjg2NjYyZjAzNmE0YzhhZGVlNzNiMTNlNmNkZWViMDcyZDkxZTAuLjExZTE2NmM0YTc3NDc0 ODAyNTMxMWY2Y2ZlNGFiZTk0MTE4M2ZhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9u RmxleExheW91dC5oCkBAIC0yNyw2ICsyNyw3IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1B VFRJTkdfQ09OVEVYVCkKIAorI2luY2x1ZGUgIkZsZXhGb3JtYXR0aW5nU3RhdGUuaCIKICNpbmNs dWRlICJMYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaCIKICNpbmNsdWRlICJMYXlvdXRTdGF0ZS5o IgogI2luY2x1ZGUgIlJlbmRlck9iamVjdEVudW1zLmgiCkBAIC02Myw4ICs2NCwxMiBAQCBwdWJs aWM6CiAgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaWdodCgpIGNvbnN0OwogCiBwcml2 YXRlOgorICAgIGNvbnN0IExheW91dDo6Q29udGFpbmVyQm94JiByb290TGF5b3V0Qm94KCkgY29u c3QgeyByZXR1cm4gbV9ib3hUcmVlLnJvb3RMYXlvdXRCb3goKTsgfQorICAgIExheW91dDo6Q29u dGFpbmVyQm94JiByb290TGF5b3V0Qm94KCkgeyByZXR1cm4gbV9ib3hUcmVlLnJvb3RMYXlvdXRC b3goKTsgfQorCiAgICAgQm94VHJlZSBtX2JveFRyZWU7CiAgICAgTGF5b3V0OjpMYXlvdXRTdGF0 ZSBtX2xheW91dFN0YXRlOworICAgIExheW91dDo6RmxleEZvcm1hdHRpbmdTdGF0ZSYgbV9mbGV4 Rm9ybWF0dGluZ1N0YXRlOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlv bkxpbmVMYXlvdXQuY3BwCmluZGV4IDIzYTM3ZWI0MjBhZDUzNDU1NzU5MzRlMGRiOGNhMWNjMjI4 YWNkNDYuLmU5ZDRjMDY2ZGU1MWQwZmIyNTM3M2JjMzVhNzRlMmU5Yjc3ZjU0NGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTM4MCw3ICszODAs NyBAQCB2b2lkIExpbmVMYXlvdXQ6OmxheW91dCgpCiAKICAgICBhdXRvIGhvcml6b250YWxDb25z dHJhaW50cyA9IExheW91dDo6SG9yaXpvbnRhbENvbnN0cmFpbnRzIHsgcm9vdEdlb21ldHJ5LmNv bnRlbnRCb3hMZWZ0KCksIHJvb3RHZW9tZXRyeS5jb250ZW50Qm94V2lkdGgoKSB9OwogCi0gICAg aW5saW5lRm9ybWF0dGluZ0NvbnRleHQubGluZUxheW91dEZvckludGVyZ3JhdGlvbih7IGhvcml6 b250YWxDb25zdHJhaW50cywgcm9vdEdlb21ldHJ5LmNvbnRlbnRCb3hUb3AoKSB9KTsKKyAgICBp bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZXJncmF0aW9u KHsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCByb290R2VvbWV0cnkuY29udGVudEJveFRvcCgpIH0p OwogCiAgICAgY29uc3RydWN0Q29udGVudCgpOwogCg==