205653 2019-12-30 19:43:26 -0800 [LFC][IFC](Regression r253909) Fix fast/text/simple-line-with-br.html 2019-12-31 07:55:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1601950 0 zalan 2019-12-30 19:43:26 -0800 ssia 1601951 1 webkit-bug-importer 2019-12-30 19:43:44 -0800 <rdar://problem/58248900> 1601953 2 386548 zalan 2019-12-30 20:05:55 -0800 Created attachment 386548 Patch 1601982 3 commit-queue 2019-12-31 07:55:03 -0800 The commit-queue encountered the following flaky tests while processing attachment 386548: highlight/highlight-world-leak.html bug 205643 (author: megan_gardner@apple.com) The commit-queue is continuing to process your patch. 1601983 4 386548 commit-queue 2019-12-31 07:55:50 -0800 Comment on attachment 386548 Patch Clearing flags on attachment: 386548 Committed r253958: <https://trac.webkit.org/changeset/253958> 1601984 5 commit-queue 2019-12-31 07:55:52 -0800 All reviewed patches have been landed. Closing bug. 386548 2019-12-30 20:05:55 -0800 2019-12-31 07:55:50 -0800 Patch bug-205653-20191230200554.patch text/plain 10826 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMzNGQ4OTA2OTRiZjBl NTBmOTBmN2RjM2NkYzIyYzlhMDBmN2M5ZS4uMDE3ZmFhZmM3OTJkMTc1OTdkZmNhNDljZWUwOWM5 ZDVjZTEzMzdmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTEyLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXShSZWdyZXNz aW9uIHIyNTM5MDkpIEZpeCBmYXN0L3RleHQvc2ltcGxlLWxpbmUtd2l0aC1ici5odG1sCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU2NTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU4MjQ4OTAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGlubGluZSBjb250ZW50IGlzIGZvbGxvd2Vk IGJ5IGEgbGluZSBicmVhayAoZS5nLiB0ZXh0IGNvbnRlbnQ8YnI+KSwgdGhlIGxpbmUKKyAgICAg ICAgYnJlYWsgc2hvdWxkIG5vdCBpbml0aWF0ZSBhIG5ldyBsaW5lIHVubGVzcyB0aGUgbGluZSBp cyBlbXB0eSAoZS5nIHRleHQgY29udGVudDxicj48YnI+KS4KKyAgICAgICAgTGV0J3MgaW5jbHVk ZSB0aGUgbGluZSBicmVhayBpbiB0aGUgTGluZUNhbmRpZGF0ZUNvbnRlbnQgc28gdGhhdCB3ZSBj YW4gY2xvc2UgdGhlIGxpbmUgYnkKKyAgICAgICAgYWRkaW5nIHRoZSB0cmFpbGluZyBsaW5lIGJy ZWFrIChUaGlzIGlzIGEgcGFydGlhbCByZXZlcnQgb2YgcjI1MzkwOSkuIAorCisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpuZXh0V3JhcE9wcG9ydHVuaXR5KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUNhbmRpZGF0ZUNvbnRlbnQ6OmlubGluZVJ1bnMgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlQ29udGVudDo6dHJhaWxpbmdMaW5lQnJl YWsgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlQ29udGVu dDo6c2V0VHJhaWxpbmdMaW5lQnJlYWspOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Q2FuZGlkYXRlQ29udGVudDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUxheW91dENvbnRleHQ6OmxheW91dExpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lTGF5b3V0Q29udGV4dDo6bmV4dENvbnRlbnRGb3JMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OnRyeUFkZGluZ0lubGluZUl0ZW1zKToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0ZUNvbnRlbnQ6OnJ1bnMgY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlQ29udGVudDo6 aXNMaW5lQnJlYWsgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQ2FuZGlkYXRlQ29udGVudDo6c2V0SXNMaW5lQnJlYWspOiBEZWxldGVkLgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0Lmg6CisKIDIwMTktMTIt MzAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jl YXRlIG1lZGlhIG1pbWUgdHlwZSBjYWNoZSBiYXNlIGNsYXNzIHRvIHJlZHVjZSBkdXBsaWNhdGUg Y29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwCmluZGV4IGZhZWExNDE0YTUwZjVjYzliMGI0MWIw OTY1YWU1MzkwMjhhYWVjNDkuLjFkNGY4MDczODdlODUzMDBmZTQ0ODE4NDIwZGY1MzUzZDk3ZGI2 MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xp bmVMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKQEAgLTE0Nyw4ICsxNDcsMTIgQEAgc3RhdGlj IHNpemVfdCBuZXh0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVDb250 ZW50LCB1bnNpZ25lZCBzdGEKICAgICAgICAgLy8gMS4gRmluZCB0aGUgbmV4dCBpbmxpbmUgaXRl bSB3aXRoIGNvbnRlbnQuCiAgICAgICAgIC8vIDIuIENoZWNrIGlmIHRoZXJlJ3MgYSBzb2Z0IHdy YXAgb3Bwb3J0dW5pdHkgYmV0d2VlbiB0aGUgc3RhcnQgYW5kIHRoZSBuZXh0IGlubGluZSBpdGVt LgogICAgICAgICBhdXRvIG5leHRDb250ZW50ID0gbmV4dElubGluZUl0ZW1XaXRoQ29udGVudCgq c3RhcnRDb250ZW50ICsgMSk7Ci0gICAgICAgIGlmICgqbmV4dENvbnRlbnQgPT0gZW5kIHx8IG5l eHRDb250ZW50LmlzQXRMaW5lQnJlYWsoKSkKKyAgICAgICAgaWYgKCpuZXh0Q29udGVudCA9PSBl bmQpCiAgICAgICAgICAgICByZXR1cm4gKm5leHRDb250ZW50OworICAgICAgICBpZiAobmV4dENv bnRlbnQuaXNBdExpbmVCcmVhaygpKSB7CisgICAgICAgICAgICAvLyBXZSBhbHdheXMgc3RvcCBh dCBsaW5lIGJyZWFrcy4gVGhlIHdyYXAgcG9zaXRpb24gaXMgYWZ0ZXIgdGhlIGxpbmUgYnJlYWsu CisgICAgICAgICAgICByZXR1cm4gKm5leHRDb250ZW50ICsgMTsKKyAgICAgICAgfQogICAgICAg ICBpZiAoaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoKmlubGluZUNvbnRlbnRbKnN0YXJ0Q29udGVu dF0sICppbmxpbmVDb250ZW50WypuZXh0Q29udGVudF0pKSB7CiAgICAgICAgICAgICAvLyBUaGVy ZSdzIGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5IGJldHdlZW4gdGhlIHN0YXJ0IGFuZCB0aGUgbmV4 dENvbnRlbnQuCiAgICAgICAgICAgICAvLyBOb3cgZm9yd2FyZC1maW5kIGZyb20gdGhlIHN0YXJ0 IHBvc2l0aW9uIHRvIHNlZSB3aGVyZSB3ZSBjYW4gYWN0dWFsbHkgd3JhcC4KQEAgLTE3MywzMyAr MTc3LDMwIEBAIHN0YXRpYyBzaXplX3QgbmV4dFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJ dGVtcyYgaW5saW5lQ29udGVudCwgdW5zaWduZWQgc3RhCiB9CiAKIHN0cnVjdCBMaW5lQ2FuZGlk YXRlQ29udGVudCB7Ci0gICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5lSXRlbSYsIE9wdGlvbmFs PElubGluZUxheW91dFVuaXQ+IGxvZ2ljYWxXaWR0aCk7CisgICAgdm9pZCBhcHBlbmQoY29uc3Qg SW5saW5lSXRlbSYsIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGxvZ2ljYWxXaWR0aCA9IFdU Rjo6bnVsbG9wdCk7CiAKICAgICBib29sIGhhc0ludHJ1c2l2ZUZsb2F0cygpIGNvbnN0IHsgcmV0 dXJuICFtX2Zsb2F0cy5pc0VtcHR5KCk7IH0KLSAgICBjb25zdCBMaW5lQnJlYWtlcjo6UnVuTGlz dCYgcnVucygpIGNvbnN0IHsgcmV0dXJuIG1fcnVuczsgfQorICAgIGNvbnN0IExpbmVCcmVha2Vy OjpSdW5MaXN0JiBpbmxpbmVSdW5zKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVSdW5zOyB9CiAg ICAgY29uc3QgTGluZUxheW91dENvbnRleHQ6OkZsb2F0TGlzdCYgZmxvYXRzKCkgY29uc3QgeyBy ZXR1cm4gbV9mbG9hdHM7IH0KIAotICAgIGJvb2wgaXNMaW5lQnJlYWsoKSBjb25zdCB7IHJldHVy biBtX2lzTGluZUJyZWFrOyB9Ci0gICAgdm9pZCBzZXRJc0xpbmVCcmVhaygpOworICAgIGNvbnN0 IElubGluZUl0ZW0qIHRyYWlsaW5nTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGlu Z0xpbmVCcmVhazsgfQogCiBwcml2YXRlOgotICAgIExpbmVCcmVha2VyOjpSdW5MaXN0IG1fcnVu czsKKyAgICB2b2lkIHNldFRyYWlsaW5nTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGxpbmVC cmVha0l0ZW0pIHsgbV90cmFpbGluZ0xpbmVCcmVhayA9ICZsaW5lQnJlYWtJdGVtOyB9CisKKyAg ICBMaW5lQnJlYWtlcjo6UnVuTGlzdCBtX2lubGluZVJ1bnM7CiAgICAgTGluZUxheW91dENvbnRl eHQ6OkZsb2F0TGlzdCBtX2Zsb2F0czsKLSAgICBib29sIG1faXNMaW5lQnJlYWsgeyBmYWxzZSB9 OworICAgIGNvbnN0IElubGluZUl0ZW0qIG1fdHJhaWxpbmdMaW5lQnJlYWsgeyBudWxscHRyIH07 CiB9OwogCiB2b2lkIExpbmVDYW5kaWRhdGVDb250ZW50OjphcHBlbmQoY29uc3QgSW5saW5lSXRl bSYgaW5saW5lSXRlbSwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbG9naWNhbFdpZHRoKQog eworICAgIEFTU0VSVCghdHJhaWxpbmdMaW5lQnJlYWsoKSk7CisgICAgaWYgKGlubGluZUl0ZW0u aXNMaW5lQnJlYWsoKSkKKyAgICAgICAgcmV0dXJuIHNldFRyYWlsaW5nTGluZUJyZWFrKGlubGlu ZUl0ZW0pOwogICAgIGlmIChpbmxpbmVJdGVtLmlzRmxvYXQoKSkKICAgICAgICAgcmV0dXJuIG1f ZmxvYXRzLmFwcGVuZChtYWtlV2Vha1B0cihpbmxpbmVJdGVtKSk7Ci0gICAgbV9ydW5zLmFwcGVu ZCh7IGlubGluZUl0ZW0sICpsb2dpY2FsV2lkdGggfSk7Ci19Ci0KLXZvaWQgTGluZUNhbmRpZGF0 ZUNvbnRlbnQ6OnNldElzTGluZUJyZWFrKCkKLXsKLSAgICBBU1NFUlQoIWhhc0ludHJ1c2l2ZUZs b2F0cygpKTsKLSAgICBBU1NFUlQocnVucygpLmlzRW1wdHkoKSk7Ci0gICAgbV9pc0xpbmVCcmVh ayA9IHRydWU7CisgICAgbV9pbmxpbmVSdW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sICpsb2dpY2Fs V2lkdGggfSk7CiB9CiAKIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IGlubGluZUl0ZW1XaWR0aChj b25zdCBGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQpAQCAt MjYzLDEwICsyNjQsNiBAQCBMaW5lTGF5b3V0Q29udGV4dDo6TGluZUNvbnRlbnQgTGluZUxheW91 dENvbnRleHQ6OmxheW91dExpbmUoTGluZUJ1aWxkZXImIGxpbmUsCiAgICAgICAgIC8vIDMuIENo ZWNrIGlmIHRoZSBjb250ZW50IGZpdHMgdGhlIGxpbmUgYW5kIGNvbW1pdCB0aGUgY29udGVudCBh Y2NvcmRpbmdseSAoZnVsbCwgcGFydGlhbCBvciBub3QgY29tbWl0IGF0IGFsbCkuCiAgICAgICAg IC8vIDQuIFJldHVybiBpZiB3ZSBhcmUgYXQgdGhlIGVuZCBvZiB0aGUgbGluZSBlaXRoZXIgYnkg bm90IGJlaW5nIGFibGUgdG8gZml0IG1vcmUgY29udGVudCBvciBiZWNhdXNlIG9mIGFuIGV4cGxp Y2l0IGxpbmUgYnJlYWsuCiAgICAgICAgIGF1dG8gY2FuZGlkYXRlQ29udGVudCA9IG5leHRDb250 ZW50Rm9yTGluZShjdXJyZW50SXRlbUluZGV4LCBwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgs IGxpbmUubGluZUJveCgpLmxvZ2ljYWxXaWR0aCgpKTsKLSAgICAgICAgaWYgKGNhbmRpZGF0ZUNv bnRlbnQuaXNMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgbGluZS5hcHBlbmQoKm1faW5saW5l SXRlbXNbY3VycmVudEl0ZW1JbmRleF0sIDApOwotICAgICAgICAgICAgcmV0dXJuIGNsb3NlKGxp bmUsIGxlYWRpbmdJbmxpbmVJdGVtSW5kZXgsICsrY29tbWl0dGVkSW5saW5lSXRlbUNvdW50LCB7 IH0pOwotICAgICAgICB9CiAgICAgICAgIGlmIChjYW5kaWRhdGVDb250ZW50Lmhhc0ludHJ1c2l2 ZUZsb2F0cygpKSB7CiAgICAgICAgICAgICAvLyBBZGQgZmxvYXRzIGZpcnN0IGJlY2F1c2UgdGhl eSBzaHJpbmsgdGhlIGF2YWlsYWJsZSBob3Jpem9udGFsIHNwYWNlIGZvciB0aGUgcmVzdCBvZiB0 aGUgY29udGVudC4KICAgICAgICAgICAgIGF1dG8gcmVzdWx0ID0gdHJ5QWRkaW5nRmxvYXRJdGVt cyhsaW5lLCBjYW5kaWRhdGVDb250ZW50LmZsb2F0cygpKTsKQEAgLTI3Niw5ICsyNzMsOSBAQCBM aW5lTGF5b3V0Q29udGV4dDo6TGluZUNvbnRlbnQgTGluZUxheW91dENvbnRleHQ6OmxheW91dExp bmUoTGluZUJ1aWxkZXImIGxpbmUsCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNsb3NlKGxpbmUs IGxlYWRpbmdJbmxpbmVJdGVtSW5kZXgsIGNvbW1pdHRlZElubGluZUl0ZW1Db3VudCwgeyB9KTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBpZiAoIWNhbmRpZGF0ZUNvbnRlbnQu cnVucygpLmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoIWNhbmRpZGF0ZUNvbnRlbnQuaW5saW5l UnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgLy8gTm93IGNoZWNrIGlmIHdlIGNhbiBw dXQgdGhpcyBjb250ZW50IG9uIHRoZSBjdXJyZW50IGxpbmUuCi0gICAgICAgICAgICBhdXRvIHJl c3VsdCA9IHRyeUFkZGluZ0lubGluZUl0ZW1zKGxpbmVCcmVha2VyLCBsaW5lLCBjYW5kaWRhdGVD b250ZW50LnJ1bnMoKSk7CisgICAgICAgICAgICBhdXRvIHJlc3VsdCA9IHRyeUFkZGluZ0lubGlu ZUl0ZW1zKGxpbmVCcmVha2VyLCBsaW5lLCBjYW5kaWRhdGVDb250ZW50KTsKICAgICAgICAgICAg IGlmIChyZXN1bHQucmV2ZXJ0VG8pIHsKICAgICAgICAgICAgICAgICBBU1NFUlQoIXJlc3VsdC5j b21taXR0ZWRDb3VudCk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJlc3VsdC5pc0VuZE9mTGlu ZSA9PSBMaW5lQnJlYWtlcjo6SXNFbmRPZkxpbmU6Olllcyk7CkBAIC0yOTAsNiArMjg3LDkgQEAg TGluZUxheW91dENvbnRleHQ6OkxpbmVDb250ZW50IExpbmVMYXlvdXRDb250ZXh0OjpsYXlvdXRM aW5lKExpbmVCdWlsZGVyJiBsaW5lLAogICAgICAgICAgICAgICAgIC8vIFdlIGNhbid0IHBsYWNl IGFueSBtb3JlIGl0ZW1zIG9uIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGNsb3NlKGxpbmUsIGxlYWRpbmdJbmxpbmVJdGVtSW5kZXgsIGNvbW1pdHRlZElubGluZUl0 ZW1Db3VudCwgcmVzdWx0LnBhcnRpYWxDb250ZW50KTsKICAgICAgICAgICAgIH0KKyAgICAgICAg fSBlbHNlIGlmIChhdXRvKiB0cmFpbGluZ0xpbmVCcmVhayA9IGNhbmRpZGF0ZUNvbnRlbnQudHJh aWxpbmdMaW5lQnJlYWsoKSkgeworICAgICAgICAgICAgbGluZS5hcHBlbmQoKnRyYWlsaW5nTGlu ZUJyZWFrLCAwKTsKKyAgICAgICAgICAgIHJldHVybiBjbG9zZShsaW5lLCBsZWFkaW5nSW5saW5l SXRlbUluZGV4LCArK2NvbW1pdHRlZElubGluZUl0ZW1Db3VudCwgeyB9KTsKICAgICAgICAgfQog ICAgICAgICBjdXJyZW50SXRlbUluZGV4ID0gbGVhZGluZ0lubGluZUl0ZW1JbmRleCArIGNvbW1p dHRlZElubGluZUl0ZW1Db3VudDsKICAgICAgICAgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3Ro ID0geyB9OwpAQCAtMzQ5LDIwICszNDksMTIgQEAgTGluZUNhbmRpZGF0ZUNvbnRlbnQgTGluZUxh eW91dENvbnRleHQ6Om5leHRDb250ZW50Rm9yTGluZSh1bnNpZ25lZCBpbmxpbmVJdGVtSW4KICAg ICAgICAgKytpbmxpbmVJdGVtSW5kZXg7CiAgICAgfQogCi0gICAgLy8gQXJlIHdlIHdyYXBwaW5n IGF0IGEgbGluZSBicmVhaz8KLSAgICBhdXRvIGlzU2luZ2xlSXRlbSA9IGlubGluZUl0ZW1JbmRl eCArIDEgPT0gc29mdFdyYXBPcHBvcnR1bml0eUluZGV4OwotICAgIGlmIChpc1NpbmdsZUl0ZW0g JiYgbV9pbmxpbmVJdGVtc1tpbmxpbmVJdGVtSW5kZXhdLT5pc0xpbmVCcmVhaygpKSB7Ci0gICAg ICAgIGNhbmRpZGF0ZUNvbnRlbnQuc2V0SXNMaW5lQnJlYWsoKTsKLSAgICAgICAgcmV0dXJuIGNh bmRpZGF0ZUNvbnRlbnQ7Ci0gICAgfQotCiAgICAgZm9yIChhdXRvIGluZGV4ID0gaW5saW5lSXRl bUluZGV4OyBpbmRleCA8IHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleDsgKytpbmRleCkgewogICAg ICAgICBhdXRvJiBpbmxpbmVJdGVtID0gKm1faW5saW5lSXRlbXNbaW5kZXhdOwotICAgICAgICBB U1NFUlQoIWlubGluZUl0ZW0uaXNMaW5lQnJlYWsoKSk7CiAgICAgICAgIGlmIChpbmxpbmVJdGVt LmlzRmxvYXQoKSkgewogICAgICAgICAgICAgLy8gRmxvYXRzIGFyZSBub3QgcGFydCBvZiB0aGUg bGluZSBjb250ZXh0LgogICAgICAgICAgICAgLy8gRklYTUU6IENoZWNrIGlmIHRoZWlyIHdpZHRo IHNob3VsZCBiZSBhZGRlZCB0byBjdXJyZW50TG9naWNhbFJpZ2h0LgotICAgICAgICAgICAgY2Fu ZGlkYXRlQ29udGVudC5hcHBlbmQoaW5saW5lSXRlbSwgeyB9KTsKKyAgICAgICAgICAgIGNhbmRp ZGF0ZUNvbnRlbnQuYXBwZW5kKGlubGluZUl0ZW0pOwogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIH0KICAgICAgICAgYXV0byBpbmxpbmVJdGVubVdpZHRoID0gaW5saW5lSXRlbVdpZHRo KGZvcm1hdHRpbmdDb250ZXh0KCksIGlubGluZUl0ZW0sIGN1cnJlbnRMb2dpY2FsUmlnaHQpOwpA QCAtMzk1LDcgKzM4Nyw3IEBAIExpbmVMYXlvdXRDb250ZXh0OjpSZXN1bHQgTGluZUxheW91dENv bnRleHQ6OnRyeUFkZGluZ0Zsb2F0SXRlbXMoTGluZUJ1aWxkZXImIGxpCiAgICAgcmV0dXJuIHsg TGluZUJyZWFrZXI6OklzRW5kT2ZMaW5lOjpObywgY29tbWl0dGVkRmxvYXRJdGVtQ291bnQgfTsK IH0KIAotTGluZUxheW91dENvbnRleHQ6OlJlc3VsdCBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRk aW5nSW5saW5lSXRlbXMoTGluZUJyZWFrZXImIGxpbmVCcmVha2VyLCBMaW5lQnVpbGRlciYgbGlu ZSwgY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmIGNhbmRpZGF0ZVJ1bnMpCitMaW5lTGF5b3V0 Q29udGV4dDo6UmVzdWx0IExpbmVMYXlvdXRDb250ZXh0Ojp0cnlBZGRpbmdJbmxpbmVJdGVtcyhM aW5lQnJlYWtlciYgbGluZUJyZWFrZXIsIExpbmVCdWlsZGVyJiBsaW5lLCBjb25zdCBMaW5lQ2Fu ZGlkYXRlQ29udGVudCYgY2FuZGlkYXRlQ29udGVudCkKIHsKICAgICBhdXRvIHNob3VsZERpc2Fi bGVIeXBoZW5hdGlvbiA9IFsmXSB7CiAgICAgICAgIGF1dG8mIHN0eWxlID0gcm9vdCgpLnN0eWxl KCk7CkBAIC00MDgsMTAgKzQwMCwxNiBAQCBMaW5lTGF5b3V0Q29udGV4dDo6UmVzdWx0IExpbmVM YXlvdXRDb250ZXh0Ojp0cnlBZGRpbmdJbmxpbmVJdGVtcyhMaW5lQnJlYWtlciYgbAogICAgIGlm IChzaG91bGREaXNhYmxlSHlwaGVuYXRpb24oKSkKICAgICAgICAgbGluZUJyZWFrZXIuc2V0SHlw aGVuYXRpb25EaXNhYmxlZCgpOwogCisgICAgYXV0byYgY2FuZGlkYXRlUnVucyA9IGNhbmRpZGF0 ZUNvbnRlbnQuaW5saW5lUnVucygpOwogICAgIGF1dG8gcmVzdWx0ID0gbGluZUJyZWFrZXIuc2hv dWxkV3JhcElubGluZUNvbnRlbnQoY2FuZGlkYXRlUnVucywgbGluZVN0YXR1cyk7CiAgICAgaWYg KHJlc3VsdC5hY3Rpb24gPT0gTGluZUJyZWFrZXI6OlJlc3VsdDo6QWN0aW9uOjpLZWVwKSB7CiAg ICAgICAgIC8vIFRoaXMgY29udGludW91cyBjb250ZW50IGNhbiBiZSBmdWxseSBwbGFjZWQgb24g dGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgY29tbWl0Q29udGVudChsaW5lLCBjYW5kaWRhdGVS dW5zLCB7IH0pOworICAgICAgICAvLyBDb25zdW1lIHRyYWlsaW5nIGxpbmUgYnJlYWsgYXMgd2Vs bC4KKyAgICAgICAgaWYgKGF1dG8qIGxpbmVCcmVha0l0ZW0gPSBjYW5kaWRhdGVDb250ZW50LnRy YWlsaW5nTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGxpbmUuYXBwZW5kKCpsaW5lQnJlYWtJ dGVtLCAwKTsKKyAgICAgICAgICAgIHJldHVybiB7IExpbmVCcmVha2VyOjpJc0VuZE9mTGluZTo6 WWVzLCBjYW5kaWRhdGVSdW5zLnNpemUoKSArIDEgfTsKKyAgICAgICAgfQogICAgICAgICByZXR1 cm4geyByZXN1bHQuaXNFbmRPZkxpbmUsIGNhbmRpZGF0ZVJ1bnMuc2l6ZSgpIH07CiAgICAgfQog ICAgIGlmIChyZXN1bHQuYWN0aW9uID09IExpbmVCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6UHVz aCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKaW5kZXggMTczMTYwMWVjZTUyNGUyY2M2YWY5Zjc1NzIx ZDM4ZTJhZjNiYjVmZC4uYTc1ZGM0YTQ0NDlkYjlmOTNjZWYwNTlkNTc2NDQ3ZDcwZGUwMmQyZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5oCkBAIC02Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAgICAgICAg IGNvbnN0IElubGluZUl0ZW0qIHJldmVydFRvIHsgbnVsbHB0ciB9OwogICAgIH07CiAgICAgUmVz dWx0IHRyeUFkZGluZ0Zsb2F0SXRlbXMoTGluZUJ1aWxkZXImLCBjb25zdCBGbG9hdExpc3QmKTsK LSAgICBSZXN1bHQgdHJ5QWRkaW5nSW5saW5lSXRlbXMoTGluZUJyZWFrZXImLCBMaW5lQnVpbGRl ciYsIGNvbnN0IExpbmVCcmVha2VyOjpSdW5MaXN0Jik7CisgICAgUmVzdWx0IHRyeUFkZGluZ0lu bGluZUl0ZW1zKExpbmVCcmVha2VyJiwgTGluZUJ1aWxkZXImLCBjb25zdCBMaW5lQ2FuZGlkYXRl Q29udGVudCYpOwogICAgIHZvaWQgY29tbWl0Q29udGVudChMaW5lQnVpbGRlciYsIGNvbnN0IExp bmVCcmVha2VyOjpSdW5MaXN0JiwgT3B0aW9uYWw8TGluZUJyZWFrZXI6OlJlc3VsdDo6UGFydGlh bFRyYWlsaW5nQ29udGVudD4pOwogICAgIExpbmVDb250ZW50IGNsb3NlKExpbmVCdWlsZGVyJiwg dW5zaWduZWQgbGVhZGluZ0lubGluZUl0ZW1JbmRleCwgdW5zaWduZWQgY29tbWl0dGVkSW5saW5l SXRlbUNvdW50LCBPcHRpb25hbDxMaW5lQ29udGVudDo6UGFydGlhbENvbnRlbnQ+KTsKIAo=