219697 2020-12-09 10:58:57 -0800 [LFC][IFC] Cleanup TextUtil::width/split functions 2020-12-10 13:20:23 -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 1713227 0 zalan 2020-12-09 10:58:57 -0800 ssia 1713233 1 415775 zalan 2020-12-09 11:13:40 -0800 Created attachment 415775 Patch 1713659 2 ews-feeder 2020-12-10 12:17:30 -0800 Committed r270644: <https://trac.webkit.org/changeset/270644> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415775. 1713660 3 webkit-bug-importer 2020-12-10 12:18:20 -0800 <rdar://problem/72191903> 415775 2020-12-09 11:13:40 -0800 2020-12-10 13:20:23 -0800 Patch bug-219697-20201209111339.patch text/plain 11877 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYyZTkzMjM5NTFlMDEx YTcxMTZmYTczY2RhZGRjNDZmMjU0NGY3Zi4uOWZlMDgyYzc1YWQyYzNkOTU4NWEwYWYxZDBmMTE0 NjQ1N2JkZWNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDbGVhbnVw IFRleHRVdGlsOjp3aWR0aC9zcGxpdCBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYWwgY2xlYW51cCBhbmQgdGlnaHRlbmluZy4K KworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnBy b2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNvbnN0KToKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRl bXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmg6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVFbXB0eUl0 ZW0pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6d2lkdGgpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6c3BsaXQpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaDoKKwogMjAyMC0xMi0wOSAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gSW50cm9kdWNlIElubGlu ZVRleHRJdGVtOjppc1dvcmRTZXBhcmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcApp bmRleCA4ZjVlZjM1ZjEyYTg1MjhlYmEyMzkwNmM4NjJiZGEyOTFmYTk2ZmEyLi5hN2E2YzJlMmUz ZTc3ZTRiMTQwZGI1OTdhNjYzM2Q0MTg1OTg2NzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFr ZXIuY3BwCkBAIC0yMjcsNyArMjI3LDcgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJ bmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAg ICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVt Pihjb250aW51b3VzQ29udGVudC5ydW5zKClbbGVhZGluZ1RleHRSdW5JbmRleF0uaW5saW5lSXRl bSk7CiAgICAgICAgICAgICAgICAgaWYgKGlubGluZVRleHRJdGVtLmxlbmd0aCgpIDw9IDEpCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwg SXNFbmRPZkxpbmU6OlllcyB9OwotICAgICAgICAgICAgICAgIGF1dG8gZmlyc3RDaGFyYWN0ZXJX aWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3Rh cnQoKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIDEpOworICAgICAgICAgICAgICAgIGF1dG8g Zmlyc3RDaGFyYWN0ZXJXaWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgaW5s aW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIDEsIGxpbmVTdGF0 dXMuY29udGVudExvZ2ljYWxSaWdodCk7CiAgICAgICAgICAgICAgICAgYXV0byBmaXJzdENoYXJh Y3RlclJ1biA9IFBhcnRpYWxSdW4geyAxLCBmaXJzdENoYXJhY3RlcldpZHRoIH07CiAgICAgICAg ICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OkJyZWFrLCBJc0VuZE9mTGluZTo6WWVz LCBSZXN1bHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgeyBsZWFkaW5nVGV4dFJ1bkluZGV4LCBm aXJzdENoYXJhY3RlclJ1biB9IH07CiAgICAgICAgICAgICB9CkBAIC0zNjUsMTAgKzM2NSwxMCBA QCBPcHRpb25hbDxJbmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVu dEJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dAogICAgICAgICAgICAgLy8gV2hlbiB0aGUgcnVuIGNh biBiZSBzcGxpdCBhdCBhcmJpdHJhcnkgcG9zaXRpb24sCiAgICAgICAgICAgICAvLyBsZXQncyBq dXN0IHJldHVybiB0aGUgZW50aXJlIHJ1biB3aGVuIGl0IGlzIGludGVuZGVkIHRvIGZpdCBvbiB0 aGUgbGluZS4KICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSk7Ci0g ICAgICAgICAgICBhdXRvIHRyYWlsaW5nUGFydGlhbFJ1bldpZHRoID0gVGV4dFV0aWw6OndpZHRo KGlubGluZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5l bmQoKSAtIDEsIGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgIGF1dG8gdHJhaWxpbmdQYXJ0aWFs UnVuV2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGxvZ2ljYWxMZWZ0KTsK ICAgICAgICAgICAgIHJldHVybiBQYXJ0aWFsUnVuIHsgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkg LSAxLCB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aCB9OwogICAgICAgICB9Ci0gICAgICAgIGF1dG8g c3BsaXREYXRhID0gVGV4dFV0aWw6OnNwbGl0KGlubGluZVRleHRJdGVtLmlubGluZVRleHRCb3go KSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCksIG92ZXJm bG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGgsIGxvZ2ljYWxMZWZ0KTsKKyAg ICAgICAgYXV0byBzcGxpdERhdGEgPSBUZXh0VXRpbDo6c3BsaXQoaW5saW5lVGV4dEl0ZW0sIG92 ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGgsIGxvZ2ljYWxMZWZ0KTsK ICAgICAgICAgcmV0dXJuIFBhcnRpYWxSdW4geyBzcGxpdERhdGEubGVuZ3RoLCBzcGxpdERhdGEu bG9naWNhbFdpZHRoIH07CiAgICAgfQogCkBAIC0zOTAsNyArMzkwLDcgQEAgT3B0aW9uYWw8SW5s aW5lQ29udGVudEJyZWFrZXI6OlBhcnRpYWxSdW4+IElubGluZUNvbnRlbnRCcmVha2VyOjp0cnlC cmVha2luZ1RleHQKICAgICAgICAgICAgIGF1dG8gYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBo ZW4gPSBhdmFpbGFibGVXaWR0aCAtIGh5cGhlbldpZHRoOwogICAgICAgICAgICAgaWYgKGF2YWls YWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRp b24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGZvbnRDYXNjYWRlLnBpeGVsU2l6ZSgp KSkKICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICAgICAgbGVmdFNpZGVMZW5n dGggPSBUZXh0VXRpbDo6c3BsaXQoaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLCBpbmxp bmVUZXh0SXRlbS5zdGFydCgpLCBydW5MZW5ndGgsIG92ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0 aCwgYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGxvZ2ljYWxMZWZ0KS5sZW5ndGg7Cisg ICAgICAgICAgICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpzcGxpdChpbmxpbmVUZXh0SXRl bSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5 cGhlbiwgbG9naWNhbExlZnQpLmxlbmd0aDsKICAgICAgICAgfQogICAgICAgICBpZiAobGVmdFNp ZGVMZW5ndGggPCBsaW1pdEJlZm9yZSkKICAgICAgICAgICAgIHJldHVybiB7IH07CkBAIC00MDAs NyArNDAwLDggQEAgT3B0aW9uYWw8SW5saW5lQ29udGVudEJyZWFrZXI6OlBhcnRpYWxSdW4+IElu bGluZUNvbnRlbnRCcmVha2VyOjp0cnlCcmVha2luZ1RleHQKICAgICAgICAgaWYgKCFoeXBoZW5M b2NhdGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAgcmV0 dXJuIHsgfTsKICAgICAgICAgLy8gaHlwaGVuTG9jYXRpb24gaXMgcmVsYXRpdmUgdG8gdGhlIHN0 YXJ0IG9mIHRoaXMgSW5saW5lSXRlbVRleHQuCi0gICAgICAgIGF1dG8gdHJhaWxpbmdQYXJ0aWFs UnVuV2lkdGhXaXRoSHlwaGVuID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBpbmxp bmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgaHlwaGVuTG9jYXRp b24pOyAKKyAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBoeXBoZW5Mb2Nh dGlvbiA8IGlubGluZVRleHRJdGVtLmVuZCgpKTsKKyAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRp YWxSdW5XaWR0aFdpdGhIeXBoZW4gPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlu bGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBoeXBoZW5Mb2Nh dGlvbiwgbG9naWNhbExlZnQpOyAKICAgICAgICAgcmV0dXJuIFBhcnRpYWxSdW4geyBoeXBoZW5M b2NhdGlvbiwgdHJhaWxpbmdQYXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuLCBoeXBoZW5XaWR0aCB9 OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IGJmMmJlNTIxZmY5NWFlNmYyZWQ0ZjM0 NjJhMmRlODBlNmQ3ZTBkMGIuLjJmOGM4Y2JmYTU4ZGZiNGRjZTIyZTY1MzFjYWFiNTQyNDBjOGQ2 NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgdm9pZCBJbmxpbmVUZXh0 SXRlbTo6Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50 LCBjb25zdAogICAgIGF1dG8gaW5saW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlv biwgYXV0byBsZW5ndGgpIC0+IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsKICAgICAgICAg aWYgKCFpbmxpbmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkpCiAg ICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlu bGluZVRleHRCb3gsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9zaXRpb24gKyBsZW5ndGgpOworICAg ICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRCb3gsIHN0YXJ0UG9zaXRpb24s IHN0YXJ0UG9zaXRpb24gKyBsZW5ndGgsIHsgfSk7CiAgICAgfTsKIAogICAgIHdoaWxlIChjdXJy ZW50UG9zaXRpb24gPCB0ZXh0Lmxlbmd0aCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaAppbmRleCAwNjhmZTBi OTMxM2JkZDYxYmY4N2Y3YmNiOWM0NjZiYzRjNmI4N2Q5Li43NWJhMjBkMjFkMzg2OWQ0OTExYThm MmIyOGQxZTNiZWY5NDFjYTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHJp dmF0ZToKICAgICB1c2luZyBJbmxpbmVJdGVtOjpUZXh0SXRlbVR5cGU7CiAKICAgICBJbmxpbmVU ZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxl bmd0aCwgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIGJvb2wgaXNXb3JkU2VwYXJhdG9yLCBP cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgVGV4dEl0ZW1UeXBlKTsKLSAgICBJbmxp bmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94Jik7CisgICAgZXhwbGljaXQgSW5saW5lVGV4 dEl0ZW0oY29uc3QgSW5saW5lVGV4dEJveCYpOwogCiAgICAgc3RhdGljIElubGluZVRleHRJdGVt IGNyZWF0ZVdoaXRlc3BhY2VJdGVtKGNvbnN0IElubGluZVRleHRCb3gmLCB1bnNpZ25lZCBzdGFy dCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIGlzV29yZFNlcGFyYXRvciwgT3B0aW9uYWw8SW5saW5l TGF5b3V0VW5pdD4gd2lkdGgpOwogICAgIHN0YXRpYyBJbmxpbmVUZXh0SXRlbSBjcmVhdGVOb25X aGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgc3RhcnQsIHVuc2ln bmVkIGxlbmd0aCwgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIE9wdGlvbmFsPElubGluZUxh eW91dFVuaXQ+IHdpZHRoKTsKQEAgLTc4LDcgKzc4LDcgQEAgaW5saW5lIElubGluZVRleHRJdGVt IElubGluZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0 Qm8KIAogaW5saW5lIElubGluZVRleHRJdGVtIElubGluZVRleHRJdGVtOjpjcmVhdGVFbXB0eUl0 ZW0oY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCkKIHsKLSAgICByZXR1cm4geyBp bmxpbmVUZXh0Qm94IH07CisgICAgcmV0dXJuIElubGluZVRleHRJdGVtIHsgaW5saW5lVGV4dEJv eCB9OwogfQogCiBpbmxpbmUgSW5saW5lVGV4dEl0ZW06OklubGluZVRleHRJdGVtKGNvbnN0IElu bGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5n dGgsIGJvb2wgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgT3B0 aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRlbVR5cGUp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0 L1RleHRVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3Rl eHQvVGV4dFV0aWwuY3BwCmluZGV4IDlmY2E2MjMyZTY2NTNjNGM1NDkyODlkYjQ3N2UwY2MxYjBj YzM2YTAuLmNjNjY0YWY3Mjg1YWZiNDQyNjc4MDFiNjU4ODRkYmIyMDAwMjk5ODkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4 dFV0aWwuY3BwCkBAIC0zOCwxMSArMzgsMTggQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVz cGFjZSBMYXlvdXQgewogCitJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJ bmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFVuaXQgY29udGVudExv Z2ljYWxMZWZ0KQoreworICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0s IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmVuZCgpIC0gMSwgY29udGVu dExvZ2ljYWxMZWZ0KTsKK30KKwogSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29u c3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25l ZCB0bywgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7Ci0gICAgLy8gRmFz dCBwYXRoIGZvciBjb2xsYXBzZWQgd2hpdGVzcGFjZS4KKyAgICBSRUxFQVNFX0FTU0VSVChmcm9t ID49IGlubGluZVRleHRJdGVtLnN0YXJ0KCkpOworICAgIFJFTEVBU0VfQVNTRVJUKHRvIDw9IGlu bGluZVRleHRJdGVtLmVuZCgpKTsKICAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNDb2xsYXBzaWJs ZSgpKSB7Ci0gICAgICAgIGF1dG8gZm9udCA9IGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENh c2NhZGUoKTsKKyAgICAgICAgLy8gRmFzdCBwYXRoIGZvciBjb2xsYXBzZWQgd2hpdGVzcGFjZS4K KyAgICAgICAgYXV0byYgZm9udCA9IGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENhc2NhZGUo KTsKICAgICAgICAgcmV0dXJuIGZvbnQuc3BhY2VXaWR0aCgpICsgZm9udC53b3JkU3BhY2luZygp OwogICAgIH0KICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLmlubGlu ZVRleHRCb3goKSwgZnJvbSwgdG8sIGNvbnRlbnRMb2dpY2FsTGVmdCk7CkBAIC0xMDAsMTAgKzEw NywxMyBAQCBJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjpmaXhlZFBpdGNoV2lkdGgoY29uc3Qg U3RyaW5nVmlldyYgdGV4dCwgY29uc3QgUmVuZGVyUwogICAgIHJldHVybiBzdGQ6Om1heDxJbmxp bmVMYXlvdXRVbml0PigwLCBJbmxpbmVMYXlvdXRVbml0KHdpZHRoKSk7CiB9CiAKLVRleHRVdGls OjpTcGxpdERhdGEgVGV4dFV0aWw6OnNwbGl0KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRl eHRCb3gsIHVuc2lnbmVkIHN0YXJ0UG9zaXRpb24sIHVuc2lnbmVkIGxlbmd0aCwgSW5saW5lTGF5 b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQorVGV4dFV0aWw6OlNwbGl0RGF0YSBUZXh0 VXRpbDo6c3BsaXQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVM YXlvdXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5s aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7Ci0gICAgQVNTRVJUKGxlbmd0aCk7 CiAgICAgQVNTRVJUKGF2YWlsYWJsZVdpZHRoID49IDApOworICAgIGF1dG8gc3RhcnRQb3NpdGlv biA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7CisgICAgYXV0byBsZW5ndGggPSBpbmxpbmVUZXh0 SXRlbS5sZW5ndGgoKTsKKyAgICBBU1NFUlQobGVuZ3RoKTsKKwogICAgIGF1dG8gbGVmdCA9IHN0 YXJ0UG9zaXRpb247CiAgICAgLy8gUGF0aG9sb2dpY2FsIGNhc2Ugb2YgKGV4dHJlbWVseSlsb25n IHN0cmluZyBhbmQgbmFycm93IGxpbmVzLgogICAgIC8vIEFkanVzdCB0aGUgcmFuZ2Ugc28gdGhh dCB3ZSBjYW4gcGljayBhIHJlYXNvbmFibGUgbWlkcG9pbnQuCkBAIC0xMTQsNyArMTI0LDcgQEAg VGV4dFV0aWw6OlNwbGl0RGF0YSBUZXh0VXRpbDo6c3BsaXQoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgdW5zaWduZWQKICAgICBJbmxpbmVMYXlvdXRVbml0IGxlZnRTaWRlV2lk dGggPSAwOwogICAgIHdoaWxlIChsZWZ0IDwgcmlnaHQpIHsKICAgICAgICAgYXV0byBtaWRkbGUg PSAobGVmdCArIHJpZ2h0KSAvIDI7Ci0gICAgICAgIGF1dG8gd2lkdGggPSBUZXh0VXRpbDo6d2lk dGgoaW5saW5lVGV4dEJveCwgc3RhcnRQb3NpdGlvbiwgbWlkZGxlICsgMSwgY29udGVudExvZ2lj YWxMZWZ0KTsKKyAgICAgICAgYXV0byB3aWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0 SXRlbSwgc3RhcnRQb3NpdGlvbiwgbWlkZGxlICsgMSwgY29udGVudExvZ2ljYWxMZWZ0KTsKICAg ICAgICAgaWYgKHdpZHRoIDwgYXZhaWxhYmxlV2lkdGgpIHsKICAgICAgICAgICAgIGxlZnQgPSBt aWRkbGUgKyAxOwogICAgICAgICAgICAgbGVmdFNpZGVXaWR0aCA9IHdpZHRoOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5o CmluZGV4IDQ1MGQ2NzA5NzIyNGQwNjYzMDkwOTc5Y2IxN2IyNmMyZjE3OWRmNTcuLmI1ODVlYTNk YjYzMDU1MThhOGVkNzcyZDg3ZDg4ZjNhZGMyYzM2MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRVdGlsLmgKQEAgLTQyLDE0 ICs0MiwxNiBAQCBjbGFzcyBJbmxpbmVUZXh0SXRlbTsKIAogY2xhc3MgVGV4dFV0aWwgewogcHVi bGljOgotICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElubGluZVRleHRJ dGVtJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxMZWZ0ID0gMCk7Ci0gICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgoY29u c3QgSW5saW5lVGV4dEJveCYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCA9IDApOworICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRV bml0IHdpZHRoKGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQpOworICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElu bGluZVRleHRJdGVtJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVu aXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCB3aWR0 aChjb25zdCBJbmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKwogICAgIHN0cnVjdCBTcGxpdERhdGEg ewogICAgICAgICB1bnNpZ25lZCBzdGFydCB7IDAgfTsKICAgICAgICAgdW5zaWduZWQgbGVuZ3Ro IHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7IDAgfTsKICAg ICB9OwotICAgIHN0YXRpYyBTcGxpdERhdGEgc3BsaXQoY29uc3QgSW5saW5lVGV4dEJveCYsIHVu c2lnbmVkIHN0YXJ0UG9zaXRpb24sIHVuc2lnbmVkIGxlbmd0aCwgSW5saW5lTGF5b3V0VW5pdCB0 ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91dFVu aXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgU3BsaXREYXRhIHNwbGl0KGNvbnN0 IElubGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91 dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0 KTsKICAgICBzdGF0aWMgYm9vbCBzaG91bGRQcmVzZXJ2ZVRyYWlsaW5nV2hpdGVzcGFjZShjb25z dCBSZW5kZXJTdHlsZSYpOwogICAgIHN0YXRpYyB1bnNpZ25lZCBmaW5kTmV4dEJyZWFrYWJsZVBv c2l0aW9uKExhenlMaW5lQnJlYWtJdGVyYXRvciYsIHVuc2lnbmVkIHN0YXJ0UG9zaXRpb24sIGNv bnN0IFJlbmRlclN0eWxlJik7CiAK