205193 2019-12-12 19:28:41 -0800 [LFC][IFC] Fix fast/text/simple-line-with-multiple-renderers.html 2019-12-13 05:47:56 -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 1598236 0 zalan 2019-12-12 19:28:41 -0800 ssia 1598237 1 webkit-bug-importer 2019-12-12 19:29:04 -0800 <rdar://problem/57900709> 1598238 2 385572 zalan 2019-12-12 19:36:24 -0800 Created attachment 385572 Patch 1598311 3 zalan 2019-12-13 05:47:56 -0800 Committed r253468: <https://trac.webkit.org/changeset/253468> 385572 2019-12-12 19:36:24 -0800 2019-12-13 00:57:09 -0800 Patch bug-205193-20191212193623.patch text/plain 10296 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEwMWQ2MThkYzQ1MjY2 MGNlYzAxYzYxNGVmODE4ODI5ZDhiM2EwZi4uNzA0N2YyZTI0ZDdiMWVjZDJlNzkxYWEwYzMyMzRh ZDE3N2E2OWVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTEyLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBGaXggZmFz dC90ZXh0L3NpbXBsZS1saW5lLXdpdGgtbXVsdGlwbGUtcmVuZGVyZXJzLmh0bWwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTE5MworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTc5MDA3MDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVXNlIExhenlMaW5lQnJlYWtJdGVyYXRvciB0byBmaW5kIG91dCBp ZiAyICh2aXN1YWxseSlhZGphY2VudCBub24td2hpdGVzcGFjZSBpbmxpbmUgaXRlbXMgYXJlCisg ICAgICAgIG9uIGEgc29mdCBicmVha2luZyBvcHBvcnR1bml0eS4KKworICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6ZW5kc1dpdGhCcmVha2luZ09wcG9ydHVuaXR5KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJyZWFrZXI6OkNvbnRlbnQ6OmlzQXRDb250ZW50Qm91bmRhcnkpOgor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6bW92ZVRvTmV4dEJyZWFrYWJsZVBvc2l0aW9uKToKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRVdGlsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OmZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24p OgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaDoKKwog MjAxOS0xMi0xMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0ludGVncmF0aW9uXSBQYWludCBzZWVtaW5nbHkgYmxhbmsgcnVucyAoMCB3aWR0aCwgcmVz dWx0IG9mIG5lZ2F0aXZlIGxldHRlci1zcGFjaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmlu ZGV4IDViNDliNzcwZTFkZGVmN2YzYTNjYjQ0MDE1YzMxMmE4MzNkMzliNmYuLjZlOWE5MzNhZWE4 NzVjYjIwOTI2ZjBiNTZkM2M1MWIzNTFjM2MzZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAK QEAgLTIyMyw2ICsyMjMsMzAgQEAgT3B0aW9uYWw8TGluZUJyZWFrZXI6OkxlZnRTaWRlPiBMaW5l QnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENvbnRlbnQ6OlIKICAgICByZXR1cm4g TGVmdFNpZGUgeyBoeXBoZW5Mb2NhdGlvbiwgdHJhaWxpbmdQYXJ0aWFsUnVuV2lkdGhXaXRoSHlw aGVuLCB0cnVlIH07CiB9CiAKK3N0YXRpYyBib29sIGVuZHNXaXRoQnJlYWtpbmdPcHBvcnR1bml0 eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgcHJldmlvdXNUZXh0SXRlbSwgY29uc3QgSW5saW5lVGV4 dEl0ZW0mIG5leHRJbmxpbmVUZXh0SXRlbSkKK3sKKyAgICBBU1NFUlQoIXByZXZpb3VzVGV4dEl0 ZW0uaXNXaGl0ZXNwYWNlKCkpOworICAgIEFTU0VSVCghbmV4dElubGluZVRleHRJdGVtLmlzV2hp dGVzcGFjZSgpKTsKKyAgICAvLyBXaGVuIGJvdGggdGhlc2Ugbm9uLXdoaXRlc3BhY2UgcnVucyBi ZWxvbmcgdG8gdGhlIHNhbWUgbGF5b3V0IGJveCwgaXQncyBndWFyYW50ZWVkIHRoYXQKKyAgICAv LyB0aGV5IGFyZSBzcGxpdCBhdCBhIHNvZnQgYnJlYWtpbmcgb3Bwb3J0dW5pdHkuIFNlZSBJbmxp bmVUZXh0SXRlbTo6bW92ZVRvTmV4dEJyZWFrYWJsZVBvc2l0aW9uLgorICAgIGlmICgmcHJldmlv dXNUZXh0SXRlbS5sYXlvdXRCb3goKSA9PSAmbmV4dElubGluZVRleHRJdGVtLmxheW91dEJveCgp KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAvLyBOb3cgd2UgbmVlZCB0byBjb2xsZWN0IGF0 IGxlYXN0IDMgYWRqYWNlbnQgY2hhcmFjdGVycyB0byBiZSBhYmxlIHRvIG1ha2UgYSBkZXNjaXNp b24gd2hldGhlciB0aGUgcHJldmlvdXMgdGV4dCBpdGVtIGVuZHMgd2l0aCBicmVha2luZyBvcHBv cnR1bml0eS4KKyAgICAvLyBbZXgtXVthbXBsZV0gPC0gc2Vjb25kIHRvIGxhc3RbeF0gbGFzdFst XSBjdXJyZW50W2FdCisgICAgLy8gV2UgbmVlZCBhdCBsZWFzdCAxIGNoYXJhY3RlciBpbiB0aGUg Y3VycmVudCBpbmxpbmUgdGV4dCBpdGVtIGFuZCAyIG1vcmUgZnJvbSBwcmV2aW91cyBpbmxpbmUg aXRlbXMuCisgICAgYXV0byBwcmV2aW91c0NvbnRlbnQgPSBwcmV2aW91c1RleHRJdGVtLmxheW91 dEJveCgpLnRleHRDb250ZXh0KCktPmNvbnRlbnQ7CisgICAgYXV0byBsaW5lQnJlYWtJdGVyYXRv ciA9IExhenlMaW5lQnJlYWtJdGVyYXRvciB7IG5leHRJbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3go KS50ZXh0Q29udGV4dCgpLT5jb250ZW50IH07CisgICAgYXV0byBwcmV2aW91c0NvbnRlbnRMZW5n dGggPSBwcmV2aW91c0NvbnRlbnQubGVuZ3RoKCk7CisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBs b29rIGludG8gdGhlIGVudGlyZSB1bmNvbW1pdHRlZCBjb250ZW50IGZvciBtb3JlIHRleHQgY29u dGV4dC4KKyAgICBVQ2hhciBsYXN0Q2hhcmFjdGVyID0gcHJldmlvdXNDb250ZW50TGVuZ3RoID8g cHJldmlvdXNDb250ZW50W3ByZXZpb3VzQ29udGVudExlbmd0aCAtIDFdIDogMDsKKyAgICBVQ2hh ciBzZWNvbmRUb0xhc3RDaGFyYWN0ZXIgPSBwcmV2aW91c0NvbnRlbnRMZW5ndGggPiAxID8gcHJl dmlvdXNDb250ZW50W3ByZXZpb3VzQ29udGVudExlbmd0aCAtIDJdIDogMDsKKyAgICBsaW5lQnJl YWtJdGVyYXRvci5zZXRQcmlvckNvbnRleHQobGFzdENoYXJhY3Rlciwgc2Vjb25kVG9MYXN0Q2hh cmFjdGVyKTsKKyAgICAvLyBOb3cgY2hlY2sgaWYgd2UgY2FuIGJyZWFrIHJpZ2h0IGF0IHRoZSBp bmxpbmUgaXRlbSBib3VuZGFyeS4KKyAgICAvLyBXaXRoIHRoZSBbZXgtYW1wbGVdLCBmaW5kTmV4 dEJyZWFrYWJsZVBvc2l0aW9uIHNob3VsZCByZXR1cm4gdGhlIHN0YXJ0UG9zaXRpb24gKDApLgor ICAgIC8vIEZJWE1FOiBDaGVjayBpZiB0aGVyZSdzIGEgbW9yZSBjb3JyZWN0IHdheSBvZiBmaW5k aW5nIGJyZWFraW5nIG9wcG9ydHVuaXRpZXMuIAorICAgIHJldHVybiAhVGV4dFV0aWw6OmZpbmRO ZXh0QnJlYWthYmxlUG9zaXRpb24obGluZUJyZWFrSXRlcmF0b3IsIDAsIG5leHRJbmxpbmVUZXh0 SXRlbS5zdHlsZSgpKTsKK30KKwogYm9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdENvbnRl bnRCb3VuZGFyeShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBDb250ZW50JiBj b250ZW50KQogewogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0zLyNs aW5lLWJyZWFrLWRldGFpbHMKQEAgLTI2OSwxMiArMjkzLDcgQEAgYm9vbCBMaW5lQnJlYWtlcjo6 Q29udGVudDo6aXNBdENvbnRlbnRCb3VuZGFyeShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVt LCBjb24KICAgICAgICAgICAgIGF1dG8mIHByZXZpb3VzSW5saW5lVGV4dEl0ZW0gPSBkb3duY2Fz dDxJbmxpbmVUZXh0SXRlbT4oKmxhc3RVbmNvbWl0dGVkQ29udGVudCk7CiAgICAgICAgICAgICBp ZiAocHJldmlvdXNJbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkKICAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIC8vIFdoZW4gYm90aCB0aGVzZSBub24td2hpdGVz cGFjZSBydW5zIGJlbG9uZyB0byB0aGUgc2FtZSBsYXlvdXQgYm94LCBpdCdzIGd1YXJhbnRlZWQg dGhhdAotICAgICAgICAgICAgLy8gdGhleSBhcmUgc3BsaXQgYXQgYSBzb2Z0IGJyZWFraW5nIG9w cG9ydHVuaXR5LiBTZWUgSW5saW5lVGV4dEl0ZW06Om1vdmVUb05leHRCcmVha2FibGVQb3NpdGlv bi4KLSAgICAgICAgICAgIGlmICgmaW5saW5lSXRlbS5sYXlvdXRCb3goKSA9PSAmbGFzdFVuY29t aXR0ZWRDb250ZW50LT5sYXlvdXRCb3goKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAgICAgICAgIC8vIEZJWE1FOiBjaGVjayBpZiA8c3Bhbj50ZXh0LTwvc3Bhbj48c3Bhbj50 ZXh0PC9zcGFuPiBzaG91bGQgYmUgaGFuZGxlZCBoZXJlIGFzIHdlbGwuCi0gICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gZW5kc1dpdGhCcmVha2luZ09wcG9ydHVu aXR5KHByZXZpb3VzSW5saW5lVGV4dEl0ZW0sIGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxp bmVJdGVtKSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gPGltZz50ZXh0IC0+IHRoZSBpbmxpbmUg Ym94IGlzIG9uIGEgY29tbWl0IGJvdW5kYXJ5LgogICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRD b250ZW50LT5pc0JveCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IGI0YzkwMTg1MWI2NmFhM2Rh OTM5YWVmOGE2MzkxNGNlM2M3YjA3NjQuLjU5YzZkOGRmOGZlYzIwODIyMmM1N2I0ZDZlN2U1ZjQ5 ODZlNjQwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKQEAgLTI4LDkgKzI4LDkgQEAKIAogI2lmIEVO QUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCi0jaW5jbHVkZSAiQnJlYWtMaW5lcy5o IgogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAjaW5jbHVkZSAiSW5saW5lU29mdExpbmVCcmVh a0l0ZW0uaCIKKyNpbmNsdWRlICJUZXh0VXRpbC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu YW1lc3BhY2UgTGF5b3V0IHsKQEAgLTQ4LDMzICs0OCwxMiBAQCBzdGF0aWMgdW5zaWduZWQgbW92 ZVRvTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbihjb25zdCBTdHJpbmdWaWV3JiB0ZXh0Q29udGVu dCwgdQogICAgIHJldHVybiBuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIC0gc3RhcnRQb3NpdGlv bjsKIH0KIAotc3RhdGljIHVuc2lnbmVkIG1vdmVUb05leHRCcmVha2FibGVQb3NpdGlvbih1bnNp Z25lZCBzdGFydFBvc2l0aW9uLCBMYXp5TGluZUJyZWFrSXRlcmF0b3IgbGluZUJyZWFrSXRlcmF0 b3IsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK3N0YXRpYyB1bnNpZ25lZCBtb3ZlVG9OZXh0 QnJlYWthYmxlUG9zaXRpb24odW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgTGF6eUxpbmVCcmVha0l0 ZXJhdG9yJiBsaW5lQnJlYWtJdGVyYXRvciwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogewot ICAgIGF1dG8gZmluZE5leHRCcmVha2FibGVQb3NpdGlvbiA9IFsmXShhdXRvIHN0YXJ0UG9zaXRp b24pIHsKLSAgICAgICAgYXV0byBrZWVwQWxsV29yZHNGb3JDSksgPSBzdHlsZS53b3JkQnJlYWso KSA9PSBXb3JkQnJlYWs6OktlZXBBbGw7Ci0gICAgICAgIGF1dG8gYnJlYWtOQlNQID0gc3R5bGUu YXV0b1dyYXAoKSAmJiBzdHlsZS5uYnNwTW9kZSgpID09IE5CU1BNb2RlOjpTcGFjZTsKLQotICAg ICAgICBpZiAoa2VlcEFsbFdvcmRzRm9yQ0pLKSB7Ci0gICAgICAgICAgICBpZiAoYnJlYWtOQlNQ KQotICAgICAgICAgICAgICAgIHJldHVybiBuZXh0QnJlYWthYmxlUG9zaXRpb25LZWVwaW5nQWxs V29yZHMobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24pOwotICAgICAgICAgICAgcmV0 dXJuIG5leHRCcmVha2FibGVQb3NpdGlvbktlZXBpbmdBbGxXb3Jkc0lnbm9yaW5nTkJTUChsaW5l QnJlYWtJdGVyYXRvciwgc3RhcnRQb3NpdGlvbik7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAo bGluZUJyZWFrSXRlcmF0b3IubW9kZSgpID09IExpbmVCcmVha0l0ZXJhdG9yTW9kZTo6RGVmYXVs dCkgewotICAgICAgICAgICAgaWYgKGJyZWFrTkJTUCkKLSAgICAgICAgICAgICAgICByZXR1cm4g V2ViQ29yZTo6bmV4dEJyZWFrYWJsZVBvc2l0aW9uKGxpbmVCcmVha0l0ZXJhdG9yLCBzdGFydFBv c2l0aW9uKTsKLSAgICAgICAgICAgIHJldHVybiBuZXh0QnJlYWthYmxlUG9zaXRpb25JZ25vcmlu Z05CU1AobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24pOwotICAgICAgICB9Ci0KLSAg ICAgICAgaWYgKGJyZWFrTkJTUCkKLSAgICAgICAgICAgIHJldHVybiBuZXh0QnJlYWthYmxlUG9z aXRpb25XaXRob3V0U2hvcnRjdXQobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24pOwot ICAgICAgICByZXR1cm4gbmV4dEJyZWFrYWJsZVBvc2l0aW9uSWdub3JpbmdOQlNQV2l0aG91dFNo b3J0Y3V0KGxpbmVCcmVha0l0ZXJhdG9yLCBzdGFydFBvc2l0aW9uKTsKLSAgICB9OwotCiAgICAg YXV0byB0ZXh0TGVuZ3RoID0gbGluZUJyZWFrSXRlcmF0b3Iuc3RyaW5nVmlldygpLmxlbmd0aCgp OwogICAgIGF1dG8gc3RhcnRQb3NpdGlvbkZvck5leHRCcmVha2FibGVQb3NpdGlvbiA9IHN0YXJ0 UG9zaXRpb247CiAgICAgd2hpbGUgKHN0YXJ0UG9zaXRpb25Gb3JOZXh0QnJlYWthYmxlUG9zaXRp b24gPCB0ZXh0TGVuZ3RoKSB7Ci0gICAgICAgIGF1dG8gbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0g ZmluZE5leHRCcmVha2FibGVQb3NpdGlvbihzdGFydFBvc2l0aW9uRm9yTmV4dEJyZWFrYWJsZVBv c2l0aW9uKTsKKyAgICAgICAgYXV0byBuZXh0QnJlYWthYmxlUG9zaXRpb24gPSBUZXh0VXRpbDo6 ZmluZE5leHRCcmVha2FibGVQb3NpdGlvbihsaW5lQnJlYWtJdGVyYXRvciwgc3RhcnRQb3NpdGlv bkZvck5leHRCcmVha2FibGVQb3NpdGlvbiwgc3R5bGUpOwogICAgICAgICAvLyBPZnRlbnRpbWVz IHRoZSBuZXh0IGJyZWFrYWJsZSBwb3NpdGlvbiBjb21lcyBiYWNrIGFzIHRoZSBzdGFydCBwb3Np dGlvbiAobW9zdCBub3RhYmx5IGh5cGhlbnMpLgogICAgICAgICBpZiAobmV4dEJyZWFrYWJsZVBv c2l0aW9uICE9IHN0YXJ0UG9zaXRpb24pCiAgICAgICAgICAgICByZXR1cm4gbmV4dEJyZWFrYWJs ZVBvc2l0aW9uIC0gc3RhcnRQb3NpdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5jcHAKaW5kZXggN2E0MDhhYjIx ZmEwOTBlMjdhNDk0MDcxZGM5Zjk2NGJjMWE2NTA1YS4uMzY2MjljMTg4ZmI2ODUxNDY1YTU5ZWFl NTI5OWIxMDM4YTdhM2Y5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAog I2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCisjaW5jbHVkZSAiQnJlYWtM aW5lcy5oIgogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEl0 ZW0uaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgpAQCAtMTMzLDYgKzEzNCwyOCBAQCBib29s IFRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVRyYWlsaW5nV2hpdGVzcGFjZShjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUpCiAgICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlIHx8 IHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcDsKIH0KIAordW5zaWduZWQgVGV4dFV0 aWw6OmZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24oTGF6eUxpbmVCcmVha0l0ZXJhdG9yJiBsaW5l QnJlYWtJdGVyYXRvciwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlKQoreworICAgIGF1dG8ga2VlcEFsbFdvcmRzRm9yQ0pLID0gc3R5bGUud29yZEJyZWFr KCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsOworICAgIGF1dG8gYnJlYWtOQlNQID0gc3R5bGUuYXV0 b1dyYXAoKSAmJiBzdHlsZS5uYnNwTW9kZSgpID09IE5CU1BNb2RlOjpTcGFjZTsKKworICAgIGlm IChrZWVwQWxsV29yZHNGb3JDSkspIHsKKyAgICAgICAgaWYgKGJyZWFrTkJTUCkKKyAgICAgICAg ICAgIHJldHVybiBuZXh0QnJlYWthYmxlUG9zaXRpb25LZWVwaW5nQWxsV29yZHMobGluZUJyZWFr SXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24pOworICAgICAgICByZXR1cm4gbmV4dEJyZWFrYWJsZVBv c2l0aW9uS2VlcGluZ0FsbFdvcmRzSWdub3JpbmdOQlNQKGxpbmVCcmVha0l0ZXJhdG9yLCBzdGFy dFBvc2l0aW9uKTsKKyAgICB9CisKKyAgICBpZiAobGluZUJyZWFrSXRlcmF0b3IubW9kZSgpID09 IExpbmVCcmVha0l0ZXJhdG9yTW9kZTo6RGVmYXVsdCkgeworICAgICAgICBpZiAoYnJlYWtOQlNQ KQorICAgICAgICAgICAgcmV0dXJuIFdlYkNvcmU6Om5leHRCcmVha2FibGVQb3NpdGlvbihsaW5l QnJlYWtJdGVyYXRvciwgc3RhcnRQb3NpdGlvbik7CisgICAgICAgIHJldHVybiBuZXh0QnJlYWth YmxlUG9zaXRpb25JZ25vcmluZ05CU1AobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24p OworICAgIH0KKworICAgIGlmIChicmVha05CU1ApCisgICAgICAgIHJldHVybiBuZXh0QnJlYWth YmxlUG9zaXRpb25XaXRob3V0U2hvcnRjdXQobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRp b24pOworICAgIHJldHVybiBuZXh0QnJlYWthYmxlUG9zaXRpb25JZ25vcmluZ05CU1BXaXRob3V0 U2hvcnRjdXQobGluZUJyZWFrSXRlcmF0b3IsIHN0YXJ0UG9zaXRpb24pOworfQorCiB9CiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHQvVGV4dFV0aWwuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHQvVGV4dFV0aWwuaAppbmRleCA4OWZlZTIyYjkxNmMwODQwODk0Njk2N2RjNTgwOWJiNjI3 ZTU4NGM1Li5hOGI1ZDBlNzI1MGIwZTU0ZjdhOTVkOTYxYmYzNTgxOGJjOWJmYmVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRVdGls LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0 VXRpbC5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NP TlRFWFQpCiAKICNpbmNsdWRlICJJbmxpbmVJdGVtLmgiCisjaW5jbHVkZSA8d3RmL3RleHQvVGV4 dEJyZWFrSXRlcmF0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00Niw2ICs0Nyw3 IEBAIHB1YmxpYzoKICAgICB9OwogICAgIHN0YXRpYyBTcGxpdERhdGEgc3BsaXQoY29uc3QgQm94 JiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgdW5zaWduZWQgbGVuZ3RoLCBJbmxpbmVMYXlvdXRV bml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5saW5lTGF5 b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpOwogICAgIHN0YXRpYyBib29sIHNob3VsZFByZXNl cnZlVHJhaWxpbmdXaGl0ZXNwYWNlKGNvbnN0IFJlbmRlclN0eWxlJik7CisgICAgc3RhdGljIHVu c2lnbmVkIGZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24oTGF6eUxpbmVCcmVha0l0ZXJhdG9yJiwg dW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKIAogcHJpdmF0ZToK ICAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCBmaXhlZFBpdGNoV2lkdGgoY29uc3QgU3RyaW5n VmlldyYsIGNvbnN0IFJlbmRlclN0eWxlJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElu bGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsK