266482 2023-12-15 07:52:05 -0800 [IFC][Ruby] text-emphasis is suppressed by annotation 2023-12-15 10:34:06 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 266486 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1999916 0 zalan 2023-12-15 07:52:05 -0800 see fast/text/emphasis-avoid-ruby.html 1999917 1 469063 zalan 2023-12-15 07:57:04 -0800 Created attachment 469063 [fast-cq]Patch 1999934 2 ews-feeder 2023-12-15 09:03:09 -0800 Committed 272119@main (12b180a5083b): <https://commits.webkit.org/272119@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469063. 1999935 3 webkit-bug-importer 2023-12-15 09:04:15 -0800 <rdar://problem/119724155> 1999938 4 commit-queue 2023-12-15 09:05:39 -0800 Re-opened since this is blocked by bug 266486 469063 2023-12-15 07:57:04 -0800 2023-12-15 10:34:06 -0800 [fast-cq]Patch bug-266482-20231215075703.patch text/plain 12927 zalan RnJvbSAwOTY1NjRhNjlmZjhhNGM2NjE0NzcxZmZjOGU1MmE2NWRiZDRiY2ZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgMTUgRGVjIDIwMjMgMDc6NTI6MTQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSB0ZXh0LWVtcGhhc2lzIGlzIHN1cHByZXNzZWQgYnkgYW5ub3RhdGlvbgogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NjQ4MgoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpUaGlzIHBhdGNoIGVuc3VyZXMgdGhhdCBpbmxpbmUgYm94ZXMgYXJlIG5vdCBz dHJldGNoZWQgYnkgdGV4dC1lbXBoYXNpcyB3aGVuIGFubm90YXRpb24gaXMgcHJlc2VudC4KCjEu IE1vdmUgdGV4dC1lbXBoYXNpcyBsb2dpYyBvdmVyIHRvIElubGluZUZvcm1hdHRpbmdVdGlscy4K Mi4gQWRkIGNoZWNrcyBmb3IgYW5ub3RhdGlvbiBiZWZvcmUvYWZ0ZXIgd2hlbiB0ZXh0LWVtcGhh c2lzIGNvbnRlbnQgaXMgaW5zaWRlIHJ1YnkgYmFzZS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcDoKKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1V0aWxzOjp0ZXh0RW1waGFzaXNGb3JJbmxp bmVCb3gpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdVdGlscy5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxldmVsQm94Lmg6CiogU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGV2ZWxCb3hJbmxpbmVzLmg6CihX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUxldmVsQm94OjpzZXRUZXh0RW1waGFzaXMpOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3gu Y3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94KToKKiBTb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5j cHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRl cjo6cm9vdEJveCBjb25zdCk6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMu Y3BwICAgICAgICAgIHwgNDQgKysrKysrKysrKysrKysrKysrKwogLi4uL2lubGluZS9JbmxpbmVG b3JtYXR0aW5nVXRpbHMuaCAgICAgICAgICAgIHwgIDIgKwogLi4uL2lubGluZS9JbmxpbmVMZXZl bEJveC5oICAgICAgICAgICAgICAgICAgIHwgIDIgKwogLi4uL2lubGluZS9JbmxpbmVMZXZlbEJv eElubGluZXMuaCAgICAgICAgICAgIHwgMzcgKysrKystLS0tLS0tLS0tLQogLi4uL2lubGluZS9J bmxpbmVMaW5lQm94LmNwcCAgICAgICAgICAgICAgICAgIHwgIDEgKwogLi4uL2lubGluZS9Jbmxp bmVMaW5lQm94QnVpbGRlci5jcHAgICAgICAgICAgIHwgIDIgKwogLi4uL2lubGluZS9JbmxpbmVM aW5lQm94QnVpbGRlci5oICAgICAgICAgICAgIHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgNjMg aW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUZvcm1hdHRpbmdVdGlscy5jcHAKaW5kZXggNzQ0MzlmMzA2ZGU5Li5lYWNjNzk4OGFmM2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcApAQCAt NTAzLDYgKzUwMyw1MCBAQCBzaXplX3QgSW5saW5lRm9ybWF0dGluZ1V0aWxzOjpuZXh0V3JhcE9w cG9ydHVuaXR5KHNpemVfdCBzdGFydEluZGV4LCBjb25zdCBJbmxpbgogICAgIHJldHVybiBsYXlv dXRSYW5nZS5lbmRJbmRleCgpOwogfQogCitzdGQ6OnBhaXI8SW5saW5lTGF5b3V0VW5pdCwgSW5s aW5lTGF5b3V0VW5pdD4gSW5saW5lRm9ybWF0dGluZ1V0aWxzOjp0ZXh0RW1waGFzaXNGb3JJbmxp bmVCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IEVsZW1lbnRCb3gmIHJvb3RCb3gpCit7 CisgICAgLy8gR2VuZXJpYywgbm9uLWlubGluZSBib3ggaW5saW5lLWxldmVsIGNvbnRlbnQgKGUu Zy4gcmVwbGFjZWQgZWxlbWVudHMpIGNhbid0IGhhdmUgdGV4dC1lbXBoYXNpcyBhbm5vdGF0aW9u cy4KKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5saW5lQm94KCkgfHwgJmxheW91dEJveCA9PSAm cm9vdEJveCk7CisKKyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOworICAgIGF1 dG8gaGFzVGV4dEVtcGhhc2lzID0gIHN0eWxlLnRleHRFbXBoYXNpc01hcmsoKSAhPSBUZXh0RW1w aGFzaXNNYXJrOjpOb25lOworICAgIGlmICghaGFzVGV4dEVtcGhhc2lzKQorICAgICAgICByZXR1 cm4geyB9OworICAgIGF1dG8gZW1waGFzaXNQb3NpdGlvbiA9IHN0eWxlLnRleHRFbXBoYXNpc1Bv c2l0aW9uKCk7CisgICAgLy8gTm9ybWFsbHkgd2UgcmVzb2x2ZSB2aXN1YWwgLT4gbG9naWNhbCB2 YWx1ZXMgYXQgcHJlLWxheW91dCB0aW1lLCBidXQgZW1waGFpc2lzIHZhbHVlcyBhcmUgbm90IHBh cnQgb2YgdGhlIGdlbmVyYWwgYm94IGdlb21ldHJ5LgorICAgIGF1dG8gaGFzQWJvdmVUZXh0RW1w aGFzaXMgPSBmYWxzZTsKKyAgICBhdXRvIGhhc1VuZGVyVGV4dEVtcGhhc2lzID0gZmFsc2U7Cisg ICAgaWYgKHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgaGFzQWJv dmVUZXh0RW1waGFzaXMgPSBlbXBoYXNpc1Bvc2l0aW9uLmNvbnRhaW5zKFRleHRFbXBoYXNpc1Bv c2l0aW9uOjpPdmVyKTsKKyAgICAgICAgaGFzVW5kZXJUZXh0RW1waGFzaXMgPSAhaGFzQWJvdmVU ZXh0RW1waGFzaXMgJiYgZW1waGFzaXNQb3NpdGlvbi5jb250YWlucyhUZXh0RW1waGFzaXNQb3Np dGlvbjo6VW5kZXIpOworICAgIH0gZWxzZSB7CisgICAgICAgIGhhc0Fib3ZlVGV4dEVtcGhhc2lz ID0gZW1waGFzaXNQb3NpdGlvbi5jb250YWlucyhUZXh0RW1waGFzaXNQb3NpdGlvbjo6UmlnaHQp IHx8IGVtcGhhc2lzUG9zaXRpb24gPT0gVGV4dEVtcGhhc2lzUG9zaXRpb246Ok92ZXI7CisgICAg ICAgIGhhc1VuZGVyVGV4dEVtcGhhc2lzID0gIWhhc0Fib3ZlVGV4dEVtcGhhc2lzICYmIChlbXBo YXNpc1Bvc2l0aW9uLmNvbnRhaW5zKFRleHRFbXBoYXNpc1Bvc2l0aW9uOjpMZWZ0KSB8fCBlbXBo YXNpc1Bvc2l0aW9uID09IFRleHRFbXBoYXNpc1Bvc2l0aW9uOjpVbmRlcik7CisgICAgfQorCisg ICAgaWYgKCFoYXNBYm92ZVRleHRFbXBoYXNpcyAmJiAhaGFzVW5kZXJUZXh0RW1waGFzaXMpCisg ICAgICAgIHJldHVybiB7IH07CisKKyAgICBhdXRvIGVuY2xvc2luZ1J1YnlCYXNlID0gWyZdKCkg LT4gY29uc3QgRWxlbWVudEJveCogeworICAgICAgICBpZiAoJmxheW91dEJveCA9PSAmcm9vdEJv eCkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICBmb3IgKGF1dG8qIGFuY2Vz dG9yID0gJmxheW91dEJveC5wYXJlbnQoKTsgYW5jZXN0b3IgIT0gJnJvb3RCb3g7IGFuY2VzdG9y ID0gJmFuY2VzdG9yLT5wYXJlbnQoKSkgeworICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc1J1 YnlCYXNlKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGFuY2VzdG9yOworICAgICAgICB9Cisg ICAgICAgIHJldHVybiBudWxscHRyOworICAgIH07CisgICAgaWYgKGF1dG8qIHJ1YnlCYXNlID0g ZW5jbG9zaW5nUnVieUJhc2UoKTsgcnVieUJhc2UgJiYgUnVieUZvcm1hdHRpbmdDb250ZXh0Ojpo YXNJbnRlcmxpbmVhckFubm90YXRpb24oKnJ1YnlCYXNlKSkgeworICAgICAgICBhdXRvIGFubm90 YXRpb25Qb3NpdGlvbiA9IHJ1YnlCYXNlLT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpOworICAgICAg ICBpZiAoKGhhc0Fib3ZlVGV4dEVtcGhhc2lzICYmIGFubm90YXRpb25Qb3NpdGlvbiA9PSBSdWJ5 UG9zaXRpb246OkJlZm9yZSkgfHwgKGhhc1VuZGVyVGV4dEVtcGhhc2lzICYmIGFubm90YXRpb25Q b3NpdGlvbiA9PSBSdWJ5UG9zaXRpb246OkFmdGVyKSkgeworICAgICAgICAgICAgLy8gRklYTUU6 IENoZWNrIGlmIGFubm90YXRpb24gYm94IGhhcyBjb250ZW50LgorICAgICAgICAgICAgcmV0dXJu IHsgfTsKKyAgICAgICAgfQorICAgIH0KKyAgICBJbmxpbmVMYXlvdXRVbml0IGFubm90YXRpb25T aXplID0gcm91bmRUb0ludChzdHlsZS5mb250Q2FzY2FkZSgpLmZsb2F0RW1waGFzaXNNYXJrSGVp Z2h0KHN0eWxlLnRleHRFbXBoYXNpc01hcmtTdHJpbmcoKSkpOworICAgIHJldHVybiB7IGhhc0Fi b3ZlVGV4dEVtcGhhc2lzID8gYW5ub3RhdGlvblNpemUgOiAwLmYsIGhhc0Fib3ZlVGV4dEVtcGhh c2lzID8gMC5mIDogYW5ub3RhdGlvblNpemUgfTsKK30KKwogY29uc3QgSW5saW5lTGF5b3V0U3Rh dGUmIElubGluZUZvcm1hdHRpbmdVdGlsczo6bGF5b3V0U3RhdGUoKSBjb25zdAogewogICAgIHJl dHVybiBmb3JtYXR0aW5nQ29udGV4dCgpLmxheW91dFN0YXRlKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nVXRpbHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5oCmluZGV4IGY5MmQ0ZDIwNjk1YS4uZDFhMmVmN2Fm ZmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuaApAQCAt NjQsNiArNjQsOCBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgc2l6ZV90IG5leHRXcmFwT3Bwb3J0 dW5pdHkoc2l6ZV90IHN0YXJ0SW5kZXgsIGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFu Z2UsIGNvbnN0IElubGluZUl0ZW1MaXN0Jik7CiAKKyAgICBzdGF0aWMgc3RkOjpwYWlyPElubGlu ZUxheW91dFVuaXQsIElubGluZUxheW91dFVuaXQ+IHRleHRFbXBoYXNpc0ZvcklubGluZUJveChj b25zdCBCb3gmLCBjb25zdCBFbGVtZW50Qm94JiByb290Qm94KTsKKwogcHJpdmF0ZToKICAgICBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMZWZ0QWZ0ZXJMYXN0TGluZShjb25zdCBDb25zdHJhaW50 c0ZvckluRmxvd0NvbnRlbnQmLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGxhc3RM aW5lTG9naWNhbEJvdHRvbSwgY29uc3QgRmxvYXRpbmdDb250ZXh0JikgY29uc3Q7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxldmVsQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMZXZlbEJveC5oCmluZGV4IDY3YTNmYzc3ODJiOS4uYzc4YzdiZGY1ZTk0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMZXZlbEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxldmVsQm94LmgKQEAgLTE0Nyw2ICsxNDcsOCBAQCBw cml2YXRlOgogICAgIHZvaWQgc2V0SXNGaXJzdEJveCgpIHsgbV9pc0ZpcnN0V2l0aGluTGF5b3V0 Qm94ID0gdHJ1ZTsgfQogICAgIHZvaWQgc2V0SXNMYXN0Qm94KCkgeyBtX2lzTGFzdFdpdGhpbkxh eW91dEJveCA9IHRydWU7IH0KIAorICAgIHZvaWQgc2V0VGV4dEVtcGhhc2lzKHN0ZDo6cGFpcjxJ bmxpbmVMYXlvdXRVbml0LCBJbmxpbmVMYXlvdXRVbml0Pik7CisKIHByaXZhdGU6CiAgICAgQ2hl Y2tlZFJlZjxjb25zdCBCb3g+IG1fbGF5b3V0Qm94OwogICAgIC8vIFRoaXMgaXMgdGhlIGNvbWJp bmF0aW9uIG9mIG1hcmdpbiBhbmQgYm9yZGVyIGJveGVzLiBJbmxpbmUgbGV2ZWwgYm94ZXMgYXJl IHZlcnRpY2FsbHkgYWxpZ25lZCB1c2luZyB0aGVpciBtYXJnaW4gYm94ZXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM ZXZlbEJveElubGluZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxldmVsQm94SW5saW5lcy5oCmluZGV4IDUxNGI3YTFjZTIyZi4uMmE0 MWM4NWY2NDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveElubGluZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMZXZlbEJveElubGluZXMu aApAQCAtNDMsMzIgKzQzLDYgQEAgaW5saW5lIElubGluZUxldmVsQm94OjpJbmxpbmVMZXZlbEJv eChjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgUmVuZGVyU3R5bGUmIHMKICAgICBtX3N0eWxl LnZlcnRpY2FsQWxpZ25tZW50LnR5cGUgPSBzdHlsZS52ZXJ0aWNhbEFsaWduKCk7CiAgICAgaWYg KG1fc3R5bGUudmVydGljYWxBbGlnbm1lbnQudHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpMZW5ndGgp CiAgICAgICAgIG1fc3R5bGUudmVydGljYWxBbGlnbm1lbnQuYmFzZWxpbmVPZmZzZXQgPSBmbG9h dFZhbHVlRm9yTGVuZ3RoKHN0eWxlLnZlcnRpY2FsQWxpZ25MZW5ndGgoKSwgcHJlZmVycmVkTGlu ZUhlaWdodCgpKTsKLQotICAgIGF1dG8gc2V0QW5ub3RhdGlvbklmQXBwbGljYWJsZSA9IFsmXSB7 Ci0gICAgICAgIC8vIEdlbmVyaWMsIG5vbi1pbmxpbmUgYm94IGlubGluZS1sZXZlbCBjb250ZW50 IChlLmcuIHJlcGxhY2VkIGVsZW1lbnRzKSBjYW4ndCBoYXZlIHRleHQtZW1waGFzaXMgYW5ub3Rh dGlvbnMuCi0gICAgICAgIGlmICghaXNSb290SW5saW5lQm94KCkgJiYgIWlzSW5saW5lQm94KCkp Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGF1dG8gaGFzVGV4dEVtcGhhc2lzID0gIHN0 eWxlLnRleHRFbXBoYXNpc01hcmsoKSAhPSBUZXh0RW1waGFzaXNNYXJrOjpOb25lOwotICAgICAg ICBpZiAoIWhhc1RleHRFbXBoYXNpcykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgYXV0 byBlbXBoYXNpc1Bvc2l0aW9uID0gc3R5bGUudGV4dEVtcGhhc2lzUG9zaXRpb24oKTsKLSAgICAg ICAgLy8gTm9ybWFsbHkgd2UgcmVzb2x2ZSB2aXN1YWwgLT4gbG9naWNhbCB2YWx1ZXMgYXQgcHJl LWxheW91dCB0aW1lLCBidXQgZW1waGFpc2lzIHZhbHVlcyBhcmUgbm90IHBhcnQgb2YgdGhlIGdl bmVyYWwgYm94IGdlb21ldHJ5LgotICAgICAgICBhdXRvIGhhc0Fib3ZlVGV4dEVtcGhhc2lzID0g ZmFsc2U7Ci0gICAgICAgIGF1dG8gaGFzVW5kZXJUZXh0RW1waGFzaXMgPSBmYWxzZTsKLSAgICAg ICAgaWYgKHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgICAgIGhh c0Fib3ZlVGV4dEVtcGhhc2lzID0gZW1waGFzaXNQb3NpdGlvbi5jb250YWlucyhUZXh0RW1waGFz aXNQb3NpdGlvbjo6T3Zlcik7Ci0gICAgICAgICAgICBoYXNVbmRlclRleHRFbXBoYXNpcyA9ICFo YXNBYm92ZVRleHRFbXBoYXNpcyAmJiBlbXBoYXNpc1Bvc2l0aW9uLmNvbnRhaW5zKFRleHRFbXBo YXNpc1Bvc2l0aW9uOjpVbmRlcik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBoYXNB Ym92ZVRleHRFbXBoYXNpcyA9IGVtcGhhc2lzUG9zaXRpb24uY29udGFpbnMoVGV4dEVtcGhhc2lz UG9zaXRpb246OlJpZ2h0KSB8fCBlbXBoYXNpc1Bvc2l0aW9uID09IFRleHRFbXBoYXNpc1Bvc2l0 aW9uOjpPdmVyOwotICAgICAgICAgICAgaGFzVW5kZXJUZXh0RW1waGFzaXMgPSAhaGFzQWJvdmVU ZXh0RW1waGFzaXMgJiYgKGVtcGhhc2lzUG9zaXRpb24uY29udGFpbnMoVGV4dEVtcGhhc2lzUG9z aXRpb246OkxlZnQpIHx8IGVtcGhhc2lzUG9zaXRpb24gPT0gVGV4dEVtcGhhc2lzUG9zaXRpb246 OlVuZGVyKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChoYXNBYm92ZVRleHRFbXBoYXNpcyB8 fCBoYXNVbmRlclRleHRFbXBoYXNpcykgewotICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBh bm5vdGF0aW9uU2l6ZSA9IHJvdW5kVG9JbnQoc3R5bGUuZm9udENhc2NhZGUoKS5mbG9hdEVtcGhh c2lzTWFya0hlaWdodChzdHlsZS50ZXh0RW1waGFzaXNNYXJrU3RyaW5nKCkpKTsKLSAgICAgICAg ICAgIG1fYW5ub3RhdGlvbiA9IHsgaGFzQWJvdmVUZXh0RW1waGFzaXMgPyBhbm5vdGF0aW9uU2l6 ZSA6IDAsIGhhc0Fib3ZlVGV4dEVtcGhhc2lzID8gMCA6IGFubm90YXRpb25TaXplIH07Ci0gICAg ICAgIH0KLSAgICB9OwotICAgIHNldEFubm90YXRpb25JZkFwcGxpY2FibGUoKTsKIH0KIAogaW5s aW5lIElubGluZUxldmVsQm94IElubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZl bEJveChjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkK QEAgLTExNSw2ICs4OSwxNyBAQCBpbmxpbmUgYm9vbCBJbmxpbmVMZXZlbEJveDo6bWF5U3RyZXRj aExpbmVCb3goKSBjb25zdAogICAgIHJldHVybiB0cnVlOwogfQogCitpbmxpbmUgdm9pZCBJbmxp bmVMZXZlbEJveDo6c2V0VGV4dEVtcGhhc2lzKHN0ZDo6cGFpcjxJbmxpbmVMYXlvdXRVbml0LCBJ bmxpbmVMYXlvdXRVbml0PiB0ZXh0RW1waGFzaXMpCit7CisgICAgaWYgKCF0ZXh0RW1waGFzaXMu Zmlyc3QgJiYgIXRleHRFbXBoYXNpcy5zZWNvbmQpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAo dGV4dEVtcGhhc2lzLmZpcnN0KSB7CisgICAgICAgIG1fYW5ub3RhdGlvbiA9IEFubm90YXRpb24g eyB0ZXh0RW1waGFzaXMuZmlyc3QsIDAuZiB9OworICAgICAgICByZXR1cm47CisgICAgfQorICAg IG1fYW5ub3RhdGlvbiA9IEFubm90YXRpb24geyAwLmYsIHRleHRFbXBoYXNpcy5zZWNvbmQgfTsK K30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGZjOTg5 ZjI2NWFiOC4uMTkwMjIwNDk2NzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmNw cApAQCAtNDAsNiArNDAsNyBAQCBMaW5lQm94OjpMaW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91 dEJveCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsCiB7CiAgICAgbV9ub25S b290SW5saW5lTGV2ZWxCb3hMaXN0LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobm9uU3Bhbm5pbmdJ bmxpbmVMZXZlbEJveENvdW50KTsKICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveE1hcC5yZXNl cnZlSW5pdGlhbENhcGFjaXR5KG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CisgICAg bV9yb290SW5saW5lQm94LnNldFRleHRFbXBoYXNpcyhJbmxpbmVGb3JtYXR0aW5nVXRpbHM6OnRl eHRFbXBoYXNpc0ZvcklubGluZUJveChyb290TGF5b3V0Qm94LCBkb3duY2FzdDxFbGVtZW50Qm94 Pihyb290TGF5b3V0Qm94KSkpOwogfQogCiB2b2lkIExpbmVCb3g6OmFkZElubGluZUxldmVsQm94 KElubGluZUxldmVsQm94JiYgaW5saW5lTGV2ZWxCb3gpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggMDM2MDBkN2Q5NjhiLi4xMzM5Nzk3NjFhYTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTM2 OSw2ICszNjksNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJv eGVzKExpbmVCb3gmIGxpbmVCb3gpCiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IHJv b3RJbmxpbmVCb3gubG9naWNhbFJpZ2h0KCkgLSBsb2dpY2FsTGVmdDsKICAgICAgICAgICAgIGF1 dG8gaW5saW5lQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gs IHN0eWxlLCBsb2dpY2FsTGVmdCwgbG9naWNhbFdpZHRoLCBJbmxpbmVMZXZlbEJveDo6TGluZVNw YW5uaW5nSW5saW5lQm94OjpZZXMpOwogICAgICAgICAgICAgc2V0VmVydGljYWxQcm9wZXJ0aWVz Rm9ySW5saW5lTGV2ZWxCb3gobGluZUJveCwgaW5saW5lQm94KTsKKyAgICAgICAgICAgIGlubGlu ZUJveC5zZXRUZXh0RW1waGFzaXMoSW5saW5lRm9ybWF0dGluZ1V0aWxzOjp0ZXh0RW1waGFzaXNG b3JJbmxpbmVCb3gobGF5b3V0Qm94LCByb290Qm94KCkpKTsKICAgICAgICAgICAgIGxpbmVCb3gu YWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKICAgICAgICAgICAgIG1fbGlu ZUhhc1J1YnlDb250ZW50ID0gbV9saW5lSGFzUnVieUNvbnRlbnQgfHwgbGF5b3V0Qm94LmlzUnVi eUJhc2UoKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMzg0LDYgKzM4NSw3IEBAIHZvaWQg TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJv eCkKICAgICAgICAgICAgIGluaXRpYWxMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChpbml0aWFsTG9n aWNhbFdpZHRoLCAwLmYpOwogICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZl bEJveDo6Y3JlYXRlSW5saW5lQm94KGxheW91dEJveCwgc3R5bGUsIGxvZ2ljYWxMZWZ0LCBpbml0 aWFsTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGlubGluZUJveC5zZXRJc0ZpcnN0Qm94KCk7 CisgICAgICAgICAgICBpbmxpbmVCb3guc2V0VGV4dEVtcGhhc2lzKElubGluZUZvcm1hdHRpbmdV dGlsczo6dGV4dEVtcGhhc2lzRm9ySW5saW5lQm94KGxheW91dEJveCwgcm9vdEJveCgpKSk7CiAg ICAgICAgICAgICBzZXRWZXJ0aWNhbFByb3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJveChsaW5lQm94 LCBpbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChXVEZN b3ZlKGlubGluZUJveCkpOwogICAgICAgICAgICAgbV9saW5lSGFzUnVieUNvbnRlbnQgPSBtX2xp bmVIYXNSdWJ5Q29udGVudCB8fCBsYXlvdXRCb3guaXNSdWJ5QmFzZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKaW5kZXggYzU1YTIwMTBkMWVkLi43OWY3MDE1 NGFlZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApAQCAt NjEsNyArNjEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNMYXN0TGluZSgpIGNvbnN0IHsgcmV0 dXJuIGxpbmVMYXlvdXRSZXN1bHQoKS5pc0ZpcnN0TGFzdC5pc0xhc3RMaW5lV2l0aElubGluZUNv bnRlbnQ7IH0KICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0Nv bnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OyB9CiAgICAg Y29uc3QgTGluZUxheW91dFJlc3VsdCYgbGluZUxheW91dFJlc3VsdCgpIGNvbnN0IHsgcmV0dXJu IG1fbGluZUxheW91dFJlc3VsdDsgfQotICAgIGNvbnN0IEJveCYgcm9vdEJveCgpIGNvbnN0IHsg cmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpOyB9CisgICAgY29uc3QgRWxlbWVudEJv eCYgcm9vdEJveCgpIGNvbnN0IHsgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpOyB9 CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHJvb3RTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIGlzRmly c3RMaW5lKCkgPyByb290Qm94KCkuZmlyc3RMaW5lU3R5bGUoKSA6IHJvb3RCb3goKS5zdHlsZSgp OyB9CiAKICAgICBjb25zdCBJbmxpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25zdCB7 IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dCgpLmxheW91dFN0YXRlKCk7IH0K