257104 2023-05-21 10:34:19 -0700 [IFC] Move hyphen location logic to a dedicated function 2023-05-23 06:09:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 257109 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1956807 0 zalan 2023-05-21 10:34:19 -0700 ssia 1956808 1 466441 zalan 2023-05-21 10:41:01 -0700 Created attachment 466441 Patch 1956829 2 466442 zalan 2023-05-21 19:11:24 -0700 Created attachment 466442 Patch 1957302 3 ews-feeder 2023-05-23 06:08:36 -0700 Committed 264415@main (388c80f92128): <https://commits.webkit.org/264415@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466442. 1957303 4 webkit-bug-importer 2023-05-23 06:09:17 -0700 <rdar://problem/109712384> 466441 2023-05-21 10:41:01 -0700 2023-05-21 19:11:22 -0700 Patch bug-257104-20230521104101.patch text/plain 7504 zalan RnJvbSA0NjBkNmI1OWQ5YjMzOTllMjdiMjNkNTY1MzgyOTYwMDczNTEzZTY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjEgTWF5IDIwMjMgMTA6MzQ6MjggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN b3ZlIGh5cGhlbiBsb2NhdGlvbiBsb2dpYyB0byBhIGRlZGljYXRlZCBmdW5jdGlvbgogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzEwNAoKUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciB1c2luZyBpdCBhY3Jvc3Mg bXVsdGlwbGUgKHlldCBkaXNjb25uZWN0ZWQpIGlubGluZSB0ZXh0IGl0ZW0uCihlLmcuIG91dC1v Zi1mbG93IGNvbnRlbnQgaW4tYmV0d2VlbiB0ZXh0KQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CihXZWJD b3JlOjpMYXlvdXQ6Omh5cGhlblBvc2l0aW9uKToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29u dGVudEJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1biBjb25zdCk6CiogU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaDoKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06Om9wZXJhdG9yIFN0cmluZ1ZpZXcgY29uc3QpOgot LS0KIC4uLi9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwICAgICAgICAgICB8IDUwICsr KysrKysrKysrLS0tLS0tLS0KIC4uLi9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaCAgICAgICAgICAg ICAgICAgICB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3Bw CmluZGV4IDBlYTUzYTE1ZjdhYS4uZDgxZmMxNGMwYTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC0zNjgsNiArMzY4LDI3IEBAIHN0YXRpYyBz dGQ6Om9wdGlvbmFsPFRleHRVdGlsOjpXb3JkQnJlYWtMZWZ0PiBtaWRXb3JkQnJlYWsoY29uc3Qg SW5saW5lQ29udGVudEJyCiAgICAgcmV0dXJuIFRleHRVdGlsOjpXb3JkQnJlYWtMZWZ0IHsgcmln aHQgLSBsZWZ0LCBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIHRleHRSdW4uc3R5bGUu Zm9udENhc2NhZGUoKSwgbGVmdCwgcmlnaHQsIHJ1bkxvZ2ljYWxMZWZ0KSB9OwogfQogCitzdGF0 aWMgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGh5cGhlblBvc2l0aW9uKFN0cmluZ1ZpZXcgY29udGVu dCwgc3RkOjpvcHRpb25hbDxzaXplX3Q+IG92ZXJmbG93aW5nUG9zaXRpb24sIGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSkKK3sKKyAgICAvLyBGaW5kIHRoZSBoeXBoZW4gcG9zaXRpb24gYXMgZm9s bG93czoKKyAgICAvLyAxLiBTcGxpdCB0aGUgdGV4dCBieSB0YWtpbmcgdGhlIGh5cGhlbiB3aWR0 aCBpbnRvIGFjY291bnQKKyAgICAvLyAyLiBGaW5kIHRoZSBsYXN0IGh5cGhlbiBwb3NpdGlvbiBi ZWZvcmUgdGhlIHNwbGl0IHBvc2l0aW9uCisgICAgYXV0byBjb250ZW50TGVuZ3RoID0gY29udGVu dC5sZW5ndGgoKTsKKyAgICBzaXplX3QgbGltaXRCZWZvcmUgPSBzdHlsZS5oeXBoZW5hdGlvbkxp bWl0QmVmb3JlKCkgPT0gUmVuZGVyU3R5bGU6OmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0QmVmb3Jl KCkgPyAwIDogc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpOworICAgIGlmIChvdmVyZmxv d2luZ1Bvc2l0aW9uICYmICpvdmVyZmxvd2luZ1Bvc2l0aW9uIDwgbGltaXRCZWZvcmUpCisgICAg ICAgIHJldHVybiB7IH07CisKKyAgICBzaXplX3QgbGltaXRBZnRlciA9IHN0eWxlLmh5cGhlbmF0 aW9uTGltaXRBZnRlcigpID09IFJlbmRlclN0eWxlOjppbml0aWFsSHlwaGVuYXRpb25MaW1pdEFm dGVyKCkgPyAwIDogc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFmdGVyKCk7CisgICAgaWYgKGxpbWl0 QmVmb3JlID49IGNvbnRlbnRMZW5ndGggfHwgbGltaXRBZnRlciA+PSBjb250ZW50TGVuZ3RoIHx8 IGxpbWl0QmVmb3JlICsgbGltaXRBZnRlciA+IGNvbnRlbnRMZW5ndGgpCisgICAgICAgIHJldHVy biB7IH07CisgICAgLy8gQWRqdXN0IGJlZm9yZSBpbmRleCB0byBhY2NvbW1vZGF0ZSB0aGUgbGlt aXQtYWZ0ZXIgdmFsdWUgKGl0J3MgdGhlIGxhc3QgcG90ZW50aWFsIGh5cGhlbiBsb2NhdGlvbiBp biB0aGlzIHJ1bikuCisgICAgYXV0byBoeXBoZW5CZWZvcmUgPSBzdGQ6Om1pbihvdmVyZmxvd2lu Z1Bvc2l0aW9uLnZhbHVlX29yKGNvbnRlbnRMZW5ndGgpLCBjb250ZW50TGVuZ3RoIC0gbGltaXRB ZnRlcikgKyAxOworICAgIHNpemVfdCBoeXBoZW5JbmRleCA9IGxhc3RIeXBoZW5Mb2NhdGlvbihj b250ZW50LCBoeXBoZW5CZWZvcmUsIHN0eWxlLmNvbXB1dGVkTG9jYWxlKCkpOworICAgIGlmICgh aHlwaGVuSW5kZXggfHwgaHlwaGVuSW5kZXggPCBsaW1pdEJlZm9yZSkKKyAgICAgICAgcmV0dXJu IHsgfTsKKyAgICByZXR1cm4gaHlwaGVuSW5kZXg7Cit9CisKIHN0cnVjdCBDYW5kaWRhdGVUZXh0 UnVuRm9yQnJlYWtpbmcgewogICAgIHNpemVfdCBpbmRleCB7IDAgfTsKICAgICBib29sIGlzT3Zl cmZsb3dpbmdSdW4geyB0cnVlIH07CkBAIC00NTIsMzkgKzQ3MywyNCBAQCBzdGQ6Om9wdGlvbmFs PElubGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6 dHJ5QnJlYWtpbgogCiAgICAgaWYgKGJyZWFrUnVsZXMuY29udGFpbnMoV29yZEJyZWFrUnVsZTo6 QXRIeXBoZW5hdGlvbk9wcG9ydHVuaXRpZXMpKSB7CiAgICAgICAgIGF1dG8gdHJ5QnJlYWtpbmdB dEh5cGhlbmF0aW9uT3Bwb3J0dW5pdHkgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPFBhcnRpYWxS dW4+IHsKLSAgICAgICAgICAgIC8vIEZpbmQgdGhlIGh5cGhlbiBwb3NpdGlvbiBhcyBmb2xsb3dz OgotICAgICAgICAgICAgLy8gMS4gU3BsaXQgdGhlIHRleHQgYnkgdGFraW5nIHRoZSBoeXBoZW4g d2lkdGggaW50byBhY2NvdW50Ci0gICAgICAgICAgICAvLyAyLiBGaW5kIHRoZSBsYXN0IGh5cGhl biBwb3NpdGlvbiBiZWZvcmUgdGhlIHNwbGl0IHBvc2l0aW9uCiAgICAgICAgICAgICBpZiAoY2Fu ZGlkYXRlVGV4dFJ1bi5pc092ZXJmbG93aW5nUnVuICYmICFsaW5lSGFzUm9vbUZvckNvbnRlbnQp IHsKICAgICAgICAgICAgICAgICAvLyBXZSB3b24ndCBiZSBhYmxlIHRvIGZpbmQgaHlwaGVuIGxv Y2F0aW9uIHdoZW4gdGhlcmUncyBubyBhdmFpbGFibGUgc3BhY2UuCiAgICAgICAgICAgICAgICAg cmV0dXJuIHsgfTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGF1dG8gcnVuTGVuZ3RoID0g aW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCk7Ci0gICAgICAgICAgICB1bnNpZ25lZCBsaW1pdEJlZm9y ZSA9IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlh bEh5cGhlbmF0aW9uTGltaXRCZWZvcmUoKSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QmVm b3JlKCk7Ci0gICAgICAgICAgICB1bnNpZ25lZCBsaW1pdEFmdGVyID0gc3R5bGUuaHlwaGVuYXRp b25MaW1pdEFmdGVyKCkgPT0gUmVuZGVyU3R5bGU6OmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0QWZ0 ZXIoKSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoKTsKLSAgICAgICAgICAgIC8v IENoZWNrIGlmIHRoaXMgcnVuIGNhbiBhY2NvbW1vZGF0ZSB0aGUgYmVmb3JlL2FmdGVyIGxpbWl0 cyBhdCBhbGwgYmVmb3JlIHN0YXJ0IG1lYXN1cmluZyB0ZXh0LgotICAgICAgICAgICAgaWYgKGxp bWl0QmVmb3JlID49IHJ1bkxlbmd0aCB8fCBsaW1pdEFmdGVyID49IHJ1bkxlbmd0aCB8fCBsaW1p dEJlZm9yZSArIGxpbWl0QWZ0ZXIgPiBydW5MZW5ndGgpCi0gICAgICAgICAgICAgICAgcmV0dXJu IHsgfTsKLQotICAgICAgICAgICAgdW5zaWduZWQgbGVmdFNpZGVMZW5ndGggPSBydW5MZW5ndGg7 CiAgICAgICAgICAgICBhdXRvIGh5cGhlbldpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IGZvbnRD YXNjYWRlLndpZHRoKFRleHRSdW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkg fSB9KSB9OworICAgICAgICAgICAgYXV0byBsZWZ0U2lkZUxlbmd0aCA9IHN0ZDo6b3B0aW9uYWw8 c2l6ZV90PiB7IH07CiAgICAgICAgICAgICBpZiAoY2FuZGlkYXRlVGV4dFJ1bi5pc092ZXJmbG93 aW5nUnVuKSB7CiAgICAgICAgICAgICAgICAgYXV0byBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5 cGhlbiA9IGF2YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7CiAgICAgICAgICAgICAgICAgaWYg KGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlw aGVuYXRpb24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGZvbnRDYXNjYWRlLnBpeGVs U2l6ZSgpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgICAgICAg ICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpicmVha1dvcmQoaW5saW5lVGV4dEl0ZW0sIGZv bnRDYXNjYWRlLCBjYW5kaWRhdGVSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1 ZGluZ0h5cGhlbiwgY2FuZGlkYXRlVGV4dFJ1bi5sb2dpY2FsTGVmdCkubGVuZ3RoOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgaWYgKGxlZnRTaWRlTGVuZ3RoIDwgbGltaXRCZWZvcmUpCi0g ICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgICAgIC8vIEFkanVzdCBiZWZvcmUg aW5kZXggdG8gYWNjb21tb2RhdGUgdGhlIGxpbWl0LWFmdGVyIHZhbHVlIChpdCdzIHRoZSBsYXN0 IHBvdGVudGlhbCBoeXBoZW4gbG9jYXRpb24gaW4gdGhpcyBydW4pLgotICAgICAgICAgICAgYXV0 byBoeXBoZW5CZWZvcmUgPSBzdGQ6Om1pbihsZWZ0U2lkZUxlbmd0aCwgcnVuTGVuZ3RoIC0gbGlt aXRBZnRlcikgKyAxOwotICAgICAgICAgICAgdW5zaWduZWQgaHlwaGVuTG9jYXRpb24gPSBsYXN0 SHlwaGVuTG9jYXRpb24oU3RyaW5nVmlldyhpbmxpbmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCku Y29udGVudCgpKS5zdWJzdHJpbmcoaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0 ZW0ubGVuZ3RoKCkpLCBoeXBoZW5CZWZvcmUsIHN0eWxlLmNvbXB1dGVkTG9jYWxlKCkpOwotICAg ICAgICAgICAgaWYgKCFoeXBoZW5Mb2NhdGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVm b3JlKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgICAgICAvLyBoeXBoZW5M b2NhdGlvbiBpcyByZWxhdGl2ZSB0byB0aGUgc3RhcnQgb2YgdGhpcyBJbmxpbmVJdGVtVGV4dC4K LSAgICAgICAgICAgIEFTU0VSVChpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgaHlwaGVuTG9jYXRp b24gPCBpbmxpbmVUZXh0SXRlbS5lbmQoKSk7Ci0gICAgICAgICAgICBhdXRvIHRyYWlsaW5nUGFy dGlhbFJ1bldpZHRoV2l0aEh5cGhlbiA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwg Zm9udENhc2NhZGUsIGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0 KCkgKyBoeXBoZW5Mb2NhdGlvbiwgY2FuZGlkYXRlVGV4dFJ1bi5sb2dpY2FsTGVmdCk7Ci0gICAg ICAgICAgICByZXR1cm4gUGFydGlhbFJ1biB7IGh5cGhlbkxvY2F0aW9uLCB0cmFpbGluZ1BhcnRp YWxSdW5XaWR0aFdpdGhIeXBoZW4sIGh5cGhlbldpZHRoIH07CisgICAgICAgICAgICBpZiAoYXV0 byBoeXBoZW5Mb2NhdGlvbiA9IGh5cGhlblBvc2l0aW9uKGlubGluZVRleHRJdGVtLCBsZWZ0U2lk ZUxlbmd0aCwgc3R5bGUpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVt LnN0YXJ0KCkgKyAqaHlwaGVuTG9jYXRpb24gPCBpbmxpbmVUZXh0SXRlbS5lbmQoKSk7CisgICAg ICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aFdpdGhIeXBoZW4gPSBUZXh0 VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0SXRlbS5z dGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgKmh5cGhlbkxvY2F0aW9uLCBjYW5kaWRh dGVUZXh0UnVuLmxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gUGFydGlhbFJ1 biB7ICpoeXBoZW5Mb2NhdGlvbiwgdHJhaWxpbmdQYXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuLCBo eXBoZW5XaWR0aCB9OworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAg ICAgICAgfTsKICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nQXRIeXBo ZW5hdGlvbk9wcG9ydHVuaXR5KCkpCiAgICAgICAgICAgICByZXR1cm4gcGFydGlhbFJ1bjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZVRleHRJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5oCmluZGV4IDY2MzRiNmI5MjFiNS4uMmI3OTRiMjNj NjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVUZXh0SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmgKQEAgLTU1LDYgKzU1LDcgQEAg cHVibGljOgogICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgoKSBjb25z dCB7IHJldHVybiBtX2hhc1dpZHRoID8gc3RkOjptYWtlX29wdGlvbmFsKG1fd2lkdGgpIDogc3Rk OjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7IH07IH0KIAogICAgIGNvbnN0IElubGluZVRl eHRCb3gmIGlubGluZVRleHRCb3goKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxJbmxpbmVUZXh0 Qm94PihsYXlvdXRCb3goKSk7IH0KKyAgICBvcGVyYXRvciBTdHJpbmdWaWV3KCkgY29uc3QgeyBy ZXR1cm4geyBpbmxpbmVUZXh0Qm94KCkuY29udGVudCgpLnN1YnN0cmluZyhzdGFydCgpLCBsZW5n dGgoKSkgfTsgfQogCiAgICAgSW5saW5lVGV4dEl0ZW0gbGVmdCh1bnNpZ25lZCBsZW5ndGgpIGNv bnN0OwogICAgIElubGluZVRleHRJdGVtIHJpZ2h0KHVuc2lnbmVkIGxlbmd0aCwgc3RkOjpvcHRp b25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCkgY29uc3Q7Cg== 466442 2023-05-21 19:11:24 -0700 2023-05-23 06:08:37 -0700 Patch bug-257104-20230521191123.patch text/plain 6696 zalan RnJvbSA1NTMzMjlhZjAzNTRiYjI4YzJkOGY0MDEwMWY5MTliZTdkYzhmZmMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMjEgTWF5IDIwMjMgMTA6MzQ6MjggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBN b3ZlIGh5cGhlbiBsb2NhdGlvbiBsb2dpYyB0byBhIGRlZGljYXRlZCBmdW5jdGlvbgogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzEwNAoKUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciB1c2luZyBpdCBhY3Jvc3Mg bXVsdGlwbGUgKHlldCBkaXNjb25uZWN0ZWQpIGlubGluZSB0ZXh0IGl0ZW0uCihlLmcuIG91dC1v Zi1mbG93IGNvbnRlbnQgaW4tYmV0d2VlbiB0ZXh0KQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CihXZWJD b3JlOjpMYXlvdXQ6Omh5cGhlblBvc2l0aW9uKToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29u dGVudEJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1biBjb25zdCk6CiogU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uaDoKKFdlYkNv cmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06Om9wZXJhdG9yIFN0cmluZ1ZpZXcgY29uc3QpOgot LS0KIC4uLi9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwICAgICAgICAgICB8IDUwICsr KysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5j cHAKaW5kZXggMGVhNTNhMTVmN2FhLi43NzExMjdjNWQ0ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTM2OCw2ICszNjgsMjcgQEAgc3RhdGlj IHN0ZDo6b3B0aW9uYWw8VGV4dFV0aWw6OldvcmRCcmVha0xlZnQ+IG1pZFdvcmRCcmVhayhjb25z dCBJbmxpbmVDb250ZW50QnIKICAgICByZXR1cm4gVGV4dFV0aWw6OldvcmRCcmVha0xlZnQgeyBy aWdodCAtIGxlZnQsIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgdGV4dFJ1bi5zdHls ZS5mb250Q2FzY2FkZSgpLCBsZWZ0LCByaWdodCwgcnVuTG9naWNhbExlZnQpIH07CiB9CiAKK3N0 YXRpYyBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gaHlwaGVuUG9zaXRpb24oU3RyaW5nVmlldyBjb250 ZW50LCBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gb3ZlcmZsb3dpbmdQb3NpdGlvbiwgY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlKQoreworICAgIC8vIEZpbmQgdGhlIGh5cGhlbiBwb3NpdGlvbiBhcyBm b2xsb3dzOgorICAgIC8vIDEuIFNwbGl0IHRoZSB0ZXh0IGJ5IHRha2luZyB0aGUgaHlwaGVuIHdp ZHRoIGludG8gYWNjb3VudAorICAgIC8vIDIuIEZpbmQgdGhlIGxhc3QgaHlwaGVuIHBvc2l0aW9u IGJlZm9yZSB0aGUgc3BsaXQgcG9zaXRpb24KKyAgICBhdXRvIGNvbnRlbnRMZW5ndGggPSBjb250 ZW50Lmxlbmd0aCgpOworICAgIHNpemVfdCBsaW1pdEJlZm9yZSA9IHN0eWxlLmh5cGhlbmF0aW9u TGltaXRCZWZvcmUoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRCZWZv cmUoKSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCk7CisgICAgaWYgKG92ZXJm bG93aW5nUG9zaXRpb24gJiYgKm92ZXJmbG93aW5nUG9zaXRpb24gPCBsaW1pdEJlZm9yZSkKKyAg ICAgICAgcmV0dXJuIHsgfTsKKworICAgIHNpemVfdCBsaW1pdEFmdGVyID0gc3R5bGUuaHlwaGVu YXRpb25MaW1pdEFmdGVyKCkgPT0gUmVuZGVyU3R5bGU6OmluaXRpYWxIeXBoZW5hdGlvbkxpbWl0 QWZ0ZXIoKSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoKTsKKyAgICBpZiAobGlt aXRCZWZvcmUgPj0gY29udGVudExlbmd0aCB8fCBsaW1pdEFmdGVyID49IGNvbnRlbnRMZW5ndGgg fHwgbGltaXRCZWZvcmUgKyBsaW1pdEFmdGVyID4gY29udGVudExlbmd0aCkKKyAgICAgICAgcmV0 dXJuIHsgfTsKKyAgICAvLyBBZGp1c3QgYmVmb3JlIGluZGV4IHRvIGFjY29tbW9kYXRlIHRoZSBs aW1pdC1hZnRlciB2YWx1ZSAoaXQncyB0aGUgbGFzdCBwb3RlbnRpYWwgaHlwaGVuIGxvY2F0aW9u IGluIHRoaXMgcnVuKS4KKyAgICBhdXRvIGh5cGhlbkJlZm9yZSA9IHN0ZDo6bWluKG92ZXJmbG93 aW5nUG9zaXRpb24udmFsdWVfb3IoY29udGVudExlbmd0aCksIGNvbnRlbnRMZW5ndGggLSBsaW1p dEFmdGVyKSArIDE7CisgICAgc2l6ZV90IGh5cGhlbkluZGV4ID0gbGFzdEh5cGhlbkxvY2F0aW9u KGNvbnRlbnQsIGh5cGhlbkJlZm9yZSwgc3R5bGUuY29tcHV0ZWRMb2NhbGUoKSk7CisgICAgaWYg KCFoeXBoZW5JbmRleCB8fCBoeXBoZW5JbmRleCA8IGxpbWl0QmVmb3JlKQorICAgICAgICByZXR1 cm4geyB9OworICAgIHJldHVybiBoeXBoZW5JbmRleDsKK30KKwogc3RydWN0IENhbmRpZGF0ZVRl eHRSdW5Gb3JCcmVha2luZyB7CiAgICAgc2l6ZV90IGluZGV4IHsgMCB9OwogICAgIGJvb2wgaXNP dmVyZmxvd2luZ1J1biB7IHRydWUgfTsKQEAgLTQ1MiwzOSArNDczLDI0IEBAIHN0ZDo6b3B0aW9u YWw8SW5saW5lQ29udGVudEJyZWFrZXI6OlBhcnRpYWxSdW4+IElubGluZUNvbnRlbnRCcmVha2Vy Ojp0cnlCcmVha2luCiAKICAgICBpZiAoYnJlYWtSdWxlcy5jb250YWlucyhXb3JkQnJlYWtSdWxl OjpBdEh5cGhlbmF0aW9uT3Bwb3J0dW5pdGllcykpIHsKICAgICAgICAgYXV0byB0cnlCcmVha2lu Z0F0SHlwaGVuYXRpb25PcHBvcnR1bml0eSA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8UGFydGlh bFJ1bj4gewotICAgICAgICAgICAgLy8gRmluZCB0aGUgaHlwaGVuIHBvc2l0aW9uIGFzIGZvbGxv d3M6Ci0gICAgICAgICAgICAvLyAxLiBTcGxpdCB0aGUgdGV4dCBieSB0YWtpbmcgdGhlIGh5cGhl biB3aWR0aCBpbnRvIGFjY291bnQKLSAgICAgICAgICAgIC8vIDIuIEZpbmQgdGhlIGxhc3QgaHlw aGVuIHBvc2l0aW9uIGJlZm9yZSB0aGUgc3BsaXQgcG9zaXRpb24KICAgICAgICAgICAgIGlmIChj YW5kaWRhdGVUZXh0UnVuLmlzT3ZlcmZsb3dpbmdSdW4gJiYgIWxpbmVIYXNSb29tRm9yQ29udGVu dCkgewogICAgICAgICAgICAgICAgIC8vIFdlIHdvbid0IGJlIGFibGUgdG8gZmluZCBoeXBoZW4g bG9jYXRpb24gd2hlbiB0aGVyZSdzIG5vIGF2YWlsYWJsZSBzcGFjZS4KICAgICAgICAgICAgICAg ICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBydW5MZW5ndGgg PSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGxpbWl0QmVm b3JlID0gc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpID09IFJlbmRlclN0eWxlOjppbml0 aWFsSHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpID8gMCA6IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRC ZWZvcmUoKTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGxpbWl0QWZ0ZXIgPSBzdHlsZS5oeXBoZW5h dGlvbkxpbWl0QWZ0ZXIoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRB ZnRlcigpID8gMCA6IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRBZnRlcigpOwotICAgICAgICAgICAg Ly8gQ2hlY2sgaWYgdGhpcyBydW4gY2FuIGFjY29tbW9kYXRlIHRoZSBiZWZvcmUvYWZ0ZXIgbGlt aXRzIGF0IGFsbCBiZWZvcmUgc3RhcnQgbWVhc3VyaW5nIHRleHQuCi0gICAgICAgICAgICBpZiAo bGltaXRCZWZvcmUgPj0gcnVuTGVuZ3RoIHx8IGxpbWl0QWZ0ZXIgPj0gcnVuTGVuZ3RoIHx8IGxp bWl0QmVmb3JlICsgbGltaXRBZnRlciA+IHJ1bkxlbmd0aCkKLSAgICAgICAgICAgICAgICByZXR1 cm4geyB9OwotCi0gICAgICAgICAgICB1bnNpZ25lZCBsZWZ0U2lkZUxlbmd0aCA9IHJ1bkxlbmd0 aDsKICAgICAgICAgICAgIGF1dG8gaHlwaGVuV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgZm9u dENhc2NhZGUud2lkdGgoVGV4dFJ1biB7IFN0cmluZ1ZpZXcgeyBzdHlsZS5oeXBoZW5TdHJpbmco KSB9IH0pIH07CisgICAgICAgICAgICBhdXRvIGxlZnRTaWRlTGVuZ3RoID0gc3RkOjpvcHRpb25h bDxzaXplX3Q+IHsgfTsKICAgICAgICAgICAgIGlmIChjYW5kaWRhdGVUZXh0UnVuLmlzT3ZlcmZs b3dpbmdSdW4pIHsKICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5n SHlwaGVuID0gYXZhaWxhYmxlV2lkdGggLSBoeXBoZW5XaWR0aDsKICAgICAgICAgICAgICAgICBp ZiAoYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4gPD0gMCB8fCAhZW5vdWdoV2lkdGhGb3JI eXBoZW5hdGlvbihhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgZm9udENhc2NhZGUucGl4 ZWxTaXplKCkpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAg ICAgIGxlZnRTaWRlTGVuZ3RoID0gVGV4dFV0aWw6OmJyZWFrV29yZChpbmxpbmVUZXh0SXRlbSwg Zm9udENhc2NhZGUsIGNhbmRpZGF0ZVJ1bi5sb2dpY2FsV2lkdGgsIGF2YWlsYWJsZVdpZHRoRXhj bHVkaW5nSHlwaGVuLCBjYW5kaWRhdGVUZXh0UnVuLmxvZ2ljYWxMZWZ0KS5sZW5ndGg7CiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICBpZiAobGVmdFNpZGVMZW5ndGggPCBsaW1pdEJlZm9yZSkK LSAgICAgICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICAgICAgLy8gQWRqdXN0IGJlZm9y ZSBpbmRleCB0byBhY2NvbW1vZGF0ZSB0aGUgbGltaXQtYWZ0ZXIgdmFsdWUgKGl0J3MgdGhlIGxh c3QgcG90ZW50aWFsIGh5cGhlbiBsb2NhdGlvbiBpbiB0aGlzIHJ1bikuCi0gICAgICAgICAgICBh dXRvIGh5cGhlbkJlZm9yZSA9IHN0ZDo6bWluKGxlZnRTaWRlTGVuZ3RoLCBydW5MZW5ndGggLSBs aW1pdEFmdGVyKSArIDE7Ci0gICAgICAgICAgICB1bnNpZ25lZCBoeXBoZW5Mb2NhdGlvbiA9IGxh c3RIeXBoZW5Mb2NhdGlvbihTdHJpbmdWaWV3KGlubGluZVRleHRJdGVtLmlubGluZVRleHRCb3go KS5jb250ZW50KCkpLnN1YnN0cmluZyhpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0 SXRlbS5sZW5ndGgoKSksIGh5cGhlbkJlZm9yZSwgc3R5bGUuY29tcHV0ZWRMb2NhbGUoKSk7Ci0g ICAgICAgICAgICBpZiAoIWh5cGhlbkxvY2F0aW9uIHx8IGh5cGhlbkxvY2F0aW9uIDwgbGltaXRC ZWZvcmUpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgICAgIC8vIGh5cGhl bkxvY2F0aW9uIGlzIHJlbGF0aXZlIHRvIHRoZSBzdGFydCBvZiB0aGlzIElubGluZUl0ZW1UZXh0 LgotICAgICAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBoeXBoZW5Mb2Nh dGlvbiA8IGlubGluZVRleHRJdGVtLmVuZCgpKTsKLSAgICAgICAgICAgIGF1dG8gdHJhaWxpbmdQ YXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVt LCBmb250Q2FzY2FkZSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0uc3Rh cnQoKSArIGh5cGhlbkxvY2F0aW9uLCBjYW5kaWRhdGVUZXh0UnVuLmxvZ2ljYWxMZWZ0KTsKLSAg ICAgICAgICAgIHJldHVybiBQYXJ0aWFsUnVuIHsgaHlwaGVuTG9jYXRpb24sIHRyYWlsaW5nUGFy dGlhbFJ1bldpZHRoV2l0aEh5cGhlbiwgaHlwaGVuV2lkdGggfTsKKyAgICAgICAgICAgIGlmIChh dXRvIGh5cGhlbkxvY2F0aW9uID0gaHlwaGVuUG9zaXRpb24oaW5saW5lVGV4dEl0ZW0uaW5saW5l VGV4dEJveCgpLmNvbnRlbnQoKS5zdWJzdHJpbmcoaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5s aW5lVGV4dEl0ZW0ubGVuZ3RoKCkpLCBsZWZ0U2lkZUxlbmd0aCwgc3R5bGUpKSB7CisgICAgICAg ICAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAqaHlwaGVuTG9jYXRpb24g PCBpbmxpbmVUZXh0SXRlbS5lbmQoKSk7CisgICAgICAgICAgICAgICAgYXV0byB0cmFpbGluZ1Bh cnRpYWxSdW5XaWR0aFdpdGhIeXBoZW4gPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0s IGZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFy dCgpICsgKmh5cGhlbkxvY2F0aW9uLCBjYW5kaWRhdGVUZXh0UnVuLmxvZ2ljYWxMZWZ0KTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gUGFydGlhbFJ1biB7ICpoeXBoZW5Mb2NhdGlvbiwgdHJhaWxp bmdQYXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuLCBoeXBoZW5XaWR0aCB9OworICAgICAgICAgICAg fQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgfTsKICAgICAgICAgaWYgKGF1dG8g cGFydGlhbFJ1biA9IHRyeUJyZWFraW5nQXRIeXBoZW5hdGlvbk9wcG9ydHVuaXR5KCkpCiAgICAg ICAgICAgICByZXR1cm4gcGFydGlhbFJ1bjsK