191838 2018-11-19 08:44:54 -0800 [LFC][IFC] Move detaching rules from InlineFormattingState to InlineItem 2018-11-20 07:52:40 -0800 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 1480242 0 zalan 2018-11-19 08:44:54 -0800 This is preparation for adding more context to InlineItem (padding/border/other nonBreakable start/ends) 1480243 1 355283 zalan 2018-11-19 08:47:58 -0800 Created attachment 355283 Patch 1480494 2 zalan 2018-11-20 07:51:07 -0800 Committed r238400: <https://trac.webkit.org/changeset/238400> 1480496 3 webkit-bug-importer 2018-11-20 07:52:40 -0800 <rdar://problem/46186455> 355283 2018-11-19 08:47:58 -0800 2018-11-20 07:01:41 -0800 Patch Patch.txt text/plain 10124 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MGRjMGZmYmQ1OS4uYTJiYzAwNGQ5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0xMS0xOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0lGQ10gTW92ZSBkZXRhY2hpbmcgcnVsZXMgZnJvbSBJbmxpbmVGb3Jt YXR0aW5nU3RhdGUgdG8gSW5saW5lSXRlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkxODM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYWRkaW5nIG1vcmUg Y29udGV4dCB0byBJbmxpbmVJdGVtLiBJbiBhZGRpdGlvbiB0bworICAgICAgICBkZXRhY2hpbmcg cnVsZXMgaXQgd2lsbCBhbHNvIGhvbGQgbm9uLWJyZWFrYWJsZSBzdGFydC9lbmQgaW5mb3JtYXRp b24uIAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6c3BsaXRJbmxpbmVSdW5JZk5lZWRlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudEZv clN1YnRyZWUgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdTdGF0ZTo6YWRkRGV0YWNoaW5nUnVsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZTo6ZGV0YWNoaW5nUnVsZXMgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdTdGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n U3RhdGU6OnNldERldGFjaGluZ1J1bGVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUl0ZW06OmFkZERldGFjaGluZ1J1bGUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVJdGVtOjpkZXRhY2hpbmdSdWxlcyBjb25zdCk6CisKIDIwMTgtMTEtMTkgIFphbGFuIEJ1 amp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVSdW5Q cm92aWRlcjo6YXBwZW5kKCkgc2hvdWxkIGp1c3QgdGFrZSBjb25zdCBJbmxpbmVJdGVtJi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA1ZGE0OGI2ZWUzYy4uNzVjM2Y0 NTU5YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTE3Miw3ICsx NzIsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzcGxpdElubGluZVJ1bklmTmVl ZGVkKGNvbnN0IElubGluZVJ1biYgaW5saW5lUnVuLAogICAgICAgICAvLyAyLiBCcmVhayBhdCB0 aGUgYmVnaW5uaW5nIG9mIHRoZSBpbmxpbmUgZWxlbWVudCAtPiBjb21taXQgd2hhdCB3ZSd2ZSBn b3Qgc28gZmFyLiBDdXJyZW50IGVsZW1lbnQgYmVjb21lcyB0aGUgZmlyc3QgdW5jb21taXR0ZWQu CiAgICAgICAgIC8vIDMuIEJyZWFrIGF0IHRoZSBlbmQgb2YgdGhlIGlubGluZSBlbGVtZW50IC0+ IGNvbW1pdCB3aGF0IHdlJ3ZlIGdvdCBzbyBmYXIgaW5jbHVkaW5nIHRoZSBjdXJyZW50IGVsZW1l bnQuCiAgICAgICAgIC8vIDQuIEJyZWFrIGJlZm9yZS9hZnRlciAtPiByZXF1aXJlcyBkZWRpY2F0 ZWQgcnVuIC0+IGNvbW1pdCB3aGF0IHdlJ3ZlIGdvdCBzbyBmYXIgYW5kIGFsc28gY29tbWl0IHRo ZSBjdXJyZW50IGlubGluZSBlbGVtZW50IGFzIGEgc2VwYXJhdGUgaW5saW5lIHJ1bi4KLSAgICAg ICAgYXV0byBkZXRhY2hpbmdSdWxlcyA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZSgpLmRldGFjaGlu Z1J1bGVzKGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpOworICAgICAgICBhdXRvIGRldGFjaGluZ1J1 bGVzID0gaW5saW5lSXRlbS5kZXRhY2hpbmdSdWxlcygpOwogCiAgICAgICAgIC8vICMxCiAgICAg ICAgIGlmIChkZXRhY2hpbmdSdWxlcy5pc0VtcHR5KCkpIHsKQEAgLTE5NCw3ICsxOTQsNyBAQCB2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzcGxpdElubGluZVJ1bklmTmVlZGVkKGNvbnN0 IElubGluZVJ1biYgaW5saW5lUnVuLAogICAgICAgICB9OwogCiAgICAgICAgIC8vICMyCi0gICAg ICAgIGlmIChkZXRhY2hpbmdSdWxlcyA9PSBJbmxpbmVGb3JtYXR0aW5nU3RhdGU6OkRldGFjaGlu Z1J1bGU6OkJyZWFrQXRTdGFydCkgeworICAgICAgICBpZiAoZGV0YWNoaW5nUnVsZXMgPT0gSW5s aW5lSXRlbTo6RGV0YWNoaW5nUnVsZTo6QnJlYWtBdFN0YXJ0KSB7CiAgICAgICAgICAgICBjb21t aXQoKTsKICAgICAgICAgICAgIGZpcnN0VW5jb21taXR0ZWRJbmxpbmVJdGVtID0gJmlubGluZUl0 ZW07CiAgICAgICAgICAgICB1bmNvbW1pdHRlZExlbmd0aCA9IGN1cnJlbnRMZW5ndGgoKTsKQEAg LTIwMiw3ICsyMDIsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzcGxpdElubGlu ZVJ1bklmTmVlZGVkKGNvbnN0IElubGluZVJ1biYgaW5saW5lUnVuLAogICAgICAgICB9CiAKICAg ICAgICAgLy8gIzMKLSAgICAgICAgaWYgKGRldGFjaGluZ1J1bGVzID09IElubGluZUZvcm1hdHRp bmdTdGF0ZTo6RGV0YWNoaW5nUnVsZTo6QnJlYWtBdEVuZCkgeworICAgICAgICBpZiAoZGV0YWNo aW5nUnVsZXMgPT0gSW5saW5lSXRlbTo6RGV0YWNoaW5nUnVsZTo6QnJlYWtBdEVuZCkgewogICAg ICAgICAgICAgQVNTRVJUKGZpcnN0VW5jb21taXR0ZWRJbmxpbmVJdGVtKTsKICAgICAgICAgICAg IHVuY29tbWl0dGVkTGVuZ3RoICs9IGN1cnJlbnRMZW5ndGgoKTsKICAgICAgICAgICAgIGNvbW1p dCgpOwpAQCAtNDYwLDggKzQ2MCw4IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNv bGxlY3RJbmxpbmVDb250ZW50Rm9yU3VidHJlZShjb25zdCBCb3gmIHJvb3QsIEluCiAKICAgICBp ZiAocm9vdC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkgJiYgJnJvb3QgIT0gJih0aGlz LT5yb290KCkpKSB7CiAgICAgICAgIGNyZWF0ZUFuZEFwcGVuZElubGluZUl0ZW0oKTsKKyAgICAg ICAgaW5saW5lRm9ybWF0dGluZ1N0YXRlLmlubGluZUNvbnRlbnQoKS5sYXN0KCktPmFkZERldGFj aGluZ1J1bGUoeyBJbmxpbmVJdGVtOjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0U3RhcnQsIElubGlu ZUl0ZW06OkRldGFjaGluZ1J1bGU6OkJyZWFrQXRFbmQgfSk7CiAgICAgICAgIC8vIFNraXAgZm9y bWF0dGluZyByb290IHN1YnRyZWUuIFRoZXkgYXJlIG5vdCBwYXJ0IG9mIHRoaXMgaW5saW5lIGZv cm1hdHRpbmcgY29udGV4dC4KLSAgICAgICAgaW5saW5lRm9ybWF0dGluZ1N0YXRlLnNldERldGFj aGluZ1J1bGVzKHJvb3QsIHsgSW5saW5lRm9ybWF0dGluZ1N0YXRlOjpEZXRhY2hpbmdSdWxlOjpC cmVha0F0U3RhcnQsIElubGluZUZvcm1hdHRpbmdTdGF0ZTo6RGV0YWNoaW5nUnVsZTo6QnJlYWtB dEVuZCB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTA0LDExICs1MDQsMTEgQEAg dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRlbnRGb3JTdWJ0 cmVlKGNvbnN0IEJveCYgcm9vdCwgSW4KICAgICAgICAgICAgIGZpcnN0RGVzY2VuZGFudElubGlu ZUJveCA9IGlubGluZUNvbnRlbnQuZmlyc3QoKS5nZXQoKTsKIAogICAgICAgICBBU1NFUlQoZmly c3REZXNjZW5kYW50SW5saW5lQm94KTsKLSAgICAgICAgaW5saW5lRm9ybWF0dGluZ1N0YXRlLmFk ZERldGFjaGluZ1J1bGUoZmlyc3REZXNjZW5kYW50SW5saW5lQm94LT5sYXlvdXRCb3goKSwgSW5s aW5lRm9ybWF0dGluZ1N0YXRlOjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0U3RhcnQpOworICAgICAg ICBmaXJzdERlc2NlbmRhbnRJbmxpbmVCb3gtPmFkZERldGFjaGluZ1J1bGUoSW5saW5lSXRlbTo6 RGV0YWNoaW5nUnVsZTo6QnJlYWtBdFN0YXJ0KTsKICAgICB9CiAKICAgICBpZiAocm9vdEJyZWFr c0F0RW5kKCkpCi0gICAgICAgIGlubGluZUZvcm1hdHRpbmdTdGF0ZS5hZGREZXRhY2hpbmdSdWxl KGxhc3REZXNjZW5kYW50SW5saW5lQm94LT5sYXlvdXRCb3goKSwgSW5saW5lRm9ybWF0dGluZ1N0 YXRlOjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0RW5kKTsKKyAgICAgICAgbGFzdERlc2NlbmRhbnRJ bmxpbmVCb3gtPmFkZERldGFjaGluZ1J1bGUoSW5saW5lSXRlbTo6RGV0YWNoaW5nUnVsZTo6QnJl YWtBdEVuZCk7CiB9CiAKIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxp bmVDb250ZW50KElubGluZVJ1blByb3ZpZGVyJiBpbmxpbmVSdW5Qcm92aWRlcikgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwCmluZGV4IDQxNDRmOTM1YWJlLi45MmQ3MWE0OGMw MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ1N0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwCkBAIC01MCwyMCArNTAsNiBAQCBz dGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IElubGluZUZvcm1hdHRpbmdTdGF0ZTo6 Zm9ybWF0dGluZ0NvbnRleHQoY29ucwogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPElubGlu ZUZvcm1hdHRpbmdDb250ZXh0Pihmb3JtYXR0aW5nQ29udGV4dFJvb3QsICp0aGlzKTsKIH0KIAot dm9pZCBJbmxpbmVGb3JtYXR0aW5nU3RhdGU6OmFkZERldGFjaGluZ1J1bGUoY29uc3QgQm94JiBs YXlvdXRCb3gsIERldGFjaGluZ1J1bGUgZGV0YWNoaW5nUnVsZSkKLXsKLSAgICBtX2RldGFjaGlu Z1J1bGVzLmFkZCgmbGF5b3V0Qm94LCBEZXRhY2hpbmdSdWxlIHsgfSkuaXRlcmF0b3ItPnZhbHVl LmFkZChkZXRhY2hpbmdSdWxlKTsKLX0KLQotT3B0aW9uU2V0PElubGluZUZvcm1hdHRpbmdTdGF0 ZTo6RGV0YWNoaW5nUnVsZT4gSW5saW5lRm9ybWF0dGluZ1N0YXRlOjpkZXRhY2hpbmdSdWxlcyhj b25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKLXsKLSAgICBhdXRvIGRldGFjaGluZ1J1bGVzID0g bV9kZXRhY2hpbmdSdWxlcy5nZXQoJmxheW91dEJveCk7Ci0gICAgaWYgKCFkZXRhY2hpbmdSdWxl cykKLSAgICAgICAgcmV0dXJuIHsgfTsKLQotICAgIHJldHVybiBkZXRhY2hpbmdSdWxlczsKLX0K LQogfQogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCmluZGV4IDlkN2MwNDhh YzYwLi45YmI5MDFiZmQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKQEAgLTQ4LDQz ICs0OCwxMyBAQCBwdWJsaWM6CiAgICAgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCgpIHsg cmV0dXJuIG1faW5saW5lQ29udGVudDsgfQogICAgIElubGluZUl0ZW0qIGxhc3RJbmxpbmVJdGVt KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVDb250ZW50LmlzRW1wdHkoKSA/IG51bGxwdHIgOiBt X2lubGluZUNvbnRlbnQubGFzdCgpLmdldCgpOyB9CiAKLSAgICAvLyBEZXRhY2hpbmdSdWxlIGlu ZGljYXRlcyB3aGV0aGVyIHRoZSBpbmxpbmUgZWxlbWVudCBuZWVkcyB0byBiZSB3cmFwcGVkIGlu IGEgZGVkaWNldGVkIHJ1biBvciBicmVhayBmcm9tIHByZXZpb3VzL25leHQgcnVucy4KLSAgICAv LyA8c3Bhbj5zdGFydDwvc3Bhbj48c3BhbiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlOyI+IG1p ZGRsZSA8L3NwYW4+PHNwYW4+ZW5kPC9zcGFuPgotICAgIC8vIGlucHV0IHRvIGxpbmUgYnJlYWtp bmcgLT4gPHN0YXJ0IG1pZGRsZSBlbmQ+Ci0gICAgLy8gb3V0cHV0IG9mIGxpbmUgYnJlYWtpbmcg KGNvbnNpZGVyaW5nIGluZmluaXRlIGNvbnN0cmFpbnQpIC0+IDxzdGFydCBtaWRkbGUgZW5kPgot ICAgIC8vIGR1ZSB0byB0aGUgaW4tZmxvdyBwb3NpdGlvbmluZywgdGhlIGZpbmFsIHJ1bnMgYXJl OiA8c3RhcnQ+PCBtaWRkbGUgPjxlbmQ+Ci0gICAgLy8gInN0YXJ0IiAtPiBuL2EKLSAgICAvLyAi IG1pZGRsZSAiIC0+IEJyZWFrQXRTdGFydCBhbmQgQnJlYWtBdEVuZAotICAgIC8vICJlbmQiIC0+ IG4vYQotICAgIC8vCi0gICAgLy8gPHNwYW4+cGFyZW50IDwvc3Bhbj48c3BhbiBzdHlsZT0icGFk ZGluZzogMTBweDsiPnN0YXJ0PHNwYW4+IG1pZGRsZSA8L3NwYW4+ZW5kPC9zcGFuPjxzcGFuPiBw YXJlbnQ8L3NwYW4+Ci0gICAgLy8gaW5wdXQgdG8gbGluZSBicmVha2luZyAtPiA8cGFyZW50IHN0 YXJ0IG1pZGRsZSBlbmQgcGFyZW50PgotICAgIC8vIG91dHB1dCBvZiBsaW5lIGJyZWFraW5nIChj b25zaWRlcmluZyBpbmZpbml0ZSBjb25zdHJhaW50KSAtPiA8cGFyZW50IHN0YXJ0IG1pZGRsZSBl bmQgcGFyZW50PgotICAgIC8vIGR1ZSB0byBwYWRkaW5nLCBmaW5hbCBydW5zIC0+IDxwYXJlbnQ+ PHN0YXJ0IG1pZGRsZSBlbmQ+PHBhcmVudD4KLSAgICAvLyAicGFyZW50IiAtPiBuL2EKLSAgICAv LyAic3RhcnQiIC0+IEJyZWFrQXRTdGFydAotICAgIC8vICIgbWlkZGxlICIgLT4gbi9hCi0gICAg Ly8gImVuZCIgLT4gQnJlYWtBdEVuZAotICAgIC8vICJwYXJlbnQiIC0+IG4vYQotICAgIGVudW0g Y2xhc3MgRGV0YWNoaW5nUnVsZSB7Ci0gICAgICAgIEJyZWFrQXRTdGFydCA9IDEgPDwgMCwKLSAg ICAgICAgQnJlYWtBdEVuZCA9IDEgPDwgMQotICAgIH07Ci0gICAgdm9pZCBhZGREZXRhY2hpbmdS dWxlKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEZXRhY2hpbmdSdWxlKTsKLQotICAgIE9wdGlvblNl dDxEZXRhY2hpbmdSdWxlPiBkZXRhY2hpbmdSdWxlcyhjb25zdCBCb3gmIGxheW91dEJveCkgY29u c3Q7Ci0gICAgdm9pZCBzZXREZXRhY2hpbmdSdWxlcyhjb25zdCBCb3gmIGxheW91dEJveCwgT3B0 aW9uU2V0PERldGFjaGluZ1J1bGU+IGRldGFjaGluZ1J1bGVzKSB7IG1fZGV0YWNoaW5nUnVsZXMu c2V0KCZsYXlvdXRCb3gsIGRldGFjaGluZ1J1bGVzKTsgfQotCiAgICAgLy8gVGVtcAogICAgIElu bGluZVJ1bnMmIGlubGluZVJ1bnMoKSB7IHJldHVybiBtX2lubGluZVJ1bnM7IH0KICAgICB2b2lk IGFwcGVuZElubGluZVJ1bihJbmxpbmVSdW4gaW5saW5lUnVuKSB7IG1faW5saW5lUnVucy5hcHBl bmQoaW5saW5lUnVuKTsgfQogCiBwcml2YXRlOgotICAgIHVzaW5nIERldGFjaGluZ1J1bGVzRm9y SW5saW5lSXRlbXMgPSBIYXNoTWFwPGNvbnN0IEJveCosIE9wdGlvblNldDxEZXRhY2hpbmdSdWxl Pj47Ci0KICAgICBJbmxpbmVDb250ZW50IG1faW5saW5lQ29udGVudDsKICAgICBJbmxpbmVSdW5z IG1faW5saW5lUnVuczsKLSAgICBEZXRhY2hpbmdSdWxlc0ZvcklubGluZUl0ZW1zIG1fZGV0YWNo aW5nUnVsZXM7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVJdGVtLmgKaW5kZXggYmZjYjljOGIzYmQuLjFkMTliOGNjZGUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJ dGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l SXRlbS5oCkBAIC00Myw5ICs0MywzNCBAQCBwdWJsaWM6CiAgICAgY29uc3QgQm94JiBsYXlvdXRC b3goKSBjb25zdCB7IHJldHVybiBtX2xheW91dEJveDsgfQogICAgIGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0Qm94LnN0eWxlKCk7IH0KICAgICBTdHJp bmcgdGV4dENvbnRlbnQoKSBjb25zdDsKKyAgICAvLyBEZXRhY2hpbmdSdWxlIGluZGljYXRlcyB3 aGV0aGVyIHRoZSBpbmxpbmUgZWxlbWVudCBuZWVkcyB0byBiZSB3cmFwcGVkIGluIGEgZGVkaWNl dGVkIHJ1biBvciBicmVhayBmcm9tIHByZXZpb3VzL25leHQgcnVucy4KKyAgICAvLyA8c3Bhbj5z dGFydDwvc3Bhbj48c3BhbiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlOyI+IG1pZGRsZSA8L3Nw YW4+PHNwYW4+ZW5kPC9zcGFuPgorICAgIC8vIGlucHV0IHRvIGxpbmUgYnJlYWtpbmcgLT4gPHN0 YXJ0IG1pZGRsZSBlbmQ+CisgICAgLy8gb3V0cHV0IG9mIGxpbmUgYnJlYWtpbmcgKGNvbnNpZGVy aW5nIGluZmluaXRlIGNvbnN0cmFpbnQpIC0+IDxzdGFydCBtaWRkbGUgZW5kPgorICAgIC8vIGR1 ZSB0byB0aGUgaW4tZmxvdyBwb3NpdGlvbmluZywgdGhlIGZpbmFsIHJ1bnMgYXJlOiA8c3RhcnQ+ PCBtaWRkbGUgPjxlbmQ+CisgICAgLy8gInN0YXJ0IiAtPiBuL2EKKyAgICAvLyAiIG1pZGRsZSAi IC0+IEJyZWFrQXRTdGFydCBhbmQgQnJlYWtBdEVuZAorICAgIC8vICJlbmQiIC0+IG4vYQorICAg IC8vCisgICAgLy8gPHNwYW4+cGFyZW50IDwvc3Bhbj48c3BhbiBzdHlsZT0icGFkZGluZzogMTBw eDsiPnN0YXJ0PHNwYW4+IG1pZGRsZSA8L3NwYW4+ZW5kPC9zcGFuPjxzcGFuPiBwYXJlbnQ8L3Nw YW4+CisgICAgLy8gaW5wdXQgdG8gbGluZSBicmVha2luZyAtPiA8cGFyZW50IHN0YXJ0IG1pZGRs ZSBlbmQgcGFyZW50PgorICAgIC8vIG91dHB1dCBvZiBsaW5lIGJyZWFraW5nIChjb25zaWRlcmlu ZyBpbmZpbml0ZSBjb25zdHJhaW50KSAtPiA8cGFyZW50IHN0YXJ0IG1pZGRsZSBlbmQgcGFyZW50 PgorICAgIC8vIGR1ZSB0byBwYWRkaW5nLCBmaW5hbCBydW5zIC0+IDxwYXJlbnQ+PHN0YXJ0IG1p ZGRsZSBlbmQ+PHBhcmVudD4KKyAgICAvLyAicGFyZW50IiAtPiBuL2EKKyAgICAvLyAic3RhcnQi IC0+IEJyZWFrQXRTdGFydAorICAgIC8vICIgbWlkZGxlICIgLT4gbi9hCisgICAgLy8gImVuZCIg LT4gQnJlYWtBdEVuZAorICAgIC8vICJwYXJlbnQiIC0+IG4vYQorICAgIGVudW0gY2xhc3MgRGV0 YWNoaW5nUnVsZSB7CisgICAgICAgIEJyZWFrQXRTdGFydCA9IDEgPDwgMCwKKyAgICAgICAgQnJl YWtBdEVuZCA9IDEgPDwgMQorICAgIH07CisgICAgdm9pZCBhZGREZXRhY2hpbmdSdWxlKE9wdGlv blNldDxEZXRhY2hpbmdSdWxlPiBkZXRhY2hpbmdSdWxlKSB7IG1fZGV0YWNoaW5nUnVsZXMuYWRk KGRldGFjaGluZ1J1bGUpOyB9CisgICAgT3B0aW9uU2V0PERldGFjaGluZ1J1bGU+IGRldGFjaGlu Z1J1bGVzKCkgY29uc3QgeyByZXR1cm4gbV9kZXRhY2hpbmdSdWxlczsgfQogCiBwcml2YXRlOgog ICAgIGNvbnN0IEJveCYgbV9sYXlvdXRCb3g7CisgICAgT3B0aW9uU2V0PERldGFjaGluZ1J1bGU+ IG1fZGV0YWNoaW5nUnVsZXM7CiB9OwogCiAvLyBGSVhNRTogRml4IEhhc2hTZXQvTGlzdEhhc2hT ZXQgdG8gc3VwcG9ydCBzbWFydCBwb2ludGVyIHR5cGVzLgo=