298818 2025-09-13 10:30:45 -0700 [cleanup] Let's pass in the candidate content start/end index to LineBuilder::candidateContentForLine 2025-09-15 05:15:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2142771 0 zalan 2025-09-13 10:30:45 -0700 ssia 2142774 1 476714 zalan 2025-09-13 10:33:19 -0700 Created attachment 476714 [fast-cq]Patch 2142933 2 ews-feeder 2025-09-15 05:14:48 -0700 Committed 299951@main (dd9b04e1dcfb): <https://commits.webkit.org/299951@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 476714. 2142934 3 webkit-bug-importer 2025-09-15 05:15:14 -0700 <rdar://problem/160604876> 476714 2025-09-13 10:33:19 -0700 2025-09-15 05:14:48 -0700 [fast-cq]Patch bug-298818-20250913103319.patch text/plain 10366 zalan RnJvbSBhMTJiYzk5YjE0MGZlZjIyY2M0OGRiNjA2NmUwNDdjYzE4ZjIwMWQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTMgU2VwIDIwMjUgMTA6MzA6NTUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbY2xlYW51 cF0gTGV0J3MgcGFzcyBpbiB0aGUgY2FuZGlkYXRlIGNvbnRlbnQgc3RhcnQvZW5kIGluZGV4CiB0 byBMaW5lQnVpbGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUKIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTg4MTgKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgoKVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdXNpbmcgY2FuZGlkYXRlQ29udGVudEZvckxp bmUgdG8gcmVidWlsZCB0aGUgbGluZSAoc2VlIExpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZVdpdGhJ bmxpbmVDb250ZW50KSB3aGVyZSB0aGUgImVuZCBpbmRleCIgbWF5IG5vdCBiZQp0aGUgbmV4dCBz b2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQW5kRmxvYXRDb250ZW50KToKKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKToKKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lV2l0aElubGluZUNvbnRlbnQpOgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVy Lmg6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgICAgICAgICAgICAgIHwg MzMgKysrKysrKysrLS0tLS0tLS0tLQogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oICAg ICAgICAgICAgICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwg MTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CmluZGV4IGQ1Y2U1ZDJjNWQ3Yy4uNWE4ODZkMDg5Mjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC00NTcsNyArNDU3LDggQEAgVW5pcXVlUmVmPExpbmVD b250ZW50PiBMaW5lQnVpbGRlcjo6cGxhY2VJbmxpbmVBbmRGbG9hdENvbnRlbnQoY29uc3QgSW5s aW5lSXRlbVIKICAgICAgICAgICAgIC8vIDIuIEFwcGx5IGZsb2F0cyBhbmQgc2hyaW5rIHRoZSBh dmFpbGFibGUgaG9yaXpvbnRhbCBzcGFjZSBlLmcuIDxzcGFuPmludHJ1XzxkaXYgc3R5bGU9ImZs b2F0OiBsZWZ0Ij48L2Rpdj5zaXZlX2Zsb2F0PC9zcGFuPi4KICAgICAgICAgICAgIC8vIDMuIENo ZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgdGhlIGxpbmUgYW5kIGNvbW1pdCB0aGUgY29udGVudCBh Y2NvcmRpbmdseSAoZnVsbCwgcGFydGlhbCBvciBub3QgY29tbWl0IGF0IGFsbCkuCiAgICAgICAg ICAgICAvLyA0LiBSZXR1cm4gaWYgd2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUgZWl0aGVy IGJ5IG5vdCBiZWluZyBhYmxlIHRvIGZpdCBtb3JlIGNvbnRlbnQgb3IgYmVjYXVzZSBvZiBhbiBl eHBsaWNpdCBsaW5lIGJyZWFrLgotICAgICAgICAgICAgY2FuZGlkYXRlQ29udGVudEZvckxpbmUo bGluZUNhbmRpZGF0ZSwgY3VycmVudEl0ZW1JbmRleCwgbmVlZHNMYXlvdXRSYW5nZSwgbV9saW5l LmNvbnRlbnRMb2dpY2FsUmlnaHQoKSk7CisgICAgICAgICAgICBhdXRvIGNhbmlkYXRlU3RhcnRF bmRJbmRleCA9IHN0ZDo6cGFpcjxzaXplX3QsIHNpemVfdD4geyBjdXJyZW50SXRlbUluZGV4LCBm b3JtYXR0aW5nQ29udGV4dCgpLmZvcm1hdHRpbmdVdGlscygpLm5leHRXcmFwT3Bwb3J0dW5pdHko Y3VycmVudEl0ZW1JbmRleCwgbmVlZHNMYXlvdXRSYW5nZSwgbV9pbmxpbmVJdGVtTGlzdCkgfTsK KyAgICAgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKGxpbmVDYW5kaWRhdGUsIGNhbmlk YXRlU3RhcnRFbmRJbmRleCwgbmVlZHNMYXlvdXRSYW5nZSwgbV9saW5lLmNvbnRlbnRMb2dpY2Fs UmlnaHQoKSk7CiAgICAgICAgICAgICAvLyBOb3cgY2hlY2sgaWYgd2UgY2FuIHB1dCB0aGlzIGNv bnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgICAgIGlmIChhdXRvKiBmbG9hdEl0 ZW0gPSBsaW5lQ2FuZGlkYXRlLT5mbG9hdEl0ZW0pIHsKICAgICAgICAgICAgICAgICBBU1NFUlQo bGluZUNhbmRpZGF0ZS0+aW5saW5lQ29udGVudC5pc0VtcHR5KCkpOwpAQCAtNjU0LDI3ICs2NTUs MjIgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6dHJhaWxpbmdQdW5jdHVhdGlvbk9y U3RvcE9yQ29tbWFXaWR0aEZvckxpbmVDYW5kaWEKICAgICByZXR1cm4geyB9OwogfQogCi12b2lk IExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiBsaW5l Q2FuZGlkYXRlLCBzaXplX3QgY3VycmVudElubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRl bVJhbmdlJiBsYXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50TG9naWNhbFJpZ2h0 KQordm9pZCBMaW5lQnVpbGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0 ZSYgbGluZUNhbmRpZGF0ZSwgc3RkOjpwYWlyPHNpemVfdCwgc2l6ZV90PiBzdGFydEVuZEluZGV4 LCBjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGN1 cnJlbnRMb2dpY2FsUmlnaHQpCiB7Ci0gICAgQVNTRVJUKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgg PCBsYXlvdXRSYW5nZS5lbmRJbmRleCgpKTsKKyAgICBBU1NFUlQoc3RhcnRFbmRJbmRleC5maXJz dCA8IGxheW91dFJhbmdlLmVuZEluZGV4KCkpOworICAgIEFTU0VSVChzdGFydEVuZEluZGV4LnNl Y29uZCA8PSBsYXlvdXRSYW5nZS5lbmRJbmRleCgpKTsKIAogICAgIGF1dG8gaXNGaXJzdEZvcm1h dHRlZExpbmVDYW5kaWRhdGUgPSB0aGlzLT5pc0ZpcnN0Rm9ybWF0dGVkTGluZUNhbmRpZGF0ZSgp OwogICAgIGxpbmVDYW5kaWRhdGUucmVzZXQoKTsKLSAgICAvLyAxLiBTaW1wbHkgYWRkIGFueSBv dmVyZmxvdyBjb250ZW50IGZyb20gdGhlIHByZXZpb3VzIGxpbmUgdG8gdGhlIGNhbmRpZGF0ZSBj b250ZW50LiBJdCdzIGFsd2F5cyBhIHRleHQgY29udGVudC4KLSAgICAvLyAyLiBGaW5kIHRoZSBu ZXh0IHNvZnQgd3JhcCBwb3NpdGlvbiBvciBleHBsaWNpdCBsaW5lIGJyZWFrLgotICAgIC8vIDMu IENvbGxlY3QgZmxvYXRzIGJldHdlZW4gdGhlIGlubGluZSBjb250ZW50LgotICAgIGF1dG8gc29m dFdyYXBPcHBvcnR1bml0eUluZGV4ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5mb3JtYXR0aW5nVXRp bHMoKS5uZXh0V3JhcE9wcG9ydHVuaXR5KGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGxheW91dFJh bmdlLCBtX2lubGluZUl0ZW1MaXN0KTsKLSAgICAvLyBzb2Z0V3JhcE9wcG9ydHVuaXR5SW5kZXgg PT0gbGF5b3V0UmFuZ2UuZW5kIG1lYW5zIHdlIGRvbid0IGhhdmUgYW55IHdyYXAgb3Bwb3J0dW5p dHkgaW4gdGhpcyBjb250ZW50LgotICAgIEFTU0VSVChzb2Z0V3JhcE9wcG9ydHVuaXR5SW5kZXgg PD0gbGF5b3V0UmFuZ2UuZW5kSW5kZXgoKSk7Ci0KLSAgICBhdXRvIGlzTGVhZGluZ1BhcnRpYUNv bnRlbnQgPSBjdXJyZW50SW5saW5lSXRlbUluZGV4ID09IGxheW91dFJhbmdlLnN0YXJ0SW5kZXgo KSAmJiBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW07CisKKyAgICBhdXRvIGlzTGVhZGluZ1BhcnRp YUNvbnRlbnQgPSBzdGFydEVuZEluZGV4LmZpcnN0ID09IGxheW91dFJhbmdlLnN0YXJ0SW5kZXgo KSAmJiBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW07CiAgICAgaWYgKGlzTGVhZGluZ1BhcnRpYUNv bnRlbnQpIHsKICAgICAgICAgQVNTRVJUKCFtX292ZXJmbG93aW5nTG9naWNhbFdpZHRoKTsKICAg ICAgICAgLy8gSGFuZGxlIGxlYWRpbmcgcGFydGlhbCBjb250ZW50IGZpcnN0IChvdmVyZmxvd2lu ZyB0ZXh0IGZyb20gdGhlIHByZXZpb3VzIGxpbmUpLgogICAgICAgICBhdXRvIGl0ZW1XaWR0aCA9 IGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGluZ1V0aWxzKCkuaW5saW5lSXRlbVdpZHRoKCpt X3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0sIGN1cnJlbnRMb2dpY2FsUmlnaHQsIGlzRmlyc3RGb3Jt YXR0ZWRMaW5lQ2FuZGlkYXRlKTsKICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50 LmFwcGVuZElubGluZUl0ZW0oKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgbV9wYXJ0aWFsTGVh ZGluZ1RleHRJdGVtLT5zdHlsZSgpLCBpdGVtV2lkdGgpOwogICAgICAgICBjdXJyZW50TG9naWNh bFJpZ2h0ICs9IGl0ZW1XaWR0aDsKLSAgICAgICAgKytjdXJyZW50SW5saW5lSXRlbUluZGV4Owor ICAgICAgICArK3N0YXJ0RW5kSW5kZXguZmlyc3Q7CiAgICAgfQogCiAgICAgYXV0byBmaXJzdElu bGluZVRleHRJdGVtSW5kZXggPSBzdGQ6Om9wdGlvbmFsPHNpemVfdD4geyB9OwpAQCAtNjgzLDcg KzY3OSw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVD YW5kaWRhdGUmIGxpbmVDYW5kaWRhdGUsIHNpemVfdCBjCiAgICAgYXV0byB0ZXh0U3BhY2luZ0Fk anVzdG1lbnQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGNvbnRlbnRIYXNJbmxp bmVJdGVtc1dpdGhEZWNvcmF0aW9uQ2xvbmUgPSAhbV9saW5lLmlubGluZUJveExpc3RXaXRoQ2xv bmVkRGVjb3JhdGlvbkVuZCgpLmlzRW1wdHkoKTsKIAotICAgIGZvciAoYXV0byBpbmRleCA9IGN1 cnJlbnRJbmxpbmVJdGVtSW5kZXg7IGluZGV4IDwgc29mdFdyYXBPcHBvcnR1bml0eUluZGV4OyAr K2luZGV4KSB7CisgICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRFbmRJbmRleC5maXJzdDsgaW5k ZXggPCBzdGFydEVuZEluZGV4LnNlY29uZDsgKytpbmRleCkgewogICAgICAgICBhdXRvJiBpbmxp bmVJdGVtID0gbV9pbmxpbmVJdGVtTGlzdFtpbmRleF07CiAgICAgICAgIGF1dG8mIHN0eWxlID0g aXNGaXJzdEZvcm1hdHRlZExpbmVDYW5kaWRhdGUgPyBpbmxpbmVJdGVtLmZpcnN0TGluZVN0eWxl KCkgOiBpbmxpbmVJdGVtLnN0eWxlKCk7CiAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzSW5saW5l Qm94U3RhcnQoKSkgewpAQCAtNzAxLDcgKzY5Nyw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmNhbmRp ZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5kaWRhdGUsIHNpemVfdCBj CiAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzRmxvYXQoKSkgewogICAgICAgICAgICAgbGluZUNh bmRpZGF0ZS5mbG9hdEl0ZW0gPSAmaW5saW5lSXRlbTsKICAgICAgICAgICAgIC8vIFRoaXMgaXMg YSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHksIG11c3QgYmUgdGhlIG9ubHkgaXRlbSBpbiB0aGUgbGlz dC4KLSAgICAgICAgICAgIEFTU0VSVChjdXJyZW50SW5saW5lSXRlbUluZGV4ICsgMSA9PSBzb2Z0 V3JhcE9wcG9ydHVuaXR5SW5kZXgpOworICAgICAgICAgICAgQVNTRVJUKHN0YXJ0RW5kSW5kZXgu Zmlyc3QgKyAxID09IHN0YXJ0RW5kSW5kZXguc2Vjb25kKTsKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CiAgICAgICAgIGlmIChhdXRvKiBpbmxpbmVUZXh0SXRlbSA9IGR5bmFtaWNE b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSkpIHsKQEAgLTc0OCw3ICs3NDQsNyBA QCB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRl JiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgYwogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgICAgICAg ICAvLyBTaW5jZSBib3RoIDxicj4gYW5kIDx3YnI+IGFyZSBleHBsaWNpdCB3b3JkIGJyZWFrIG9w cG9ydHVuaXRpZXMgdGhleSBoYXZlIHRvIGJlIHRyYWlsaW5nIGl0ZW1zIGluIHRoaXMgY2FuZGlk YXRlIHJ1biBsaXN0IHVubGVzcyB0aGV5IGFyZSBlbWJlZGRlZCBpbiBpbmxpbmUgYm94ZXMuCiAg ICAgICAgICAgICAvLyBlLmcuIDxzcGFuPjx3YnI+PC9zcGFuPgotICAgICAgICAgICAgZm9yIChh dXRvIGkgPSBpbmRleCArIDE7IGkgPCBzb2Z0V3JhcE9wcG9ydHVuaXR5SW5kZXg7ICsraSkKKyAg ICAgICAgICAgIGZvciAoYXV0byBpID0gaW5kZXggKyAxOyBpIDwgc3RhcnRFbmRJbmRleC5zZWNv bmQ7ICsraSkKICAgICAgICAgICAgICAgICBBU1NFUlQobV9pbmxpbmVJdGVtTGlzdFtpXS5pc0lu bGluZUJveEVuZCgpIHx8IG1faW5saW5lSXRlbUxpc3RbaV0uaXNPcGFxdWUoKSk7CiAjZW5kaWYK ICAgICAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5hcHBlbmRJbmxpbmVJdGVt KGlubGluZUl0ZW0sIHN0eWxlLCB7IH0pOwpAQCAtNzY4LDcgKzc2NCw3IEBAIHZvaWQgTGluZUJ1 aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVDYW5kaWRh dGUsIHNpemVfdCBjCiAgICAgICAgIGlmICghaGFuZ2luZ0NvbnRlbnRXaWR0aCAmJiBsYXN0SW5s aW5lVGV4dEl0ZW1JbmRleCkKICAgICAgICAgICAgIGhhbmdpbmdDb250ZW50V2lkdGggKz0gdHJh aWxpbmdQdW5jdHVhdGlvbk9yU3RvcE9yQ29tbWFXaWR0aEZvckxpbmVDYW5kaWF0ZSgqbGFzdElu bGluZVRleHRJdGVtSW5kZXgsIGxheW91dFJhbmdlLmVuZEluZGV4KCkpOwogICAgICAgICBpZiAo Zmlyc3RJbmxpbmVUZXh0SXRlbUluZGV4KQotICAgICAgICAgICAgaGFuZ2luZ0NvbnRlbnRXaWR0 aCArPSBsZWFkaW5nUHVuY3R1YXRpb25XaWR0aEZvckxpbmVDYW5kaWF0ZSgqZmlyc3RJbmxpbmVU ZXh0SXRlbUluZGV4LCBjdXJyZW50SW5saW5lSXRlbUluZGV4KTsKKyAgICAgICAgICAgIGhhbmdp bmdDb250ZW50V2lkdGggKz0gbGVhZGluZ1B1bmN0dWF0aW9uV2lkdGhGb3JMaW5lQ2FuZGlhdGUo KmZpcnN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc3RhcnRFbmRJbmRleC5maXJzdCk7CiAgICAgICAg IGlmIChoYW5naW5nQ29udGVudFdpZHRoKQogICAgICAgICAgICAgbGluZUNhbmRpZGF0ZS5pbmxp bmVDb250ZW50LnNldEhhbmdpbmdDb250ZW50V2lkdGgoaGFuZ2luZ0NvbnRlbnRXaWR0aCk7CiAg ICAgfTsKQEAgLTc3Nyw3ICs3NzMsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250 ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgYwogICAgIGF1 dG8gc2V0VHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSBbJl0gewogICAgICAgICBpZiAoIXRyYWls aW5nU29mdEh5cGhlbklubGluZVRleHRJdGVtSW5kZXgpCiAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIGZvciAoYXV0byBpbmRleCA9ICp0cmFpbGluZ1NvZnRIeXBoZW5JbmxpbmVUZXh0SXRl bUluZGV4OyBpbmRleCA8IHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleDsgKytpbmRleCkgeworICAg ICAgICBmb3IgKGF1dG8gaW5kZXggPSAqdHJhaWxpbmdTb2Z0SHlwaGVuSW5saW5lVGV4dEl0ZW1J bmRleDsgaW5kZXggPCBzdGFydEVuZEluZGV4LnNlY29uZDsgKytpbmRleCkgewogICAgICAgICAg ICAgaWYgKCFpczxJbmxpbmVUZXh0SXRlbT4obV9pbmxpbmVJdGVtTGlzdFtpbmRleF0pKQogICAg ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtNzg2LDcgKzc4Miw3IEBAIHZvaWQg TGluZUJ1aWxkZXI6OmNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lKExpbmVDYW5kaWRhdGUmIGxpbmVD YW5kaWRhdGUsIHNpemVfdCBjCiAgICAgICAgIGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudC5z ZXRUcmFpbGluZ1NvZnRIeXBoZW5XaWR0aChUZXh0VXRpbDo6aHlwaGVuV2lkdGgoc3R5bGUpKTsK ICAgICB9OwogICAgIHNldFRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCk7Ci0gICAgbGluZUNhbmRp ZGF0ZS5pbmxpbmVDb250ZW50LnNldEhhc1RyYWlsaW5nU29mdFdyYXBPcHBvcnR1bml0eShoYXNU cmFpbGluZ1NvZnRXcmFwT3Bwb3J0dW5pdHkoc29mdFdyYXBPcHBvcnR1bml0eUluZGV4LCBsYXlv dXRSYW5nZS5lbmRJbmRleCgpLCBtX2lubGluZUl0ZW1MaXN0KSk7CisgICAgbGluZUNhbmRpZGF0 ZS5pbmxpbmVDb250ZW50LnNldEhhc1RyYWlsaW5nU29mdFdyYXBPcHBvcnR1bml0eShoYXNUcmFp bGluZ1NvZnRXcmFwT3Bwb3J0dW5pdHkoc3RhcnRFbmRJbmRleC5zZWNvbmQsIGxheW91dFJhbmdl LmVuZEluZGV4KCksIG1faW5saW5lSXRlbUxpc3QpKTsKIH0KIAogc3RhdGljIGlubGluZSBJbmxp bmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKGNvbnN0IExpbmUmIGxpbmUsIElubGluZUxheW91 dFVuaXQgbGluZVdpZHRoLCBzdGQ6Om9wdGlvbmFsPEludHJpbnNpY1dpZHRoTW9kZT4gaW50cmlu c2ljV2lkdGhNb2RlKQpAQCAtMTMyMCw2ICsxMzE2LDcgQEAgc2l6ZV90IExpbmVCdWlsZGVyOjpy ZWJ1aWxkTGluZVdpdGhJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0 UmEKICAgICAvLyBXZSBtaWdodCBhbHJlYWR5IGhhdmUgYWRkZWQgZmxvYXRzLiBUaGV5IHNocmlu ayB0aGUgYXZhaWxhYmxlIGhvcml6b250YWwgc3BhY2UgZm9yIHRoZSBsaW5lLgogICAgIC8vIExl dCdzIGp1c3QgcmV1c2Ugd2hhdCB0aGUgbGluZSBoYXMgYXQgdGhpcyBwb2ludC4KICAgICBtX2xp bmUuaW5pdGlhbGl6ZShtX2xpbmVTcGFubmluZ0lubGluZUJveGVzLCBpc0ZpcnN0Rm9ybWF0dGVk TGluZUNhbmRpZGF0ZSgpKTsKKwogICAgIGlmIChtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0pIHsK ICAgICAgICAgbV9saW5lLmFwcGVuZCgqbV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtLCBtX3BhcnRp YWxMZWFkaW5nVGV4dEl0ZW0tPnN0eWxlKCksIGZvcm1hdHRpbmdDb250ZXh0KCkuZm9ybWF0dGlu Z1V0aWxzKCkuaW5saW5lSXRlbVdpZHRoKCptX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0sIHsgfSwg aXNGaXJzdEZvcm1hdHRlZExpbmVDYW5kaWRhdGUoKSkpOwogICAgICAgICArK251bWJlck9mSW5s aW5lSXRlbXNPbkxpbmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAppbmRl eCA3ZGM3MDllMjk2YTIuLjk2MDUwZjAyYjFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5oCkBAIC00Miw3ICs0Miw3IEBAIHB1YmxpYzoKICAgICBMaW5lTGF5b3V0UmVz dWx0IGxheW91dElubGluZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JiwgY29uc3Qgc3RkOjpvcHRp b25hbDxQcmV2aW91c0xpbmU+JiwgYm9vbCBpc0ZpcnN0Rm9ybWF0dGVkTGluZUNhbmRpZGF0ZSkg ZmluYWw7CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5l Q2FuZGlkYXRlJiwgc2l6ZV90IGlubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdl JiBuZWVkc0xheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGN1cnJlbnRMb2dpY2FsUmlnaHQp OworICAgIHZvaWQgY2FuZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0ZSYsIHN0ZDo6 cGFpcjxzaXplX3QsIHNpemVfdD4gc3RhcnRFbmRJbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdl JiBuZWVkc0xheW91dFJhbmdlLCBJbmxpbmVMYXlvdXRVbml0IGN1cnJlbnRMb2dpY2FsUmlnaHQp OwogICAgIElubGluZUxheW91dFVuaXQgbGVhZGluZ1B1bmN0dWF0aW9uV2lkdGhGb3JMaW5lQ2Fu ZGlhdGUoc2l6ZV90IGZpcnN0SW5saW5lVGV4dEl0ZW1JbmRleCwgc2l6ZV90IGNhbmRpZGF0ZUNv bnRlbnRTdGFydEluZGV4KSBjb25zdDsKICAgICBJbmxpbmVMYXlvdXRVbml0IHRyYWlsaW5nUHVu Y3R1YXRpb25PclN0b3BPckNvbW1hV2lkdGhGb3JMaW5lQ2FuZGlhdGUoc2l6ZV90IGxhc3RJbmxp bmVUZXh0SXRlbUluZGV4LCBzaXplX3QgbGF5b3V0UmFuZ2VFbmQpIGNvbnN0OwogCg==