260426 2023-08-19 05:29:47 -0700 [IFC] Cache canUseSimplifiedTextMeasuring on RenderText 2023-08-20 20:58:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1972221 0 zalan 2023-08-19 05:29:47 -0700 ssia 1972225 1 467341 zalan 2023-08-19 05:54:49 -0700 Created attachment 467341 Patch 1972227 2 467342 zalan 2023-08-19 05:59:29 -0700 Created attachment 467342 [fast-cq]Patch 1972240 3 webkit-bug-importer 2023-08-19 09:01:14 -0700 <rdar://problem/114135839> 1972308 4 467342 koivisto 2023-08-20 18:50:08 -0700 Comment on attachment 467342 [fast-cq]Patch View in context: https://bugs.webkit.org/attachment.cgi?id=467342&action=review > Source/WebCore/rendering/RenderText.h:258 > std::optional<float> m_minWidth; > std::optional<float> m_maxWidth; > + std::optional<bool> m_canUseSimplifiedTextMeasuring { }; These waste some space. 1972325 5 zalan 2023-08-20 20:54:25 -0700 (In reply to Antti Koivisto from comment #4) > Comment on attachment 467342 [details] > [fast-cq]Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=467342&action=review > > > Source/WebCore/rendering/RenderText.h:258 > > std::optional<float> m_minWidth; > > std::optional<float> m_maxWidth; > > + std::optional<bool> m_canUseSimplifiedTextMeasuring { }; > > These waste some space. Indeed. Will take care of that in a separate patch. 1972326 6 ews-feeder 2023-08-20 20:58:04 -0700 Committed 267081@main (8f6d89b32a38): <https://commits.webkit.org/267081@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467342. 467341 2023-08-19 05:54:49 -0700 2023-08-19 05:59:27 -0700 Patch bug-260426-20230819055449.patch text/plain 4927 zalan RnJvbSA5ZTE0MjljYWEwZmFlOWQ2M2NlYWY1MTNiYzc4N2EwNzExYWFkYzg4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTkgQXVnIDIwMjMgMDU6MzE6NDcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBD YWNoZSBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBvbiBSZW5kZXJUZXh0CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYwNDI2CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCjEuIENvbXB1dGluZyBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBp cyBhbiBleHBlbnNpdmUgb3BlcmF0aW9uIChpdCBtYXkgaXRlcmF0ZSB0aHJvdWdoIGFsbCB0aGUg Z2x5cGhzIG9mIHRoZSB0ZXh0IGNvbnRlbnQpCjIuIFdlIHVzZWQgdG8gY2FjaGUgdGhpcyBpbmZv cm1hdGlvbiBvbiBSZW5kZXJUZXh0IChzZWUgMjYwNjc1QG1haW4pIGFuZCBub3cgaXQncyBjb21w dXRlZCBhdCBCb3hUcmVlIGJ1aWxkaW5nLgozLiBEdWUgdG8gZWFnZXIgKElGQyBpbnRlZ3JhdGlv bikgaW52YWxpZGF0aW9uLCB3ZSBkZXN0cm95IEJveFRyZWUgaW4gY2FzZXMgd2hlcmUgd2Ugc3Rp bGwga2VlcCBhc3NvY2lhdGVkIFJlbmRlclRleHQgcmVuZGVyZXJzIGFsaXZlLgoKfjEwJSBwcm9n cmVzc2lvbiBvbiBQZXJmb3JtYW5jZVRlc3RzL0xheW91dC9saW5lLWxheW91dC1wcmVmZXJyZWQt d2lkdGgtYnJlYWstYWxsLmh0bWwKCiogUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlv dXQuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Cb3hUcmVlLmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpj cmVhdGVMYXlvdXRCb3gpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNw cDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldFJlbmRlcmVkVGV4dCk6CiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldENhblVz ZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKToKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nIGNvbnN0KToKLS0tCiAuLi4vbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgICAgICAgfCA4ICsrKysrKy0tCiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgICAgICAgICAgICAgICAgICAgfCA0ICsr Ky0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggICAgICAgICAgICAgICAg ICAgICB8IDQgKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKaW5kZXggNjE1ODJiNDBhYTdlLi5j YzZmZGRmYWZiYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCkBAIC0xOTMsOCArMTkz LDEyIEBAIFVuaXF1ZVJlZjxMYXlvdXQ6OkJveD4gQm94VHJlZTo6Y3JlYXRlTGF5b3V0Qm94KFJl bmRlck9iamVjdCYgcmVuZGVyZXIpCiAgICAgICAgICAgICA/IChpc0NvbWJpbmVkVGV4dCA/IHRl eHRSZW5kZXJlci5vcmlnaW5hbFRleHQoKSA6IHRleHRSZW5kZXJlci50ZXh0KCkpCiAgICAgICAg ICAgICA6IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0eURpc2NDaGFyYWN0ZXJzKHN0eWxlLCBp c0NvbWJpbmVkVGV4dCA/IHRleHRSZW5kZXJlci5vcmlnaW5hbFRleHQoKSA6IHRleHRSZW5kZXJl ci50ZXh0KCkpOwogICAgICAgICBhdXRvIGNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCA9IHRleHRS ZW5kZXJlci5jYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKTsKLSAgICAgICAgYXV0byBjYW5Vc2VT aW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IGNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCAmJiBMYXlv dXQ6OlRleHRVdGlsOjpjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyh0ZXh0LCBzdHlsZSwg Zmlyc3RMaW5lU3R5bGUuZ2V0KCkpOwotICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZVJlZjxMYXlv dXQ6OklubGluZVRleHRCb3g+KHRleHQsIGlzQ29tYmluZWRUZXh0LCBjYW5Vc2VTaW1wbGlmaWVk VGV4dE1lYXN1cmluZywgY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoLCBXVEZNb3ZlKHN0eWxlKSwg V1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOworICAgICAgICBhdXRvIGNhblVzZVNpbXBsaWZpZWRU ZXh0TWVhc3VyaW5nID0gdGV4dFJlbmRlcmVyLmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5n KCk7CisgICAgICAgIGlmICghY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcpIHsKKyAgICAg ICAgICAgIGNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gY2FuVXNlU2ltcGxlRm9udENv ZGVQYXRoICYmIExheW91dDo6VGV4dFV0aWw6OmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5n KHRleHQsIHN0eWxlLCBmaXJzdExpbmVTdHlsZS5nZXQoKSk7CisgICAgICAgICAgICB0ZXh0UmVu ZGVyZXIuc2V0Q2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoKmNhblVzZVNpbXBsaWZpZWRU ZXh0TWVhc3VyaW5nKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZVJlZjxM YXlvdXQ6OklubGluZVRleHRCb3g+KHRleHQsIGlzQ29tYmluZWRUZXh0LCAqY2FuVXNlU2ltcGxp ZmllZFRleHRNZWFzdXJpbmcsIGNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCwgV1RGTW92ZShzdHls ZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5bGUpKTsKICAgICB9CiAKICAgICBhdXRvJiByZW5kZXJF bGVtZW50ID0gZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4ocmVuZGVyZXIpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCmluZGV4IDBjZWJjYWFhYzc3OC4uZjRhMjEzMDFiNjI3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCkBAIC05Miw2ICs5Miw3 IEBAIHN0cnVjdCBTYW1lU2l6ZUFzUmVuZGVyVGV4dCA6IHB1YmxpYyBSZW5kZXJPYmplY3Qgewog ICAgIGZsb2F0IHdpZHRoc1syXTsKICAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBtaW5XaWR0aDsK ICAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBtYXhXaWR0aDsKKyAgICBzdGQ6Om9wdGlvbmFsPGJv b2w+IGNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nOwogICAgIFN0cmluZyB0ZXh0OwogfTsK IApAQCAtMTU4Myw3ICsxNTg0LDggQEAgdm9pZCBSZW5kZXJUZXh0OjpzZXRSZW5kZXJlZFRleHQo Y29uc3QgU3RyaW5nJiBuZXdUZXh0KQogCiAgICAgbV9jb250YWluc09ubHlBU0NJSSA9IHRleHQo KS5jb250YWluc09ubHlBU0NJSSgpOwogICAgIG1fY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoID0g Y29tcHV0ZUNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpOwotICAgIAorICAgIG1fY2FuVXNlU2lt cGxpZmllZFRleHRNZWFzdXJpbmcgPSB7IH07CisKICAgICBpZiAobV90ZXh0ICE9IG9yaWdpbmFs VGV4dCkgewogICAgICAgICBvcmlnaW5hbFRleHRNYXAoKS5zZXQodGhpcywgb3JpZ2luYWxUZXh0 KTsKICAgICAgICAgbV9vcmlnaW5hbFRleHREaWZmZXJzRnJvbVJlbmRlcmVkID0gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCmluZGV4IDY4ZGMyYTNlZmEwYi4uOTdiZDg3 MTFiYTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKQEAgLTE4NCw2ICsx ODQsOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlc2V0TWluTWF4V2lkdGgoKTsKIAorICAgIHZv aWQgc2V0Q2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoYm9vbCBjYW5Vc2VTaW1wbGlmaWVk VGV4dE1lYXN1cmluZykgeyBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gY2FuVXNl U2ltcGxpZmllZFRleHRNZWFzdXJpbmc7IH0KKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IGNhblVz ZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9jYW5Vc2VTaW1wbGlm aWVkVGV4dE1lYXN1cmluZzsgfQorCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1 dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKGZsb2F0IGxlYWRXaWR0aCwgYm9vbCBmb3JjZWRNaW5N YXhXaWR0aENvbXB1dGF0aW9uID0gZmFsc2UpOwogICAgIHZvaWQgd2lsbEJlRGVzdHJveWVkKCkg b3ZlcnJpZGU7CkBAIC0yNTIsNiArMjU1LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIHN0ZDo6 b3B0aW9uYWw8ZmxvYXQ+IG1fbWluV2lkdGg7CiAgICAgc3RkOjpvcHRpb25hbDxmbG9hdD4gbV9t YXhXaWR0aDsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IG1fY2FuVXNlU2ltcGxpZmllZFRleHRN ZWFzdXJpbmcgeyB9OwogICAgIGZsb2F0IG1fYmVnaW5NaW5XaWR0aCB7IDAgfTsKICAgICBmbG9h dCBtX2VuZE1pbldpZHRoIHsgMCB9OwogCg== 467342 2023-08-19 05:59:29 -0700 2023-08-20 20:58:05 -0700 [fast-cq]Patch bug-260426-20230819055928.patch text/plain 5366 zalan RnJvbSA1YWI4NzZiMWU5ZTdjNmY1OTBkOTA4ZjZkMzlkODQ5ZWZlYmMxOGE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTkgQXVnIDIwMjMgMDU6MzE6NDcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBD YWNoZSBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBvbiBSZW5kZXJUZXh0CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYwNDI2CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCjEuIENvbXB1dGluZyBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBp cyBhbiBleHBlbnNpdmUgb3BlcmF0aW9uIChpdCBtYXkgaXRlcmF0ZSB0aHJvdWdoIGFsbCB0aGUg Z2x5cGhzIG9mIHRoZSB0ZXh0IGNvbnRlbnQpCjIuIFdlIHVzZWQgdG8gY2FjaGUgdGhpcyBpbmZv cm1hdGlvbiBvbiBSZW5kZXJUZXh0IChzZWUgMjYwNjc1QG1haW4pIGFuZCBub3cgaXQncyBjb21w dXRlZCBhdCBCb3hUcmVlIGJ1aWxkaW5nLgozLiBEdWUgdG8gZWFnZXIgKElGQyBpbnRlZ3JhdGlv bikgaW52YWxpZGF0aW9uLCB3ZSBkZXN0cm95IEJveFRyZWUgaW4gY2FzZXMgd2hlcmUgd2Ugc3Rp bGwga2VlcCBhc3NvY2lhdGVkIFJlbmRlclRleHQgcmVuZGVyZXJzIGFsaXZlLgoKfjEwJSBwcm9n cmVzc2lvbiBvbiBQZXJmb3JtYW5jZVRlc3RzL0xheW91dC9saW5lLWxheW91dC1wcmVmZXJyZWQt d2lkdGgtYnJlYWstYWxsLmh0bWwKCiogUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlv dXQuaHRtbDoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Cb3hUcmVlLmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpj cmVhdGVMYXlvdXRCb3gpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNw cDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldFJlbmRlcmVkVGV4dCk6CiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaDoKKFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldENhblVz ZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKToKKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNhblVzZVNp bXBsaWZpZWRUZXh0TWVhc3VyaW5nIGNvbnN0KToKLS0tCiAuLi4vbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgICAgICAgfCA4ICsrKysrKy0tCiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgICAgICAgICAgICAgICAgICAgfCA2ICsr KysrLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaCAgICAgICAgICAgICAg ICAgICAgIHwgNCArKysrCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA2MTU4MmI0MGFhN2Uu LmNjNmZkZGZhZmJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTE5Myw4ICsx OTMsMTIgQEAgVW5pcXVlUmVmPExheW91dDo6Qm94PiBCb3hUcmVlOjpjcmVhdGVMYXlvdXRCb3go UmVuZGVyT2JqZWN0JiByZW5kZXJlcikKICAgICAgICAgICAgID8gKGlzQ29tYmluZWRUZXh0ID8g dGV4dFJlbmRlcmVyLm9yaWdpbmFsVGV4dCgpIDogdGV4dFJlbmRlcmVyLnRleHQoKSkKICAgICAg ICAgICAgIDogUmVuZGVyQmxvY2s6OnVwZGF0ZVNlY3VyaXR5RGlzY0NoYXJhY3RlcnMoc3R5bGUs IGlzQ29tYmluZWRUZXh0ID8gdGV4dFJlbmRlcmVyLm9yaWdpbmFsVGV4dCgpIDogdGV4dFJlbmRl cmVyLnRleHQoKSk7CiAgICAgICAgIGF1dG8gY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoID0gdGV4 dFJlbmRlcmVyLmNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpOwotICAgICAgICBhdXRvIGNhblVz ZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0gY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoICYmIExh eW91dDo6VGV4dFV0aWw6OmNhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nKHRleHQsIHN0eWxl LCBmaXJzdExpbmVTdHlsZS5nZXQoKSk7Ci0gICAgICAgIHJldHVybiBtYWtlVW5pcXVlUmVmPExh eW91dDo6SW5saW5lVGV4dEJveD4odGV4dCwgaXNDb21iaW5lZFRleHQsIGNhblVzZVNpbXBsaWZp ZWRUZXh0TWVhc3VyaW5nLCBjYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgsIFdURk1vdmUoc3R5bGUp LCBXVEZNb3ZlKGZpcnN0TGluZVN0eWxlKSk7CisgICAgICAgIGF1dG8gY2FuVXNlU2ltcGxpZmll ZFRleHRNZWFzdXJpbmcgPSB0ZXh0UmVuZGVyZXIuY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJp bmcoKTsKKyAgICAgICAgaWYgKCFjYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZykgeworICAg ICAgICAgICAgY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgPSBjYW5Vc2VTaW1wbGVGb250 Q29kZVBhdGggJiYgTGF5b3V0OjpUZXh0VXRpbDo6Y2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJp bmcodGV4dCwgc3R5bGUsIGZpcnN0TGluZVN0eWxlLmdldCgpKTsKKyAgICAgICAgICAgIHRleHRS ZW5kZXJlci5zZXRDYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZygqY2FuVXNlU2ltcGxpZmll ZFRleHRNZWFzdXJpbmcpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBtYWtlVW5pcXVlUmVm PExheW91dDo6SW5saW5lVGV4dEJveD4odGV4dCwgaXNDb21iaW5lZFRleHQsICpjYW5Vc2VTaW1w bGlmaWVkVGV4dE1lYXN1cmluZywgY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoLCBXVEZNb3ZlKHN0 eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOwogICAgIH0KIAogICAgIGF1dG8mIHJlbmRl ckVsZW1lbnQgPSBkb3duY2FzdDxSZW5kZXJFbGVtZW50PihyZW5kZXJlcik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggMGNlYmNhYWFjNzc4Li5mN2M0M2JmZmFj MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTkyLDYgKzky LDcgQEAgc3RydWN0IFNhbWVTaXplQXNSZW5kZXJUZXh0IDogcHVibGljIFJlbmRlck9iamVjdCB7 CiAgICAgZmxvYXQgd2lkdGhzWzJdOwogICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IG1pbldpZHRo OwogICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IG1heFdpZHRoOworICAgIHN0ZDo6b3B0aW9uYWw8 Ym9vbD4gY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmc7CiAgICAgU3RyaW5nIHRleHQ7CiB9 OwogCkBAIC0zMjgsNiArMzI5LDggQEAgdm9pZCBSZW5kZXJUZXh0OjpzdHlsZURpZENoYW5nZShT dHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWwKICAgICBjb25z dCBSZW5kZXJTdHlsZSYgbmV3U3R5bGUgPSBzdHlsZSgpOwogICAgIGlmICghb2xkU3R5bGUpCiAg ICAgICAgIGluaXRpYXRlRm9udExvYWRpbmdCeUFjY2Vzc2luZ0dseXBoRGF0YUlmQXBwbGljYWJs ZShtX3RleHQsIG5ld1N0eWxlLmZvbnRDYXNjYWRlKCkpOworICAgIGlmIChvbGRTdHlsZSAmJiBv bGRTdHlsZS0+Zm9udENhc2NhZGUoKSAhPSBuZXdTdHlsZS5mb250Q2FzY2FkZSgpKQorICAgICAg ICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nID0geyB9OwogCiAgICAgYm9vbCBuZWVk c1Jlc2V0VGV4dCA9IGZhbHNlOwogICAgIGlmICghb2xkU3R5bGUpIHsKQEAgLTE1ODMsNyArMTU4 Niw4IEBAIHZvaWQgUmVuZGVyVGV4dDo6c2V0UmVuZGVyZWRUZXh0KGNvbnN0IFN0cmluZyYgbmV3 VGV4dCkKIAogICAgIG1fY29udGFpbnNPbmx5QVNDSUkgPSB0ZXh0KCkuY29udGFpbnNPbmx5QVND SUkoKTsKICAgICBtX2NhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCA9IGNvbXB1dGVDYW5Vc2VTaW1w bGVGb250Q29kZVBhdGgoKTsKLSAgICAKKyAgICBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3Vy aW5nID0geyB9OworCiAgICAgaWYgKG1fdGV4dCAhPSBvcmlnaW5hbFRleHQpIHsKICAgICAgICAg b3JpZ2luYWxUZXh0TWFwKCkuc2V0KHRoaXMsIG9yaWdpbmFsVGV4dCk7CiAgICAgICAgIG1fb3Jp Z2luYWxUZXh0RGlmZmVyc0Zyb21SZW5kZXJlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuaAppbmRleCA2OGRjMmEzZWZhMGIuLjk3YmQ4NzExYmE5MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCkBAIC0xODQsNiArMTg0LDkgQEAgcHVibGljOgog CiAgICAgdm9pZCByZXNldE1pbk1heFdpZHRoKCk7CiAKKyAgICB2b2lkIHNldENhblVzZVNpbXBs aWZpZWRUZXh0TWVhc3VyaW5nKGJvb2wgY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcpIHsg bV9jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyA9IGNhblVzZVNpbXBsaWZpZWRUZXh0TWVh c3VyaW5nOyB9CisgICAgc3RkOjpvcHRpb25hbDxib29sPiBjYW5Vc2VTaW1wbGlmaWVkVGV4dE1l YXN1cmluZygpIGNvbnN0IHsgcmV0dXJuIG1fY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmc7 IH0KKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNh bFdpZHRocyhmbG9hdCBsZWFkV2lkdGgsIGJvb2wgZm9yY2VkTWluTWF4V2lkdGhDb21wdXRhdGlv biA9IGZhbHNlKTsKICAgICB2b2lkIHdpbGxCZURlc3Ryb3llZCgpIG92ZXJyaWRlOwpAQCAtMjUy LDYgKzI1NSw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBt X21pbldpZHRoOwogICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IG1fbWF4V2lkdGg7CisgICAgc3Rk OjpvcHRpb25hbDxib29sPiBtX2NhblVzZVNpbXBsaWZpZWRUZXh0TWVhc3VyaW5nIHsgfTsKICAg ICBmbG9hdCBtX2JlZ2luTWluV2lkdGggeyAwIH07CiAgICAgZmxvYXQgbV9lbmRNaW5XaWR0aCB7 IDAgfTsKIAo=