234421 2021-12-16 21:12:36 -0800 Refactor hyphenation logic in RenderText::computePreferredLogicalWidths() 2021-12-17 10:14:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 234424 1 mmaxfield mmaxfield changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr webkit-bug-importer zalan oldest_to_newest 1824974 0 mmaxfield 2021-12-16 21:12:36 -0800 Refactor hyphenation logic in RenderText::computePreferredLogicalWidths() 1824976 1 447421 mmaxfield 2021-12-16 21:19:05 -0800 Created attachment 447421 Patch 1825079 2 447421 zalan 2021-12-17 07:33:21 -0800 Comment on attachment 447421 Patch rs=me. messy code. hopefully this gets redundant soon. 1825111 3 ews-feeder 2021-12-17 10:13:23 -0800 Committed r287195 (245362@main): <https://commits.webkit.org/245362@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447421. 1825112 4 webkit-bug-importer 2021-12-17 10:14:17 -0800 <rdar://problem/86639480> 447421 2021-12-16 21:19:05 -0800 2021-12-17 10:13:24 -0800 Patch bug-234421-20211216211904.patch text/plain 8952 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYxYmRkYWUxYmVlZDI4 ZGZmY2IzYTFiZTk0YTExOTEyNGVkNTM3MS4uNWFkODYwM2YyZDgzYjZlNjE0OGQ0Yzg4MDIzMTgw MWQ0NTgyMjNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEyLTE2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3Ig aHlwaGVuYXRpb24gbG9naWMgaW4gUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX aWR0aHMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM0NDIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIGh5cGhlbmF0aW9uIGxvZ2ljIGluIFJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKCkgd2FzIHNwbGl0IGFjcm9zcyB0d28gZnVuY3Rpb25zLgorICAgICAgICBJZiB5 b3UgY29uc2lkZXIgdGhlIHdvcmQgIkFCQy1ERUYtR0hJIiAod2hlcmUgdGhlICctJyBjaGFyYWN0 ZXJzIGFyZSBoeXBoZW5hdGlvbiBvcHBvcnR1bml0aWVzKSwgb25lCisgICAgICAgIGZ1bmN0aW9u LCBtYXhXb3JkRnJhZ21lbnRXaWR0aCgpIHdhcyByZXNwb25zaWJsZSBmb3IgY2FsY3VsYXRpbmcg dGhlIHdpZHRoIG9mICJBQkMtIiBhbmQgIkRFRi0iIGJ1dAorICAgICAgICBub3QgIkdISSIuIFJl bmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkgY2FsbGVkIHRoYXQgZnVu Y3Rpb24sIGFuZCBhZnRlciBpdCByZXR1cm5lZCwKKyAgICAgICAgd291bGQgdGhlbiBjYWxjdWxh dGUgdGhlIHdpZHRoIG9mICJHSEkiLCBhbmQgY29tcGFyZSB0aGF0IHRvIHRoZSB3aWR0aCByZXR1 cm5lZCBieQorICAgICAgICBtYXhXb3JkRnJhZ21lbnRXaWR0aCgpLiBBIG11Y2ggc2ltcGxlciBk ZXNpZ24gd291bGQgYmUgdG8gaGF2ZSBvbmUgZnVuY3Rpb24sIG1heFdvcmRGcmFnbWVudFdpZHRo KCksCisgICAgICAgIGhhbmRsZSBhbGwgdGhlIGh5cGhlbmF0aW9uIGxvZ2ljLCBhbmQgZG8gYWxs IHRoZSBjYWxjdWxhdGlvbiBuZWNlc3NhcnkgdG8ganVzdCByZXR1cm4gYSBzaW5nbGUgdmFsdWUK KyAgICAgICAgdG8gUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKS4K KworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFu Z2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUZXh0OjptYXhXb3JkRnJhZ21lbnRXaWR0aCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgIChX ZWJDb3JlOjptYXhXb3JkRnJhZ21lbnRXaWR0aCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRleHQuaDoKKwogMjAyMS0xMi0xNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIFVzZSBsb2dpY2FsIG1hcmdpbi9i b3JkZXIvcGFkZGluZyB2YWx1ZXMgaW4gbGF5b3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAKaW5kZXggN2MzYmY5NjhjMzcxMTUwZTU1NWMyMmJiZTFhYzk0M2RhMzUwZGZm YS4uMDA4ODE4YmUzZTc3OThlODNjZjk3ZDhhMzMyNjE4Yjg1MTkyNTQ2NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAtOTI0LDkgKzkyNCw5IEBAIHN0YXRpYyBp bmxpbmUgZmxvYXQgaHlwaGVuV2lkdGgoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IEZvbnRD YXNjYWRlJiBmb250KQogICAgIHJldHVybiBmb250LndpZHRoKHRleHRSdW4pOwogfQogCi1zdGF0 aWMgZmxvYXQgbWF4V29yZEZyYWdtZW50V2lkdGgoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIFN0cmluZ1ZpZXcg d29yZCwgdW5zaWduZWQgbWluaW11bVByZWZpeExlbmd0aCwgdW5zaWduZWQgbWluaW11bVN1ZmZp eExlbmd0aCwgdW5zaWduZWQmIHN1ZmZpeFN0YXJ0LCBIYXNoU2V0PGNvbnN0IEZvbnQqPiYgZmFs bGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyYgZ2x5cGhPdmVyZmxvdykKK2Zsb2F0IFJlbmRlclRl eHQ6Om1heFdvcmRGcmFnbWVudFdpZHRoKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3Qg Rm9udENhc2NhZGUmIGZvbnQsIFN0cmluZ1ZpZXcgd29yZCwgdW5zaWduZWQgbWluaW11bVByZWZp eExlbmd0aCwgdW5zaWduZWQgbWluaW11bVN1ZmZpeExlbmd0aCwgYm9vbCBjdXJyZW50Q2hhcmFj dGVySXNTcGFjZSwgdW5zaWduZWQgY2hhcmFjdGVySW5kZXgsIGZsb2F0IHhQb3MsIGZsb2F0IGVu dGlyZVdvcmRXaWR0aCwgV29yZFRyYWlsaW5nU3BhY2UmIHdvcmRUcmFpbGluZ1NwYWNlLCBIYXNo U2V0PGNvbnN0IEZvbnQqPiYgZmFsbGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyYgZ2x5cGhPdmVy ZmxvdykKIHsKLSAgICBzdWZmaXhTdGFydCA9IDA7CisgICAgdW5zaWduZWQgc3VmZml4U3RhcnQg PSAwOwogICAgIGlmICh3b3JkLmxlbmd0aCgpIDw9IG1pbmltdW1TdWZmaXhMZW5ndGgpCiAgICAg ICAgIHJldHVybiAwOwogCkBAIC05NDEsOCArOTQxLDEzIEBAIHN0YXRpYyBmbG9hdCBtYXhXb3Jk RnJhZ21lbnRXaWR0aChSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlCiAKICAgICBoeXBoZW5Mb2NhdGlvbnMucmV2ZXJzZSgpOwogCi0gICAgLy8gRklYTUU6IEJy ZWFraW5nIHRoZSBzdHJpbmcgYXQgdGhlc2UgcGxhY2VzIGluIHRoZSBtaWRkbGUgb2Ygd29yZHMg aXMgY29tcGxldGVseSBicm9rZW4gd2l0aCBjb21wbGV4IHRleHQuCi0gICAgZmxvYXQgbWluaW11 bUZyYWdtZW50V2lkdGhUb0NvbnNpZGVyID0gZm9udC5waXhlbFNpemUoKSAqIDUgLyA0ICsgaHlw aGVuV2lkdGgocmVuZGVyZXIsIGZvbnQpOworICAgIC8vIENvbnNpZGVyIHRoZSB3b3JkICJBQkMt REVGLUdISSIgKHdoZXJlIHRoZSAnLScgY2hhcmFjdGVycyBhcmUgaHlwaGVuYXRpb24gb3Bwb3J0 dW5pdGllcykuIFdlIHdhbnQgdG8gbWVhc3VyZSB0aGUgd2lkdGgKKyAgICAvLyBvZiAiQUJDLSIg YW5kICJERUYtIiwgYnV0IG5vdCAiR0hJLSIuIEluc3RlYWQsIHdlIHNob3VsZCBtZWFzdXJlICJH SEkiIHRoZSBzYW1lIHdheSB3ZSBtZWFzdXJlIHJlZ3VsYXIgdW5oeXBoZW5hdGVkCisgICAgLy8g d29yZHMgKGJ5IHVzaW5nIHdvcmRUcmFpbGluZ1NwYWNlKS4gVGhlcmVmb3JlLCB0aGlzIGZ1bmN0 aW9uIGlzIHNwbGl0IHVwIGludG8gdHdvIHBhcnRzIC0gb25lIHRoYXQgbWVhc3VyZXMgZWFjaCBw cmVmaXgsCisgICAgLy8gYW5kIG9uZSB0aGF0IG1lYXN1cmVzIHRoZSBzaW5nbGUgbGFzdCBzdWZm aXguCisKKyAgICAvLyBGSVhNRTogQnJlYWtpbmcgdGhlIHN0cmluZyBhdCB0aGVzZSBwbGFjZXMg aW4gdGhlIG1pZGRsZSBvZiB3b3JkcyBkb2Vzbid0IHdvcmsgd2l0aCBjb21wbGV4IHRleHQuCisg ICAgZmxvYXQgbWluaW11bUZyYWdtZW50V2lkdGhUb0NvbnNpZGVyID0gZm9udC5waXhlbFNpemUo KSAqIDUgLyA0ICsgaHlwaGVuV2lkdGgoKnRoaXMsIGZvbnQpOwogICAgIGZsb2F0IG1heEZyYWdt ZW50V2lkdGggPSAwOwogICAgIGZvciAoc2l6ZV90IGsgPSAwOyBrIDwgaHlwaGVuTG9jYXRpb25z LnNpemUoKTsgKytrKSB7CiAgICAgICAgIGludCBmcmFnbWVudExlbmd0aCA9IGh5cGhlbkxvY2F0 aW9uc1trXSAtIHN1ZmZpeFN0YXJ0OwpAQCAtOTUxLDcgKzk1Niw3IEBAIHN0YXRpYyBmbG9hdCBt YXhXb3JkRnJhZ21lbnRXaWR0aChSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5 bGUmIHN0eWxlCiAgICAgICAgIGZyYWdtZW50V2l0aEh5cGhlbi5hcHBlbmQoc3R5bGUuaHlwaGVu U3RyaW5nKCkpOwogCiAgICAgICAgIFRleHRSdW4gcnVuID0gUmVuZGVyQmxvY2s6OmNvbnN0cnVj dFRleHRSdW4oZnJhZ21lbnRXaXRoSHlwaGVuLnRvU3RyaW5nKCksIHN0eWxlKTsKLSAgICAgICAg cnVuLnNldENoYXJhY3RlclNjYW5Gb3JDb2RlUGF0aCghcmVuZGVyZXIuY2FuVXNlU2ltcGxlRm9u dENvZGVQYXRoKCkpOworICAgICAgICBydW4uc2V0Q2hhcmFjdGVyU2NhbkZvckNvZGVQYXRoKCFj YW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKSk7CiAgICAgICAgIGZsb2F0IGZyYWdtZW50V2lkdGgg PSBmb250LndpZHRoKHJ1biwgJmZhbGxiYWNrRm9udHMsICZnbHlwaE92ZXJmbG93KTsKIAogICAg ICAgICAvLyBOYXJyb3cgcHJlZml4ZXMgYXJlIGlnbm9yZWQuIFNlZSB0cnlIeXBoZW5hdGluZyBp biBSZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwLgpAQCAtOTYyLDcgKzk2NywyMiBAQCBzdGF0aWMg ZmxvYXQgbWF4V29yZEZyYWdtZW50V2lkdGgoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIGNvbnN0IFJl bmRlclN0eWxlJiBzdHlsZQogICAgICAgICBtYXhGcmFnbWVudFdpZHRoID0gc3RkOjptYXgobWF4 RnJhZ21lbnRXaWR0aCwgZnJhZ21lbnRXaWR0aCk7CiAgICAgfQogCi0gICAgcmV0dXJuIG1heEZy YWdtZW50V2lkdGg7CisgICAgaWYgKCFzdWZmaXhTdGFydCkgeworICAgICAgICAvLyBXZSBkaWRu J3QgZmluZCBhbnkgaHlwaGVuYXRpb24gb3Bwb3J0dW5pdGllcyB0aGF0IHdlJ3JlIHdpbGxpbmcg dG8gYWN0dWFsbHkgdXNlLgorICAgICAgICAvLyBUaGVyZWZvcmUsIHRoZSB3aWR0aCBvZiB0aGUg bWF4aW11bSBmcmFnbWVudCBpcyBqdXN0IC4uLiB0aGUgd2lkdGggb2YgdGhlIGVudGlyZSB3b3Jk LgorICAgICAgICByZXR1cm4gZW50aXJlV29yZFdpZHRoOworICAgIH0KKworICAgIGZsb2F0IHN1 ZmZpeFdpZHRoOworICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IHdvcmRUcmFpbGluZ1NwYWNlV2lk dGg7CisgICAgaWYgKGN1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlKQorICAgICAgICB3b3JkVHJhaWxp bmdTcGFjZVdpZHRoID0gd29yZFRyYWlsaW5nU3BhY2Uud2lkdGgoZmFsbGJhY2tGb250cyk7Cisg ICAgaWYgKHdvcmRUcmFpbGluZ1NwYWNlV2lkdGgpCisgICAgICAgIHN1ZmZpeFdpZHRoID0gd2lk dGhGcm9tQ2FjaGUoZm9udCwgY2hhcmFjdGVySW5kZXggKyBzdWZmaXhTdGFydCwgd29yZC5sZW5n dGgoKSAtIHN1ZmZpeFN0YXJ0ICsgMSwgeFBvcywgMCwgMCwgc3R5bGUpIC0gd29yZFRyYWlsaW5n U3BhY2VXaWR0aC52YWx1ZSgpOworICAgIGVsc2UKKyAgICAgICAgc3VmZml4V2lkdGggPSB3aWR0 aEZyb21DYWNoZShmb250LCBjaGFyYWN0ZXJJbmRleCArIHN1ZmZpeFN0YXJ0LCB3b3JkLmxlbmd0 aCgpIC0gc3VmZml4U3RhcnQsIHhQb3MsIDAsIDAsIHN0eWxlKTsKKworICAgIHJldHVybiBzdGQ6 Om1heChtYXhGcmFnbWVudFdpZHRoLCBzdWZmaXhXaWR0aCk7CiB9CiAKIHZvaWQgUmVuZGVyVGV4 dDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0 PGNvbnN0IEZvbnQqPiYgZmFsbGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyYgZ2x5cGhPdmVyZmxv dykKQEAgLTExMDgsMjUgKzExMjgsOSBAQCB2b2lkIFJlbmRlclRleHQ6OmNvbXB1dGVQcmVmZXJy ZWRMb2dpY2FsV2lkdGhzKGZsb2F0IGxlYWRXaWR0aCwgSGFzaFNldDxjb25zdCBGbwogICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICBpZiAodyA+IG1heFdvcmRXaWR0aCkgewotICAgICAgICAg ICAgICAgIHVuc2lnbmVkIHN1ZmZpeFN0YXJ0OwotICAgICAgICAgICAgICAgIGZsb2F0IG1heEZy YWdtZW50V2lkdGggPSBtYXhXb3JkRnJhZ21lbnRXaWR0aCgqdGhpcywgc3R5bGUsIGZvbnQsIFN0 cmluZ1ZpZXcoc3RyaW5nKS5zdWJzdHJpbmcoaSwgd29yZExlbiksIG1pbmltdW1QcmVmaXhMZW5n dGgsIG1pbmltdW1TdWZmaXhMZW5ndGgsIHN1ZmZpeFN0YXJ0LCBmYWxsYmFja0ZvbnRzLCBnbHlw aE92ZXJmbG93KTsKLQotICAgICAgICAgICAgICAgIGlmIChzdWZmaXhTdGFydCkgewotICAgICAg ICAgICAgICAgICAgICBmbG9hdCBzdWZmaXhXaWR0aDsKLSAgICAgICAgICAgICAgICAgICAgc3Rk OjpvcHRpb25hbDxmbG9hdD4gd29yZFRyYWlsaW5nU3BhY2VXaWR0aDsKLSAgICAgICAgICAgICAg ICAgICAgaWYgKGlzU3BhY2UpCi0gICAgICAgICAgICAgICAgICAgICAgICB3b3JkVHJhaWxpbmdT cGFjZVdpZHRoID0gd29yZFRyYWlsaW5nU3BhY2Uud2lkdGgoZmFsbGJhY2tGb250cyk7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICh3b3JkVHJhaWxpbmdTcGFjZVdpZHRoKQotICAgICAgICAgICAg ICAgICAgICAgICAgc3VmZml4V2lkdGggPSB3aWR0aEZyb21DYWNoZShmb250LCBpICsgc3VmZml4 U3RhcnQsIHdvcmRMZW4gLSBzdWZmaXhTdGFydCArIDEsIGxlYWRXaWR0aCArIGN1cnJNYXhXaWR0 aCwgMCwgMCwgc3R5bGUpIC0gd29yZFRyYWlsaW5nU3BhY2VXaWR0aC52YWx1ZSgpOwotICAgICAg ICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBzdWZmaXhXaWR0aCA9 IHdpZHRoRnJvbUNhY2hlKGZvbnQsIGkgKyBzdWZmaXhTdGFydCwgd29yZExlbiAtIHN1ZmZpeFN0 YXJ0LCBsZWFkV2lkdGggKyBjdXJyTWF4V2lkdGgsIDAsIDAsIHN0eWxlKTsKLQotICAgICAgICAg ICAgICAgICAgICBtYXhGcmFnbWVudFdpZHRoID0gc3RkOjptYXgobWF4RnJhZ21lbnRXaWR0aCwg c3VmZml4V2lkdGgpOwotCi0gICAgICAgICAgICAgICAgICAgIGN1cnJNaW5XaWR0aCArPSBtYXhG cmFnbWVudFdpZHRoIC0gdzsKLSAgICAgICAgICAgICAgICAgICAgbWF4V29yZFdpZHRoID0gc3Rk OjptYXgobWF4V29yZFdpZHRoLCBtYXhGcmFnbWVudFdpZHRoKTsKLSAgICAgICAgICAgICAgICB9 IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgbWF4V29yZFdpZHRoID0gdzsKKyAgICAgICAgICAg ICAgICBhdXRvIG1heEZyYWdtZW50V2lkdGggPSBtYXhXb3JkRnJhZ21lbnRXaWR0aChzdHlsZSwg Zm9udCwgU3RyaW5nVmlldyhzdHJpbmcpLnN1YnN0cmluZyhpLCB3b3JkTGVuKSwgbWluaW11bVBy ZWZpeExlbmd0aCwgbWluaW11bVN1ZmZpeExlbmd0aCwgaXNTcGFjZSwgaSwgbGVhZFdpZHRoICsg Y3Vyck1heFdpZHRoLCB3LCB3b3JkVHJhaWxpbmdTcGFjZSwgZmFsbGJhY2tGb250cywgZ2x5cGhP dmVyZmxvdyk7CisgICAgICAgICAgICAgICAgY3Vyck1pbldpZHRoICs9IG1heEZyYWdtZW50V2lk dGggLSB3OyAvLyBUaGlzLCB3aGVuIGNvbWJpbmVkIHdpdGggImN1cnJNaW5XaWR0aCArPSB3IiBi ZWxvdywgaGFzIHRoZSBlZmZlY3Qgb2YgZXhlY3V0aW5nICJjdXJyTWluV2lkdGggKz0gbWF4RnJh Z21lbnRXaWR0aCIgaW5zdGVhZC4KKyAgICAgICAgICAgICAgICBtYXhXb3JkV2lkdGggPSBzdGQ6 Om1heChtYXhXb3JkV2lkdGgsIG1heEZyYWdtZW50V2lkdGgpOwogICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICBpZiAoIWZpcnN0R2x5cGhMZWZ0T3ZlcmZsb3cpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHQuaAppbmRleCA1ZTQwNTNmYjA2Y2UwMDNiNWI0YWEyM2IxZTUyN2NhMGJl N2VjNTY5Li5jZTMwMGQ3MzA0Y2RkODBmNjgwMmEzMDk5YmMwMmVlODcxM2JlODZiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKQEAgLTMzLDYgKzMzLDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogY2xhc3MgRm9udDsKIGNsYXNzIExlZ2FjeUlubGluZVRleHRCb3g7CiBzdHJ1 Y3QgR2x5cGhPdmVyZmxvdzsKK3N0cnVjdCBXb3JkVHJhaWxpbmdTcGFjZTsKIAogbmFtZXNwYWNl IExheW91dEludGVncmF0aW9uIHsKIGNsYXNzIExpbmVMYXlvdXQ7CkBAIC0yMjIsNiArMjIzLDgg QEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbnRhaW5lcigpIGNvbnN0ID0gZGVsZXRlOyAvLyBVc2Ug cGFyZW50KCkgaW5zdGVhZC4KICAgICB2b2lkIGNvbnRhaW5lcihjb25zdCBSZW5kZXJMYXllck1v ZGVsT2JqZWN0JiwgYm9vbCYpIGNvbnN0ID0gZGVsZXRlOyAvLyBVc2UgcGFyZW50KCkgaW5zdGVh ZC4KIAorICAgIGZsb2F0IG1heFdvcmRGcmFnbWVudFdpZHRoKGNvbnN0IFJlbmRlclN0eWxlJiwg Y29uc3QgRm9udENhc2NhZGUmLCBTdHJpbmdWaWV3IHdvcmQsIHVuc2lnbmVkIG1pbmltdW1QcmVm aXhMZW5ndGgsIHVuc2lnbmVkIG1pbmltdW1TdWZmaXhMZW5ndGgsIGJvb2wgY3VycmVudENoYXJh Y3RlcklzU3BhY2UsIHVuc2lnbmVkIGNoYXJhY3RlckluZGV4LCBmbG9hdCB4UG9zLCBmbG9hdCBl bnRpcmVXb3JkV2lkdGgsIFdvcmRUcmFpbGluZ1NwYWNlJiwgSGFzaFNldDxjb25zdCBGb250Kj4m IGZhbGxiYWNrRm9udHMsIEdseXBoT3ZlcmZsb3cmKTsKKwogICAgIC8vIFdlIHB1dCB0aGUgYml0 ZmllbGQgZmlyc3QgdG8gbWluaW1pemUgcGFkZGluZyBvbiA2NC1iaXQuCiAgICAgdW5zaWduZWQg bV9oYXNCcmVha2FibGVDaGFyIDogMTsgLy8gV2hldGhlciBvciBub3Qgd2UgY2FuIGJlIGJyb2tl biBpbnRvIG11bHRpcGxlIGxpbmVzLgogICAgIHVuc2lnbmVkIG1faGFzQnJlYWsgOiAxOyAvLyBX aGV0aGVyIG9yIG5vdCB3ZSBoYXZlIGEgaGFyZCBicmVhayAoZS5nLiwgPHByZT4gd2l0aCAnXG4n KS4K