221753 2021-02-11 06:53:16 -0800 Remove FontSelector dependence in CSSFontFace when creating a new FontFace wrapper 2021-02-11 08:07:15 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 208351 1 clord clord esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard mmaxfield webkit-bug-importer oldest_to_newest 1728066 0 clord 2021-02-11 06:53:16 -0800 As part of the work of removing the m_fontSelector member in CSSFontFace, we can remove a use of it when creating a FontFace wrapper by adding a parameter to provide the script execution context (which is the actual dependence, via FontSelector::document()). 1728071 1 419984 clord 2021-02-11 06:57:53 -0800 Created attachment 419984 Patch 1728072 2 419984 mmaxfield 2021-02-11 07:07:57 -0800 Comment on attachment 419984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419984&action=review > Source/WebCore/css/FontFace.h:58 > + static Ref<FontFace> create(ScriptExecutionContext*, CSSFontFace&); How come this change doesn’t have an accompanying IDL change? 1728073 3 419984 mmaxfield 2021-02-11 07:08:11 -0800 Comment on attachment 419984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419984&action=review > Source/WebCore/css/FontFace.h:58 > + static Ref<FontFace> create(ScriptExecutionContext*, CSSFontFace&); How come this change doesn’t have an accompanying IDL change? 1728077 4 clord 2021-02-11 07:21:43 -0800 (In reply to Myles C. Maxfield from comment #3) > Comment on attachment 419984 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=419984&action=review > > > Source/WebCore/css/FontFace.h:58 > > + static Ref<FontFace> create(ScriptExecutionContext*, CSSFontFace&); > > How come this change doesn’t have an accompanying IDL change? This constructor doesn't feature in the idl and the one that does remains unchanged. 1728078 5 419986 clord 2021-02-11 07:23:32 -0800 Created attachment 419986 Patch 1728089 6 ews-feeder 2021-02-11 08:06:13 -0800 Committed r272727: <https://commits.webkit.org/r272727> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419986. 1728090 7 webkit-bug-importer 2021-02-11 08:07:15 -0800 <rdar://problem/74234470> 419984 2021-02-11 06:57:53 -0800 2021-02-11 07:23:27 -0800 Patch bug-221753-20210211145752.patch text/plain 6622 clord U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAyYmM0YWVjZGY2NDUx NTFkNGMxYWRiYTY0Nzk4NDBjNmQyMzA5NC4uNzU4Njg5NmViNjE4YTc1MjRmYTQ3NDI4ZjkzN2Q0 ZjU3ZWU4MGRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAyLTExICBDaHJp cyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgRm9udFNlbGVjdG9y IGRlcGVuZGVuY2UgaW4gQ1NTRm9udEZhY2Ugd2hlbiBjcmVhdGluZyBhIG5ldyBGb250RmFjZSB3 cmFwcGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjE3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgYSBwYXJhbWV0ZXIgdG8gdGhlIENTU0ZvbnRGYWNlLWJhc2VkIEZvbnRGYWNlIGNvbnN0cnVj dG9yIHRvIGFsbG93CisgICAgICAgIHNwZWNpZnlpbmcgdGhlIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQgYW5kIHRoZXJlZm9yZSBhbGxvdyByZW1vdmFsIG9mCisgICAgICAgIGFub3RoZXIgZGVwZW5k ZW5jZSBvbiBtX2ZvbnRTZWxlY3RvciBpbiBDU1NGb250RmFjZS4KKworICAgICAgICBObyBuZXcg dGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBj c3MvQ1NTRm9udEZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2U6OndyYXBw ZXIpOgorICAgICAgICAqIGNzcy9DU1NGb250RmFjZS5oOgorICAgICAgICAqIGNzcy9Gb250RmFj ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFjZTo6Y3JlYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRGYWNlOjpGb250RmFjZSk6CisgICAgICAgICogY3NzL0ZvbnRGYWNlLmg6Cisg ICAgICAgICogY3NzL0ZvbnRGYWNlU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNl U2V0OjpJdGVyYXRvcjo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFjZVNldDo6bG9h ZCk6CisKIDIwMjEtMDItMDIgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgYW5vdGhlciB1c2Ugb2YgRm9udFNlbGVjdG9yIGZyb20gd2l0 aGluIENTU0ZvbnRGYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZh Y2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAppbmRleCAwM2YyNjJj MDFmODI2Zjg3MzU0MGM5ODhhNTQ1NmFmMWM4MzM5YWU4Li40MjgzMmNjNDlmNGQzZjIwMDgzYTIy OGE5YWJiYTdlYzc3OTgwNTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5jcHAKQEAgLTQy OSwxMiArNDI5LDE0IEBAIHZvaWQgQ1NTRm9udEZhY2U6OmluaXRpYWxpemVXcmFwcGVyKCkKICAg ICBtX21heUJlUHVyZ2VkID0gZmFsc2U7CiB9CiAKLVJlZjxGb250RmFjZT4gQ1NTRm9udEZhY2U6 OndyYXBwZXIoKQorUmVmPEZvbnRGYWNlPiBDU1NGb250RmFjZTo6d3JhcHBlcihTY3JpcHRFeGVj dXRpb25Db250ZXh0KiBjb250ZXh0KQogewotICAgIGlmIChtX3dyYXBwZXIpCisgICAgaWYgKG1f d3JhcHBlcikgeworICAgICAgICBBU1NFUlQobV93cmFwcGVyLT5zY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkgPT0gY29udGV4dCk7CiAgICAgICAgIHJldHVybiAqbV93cmFwcGVyLmdldCgpOworICAg IH0KIAotICAgIGF1dG8gd3JhcHBlciA9IEZvbnRGYWNlOjpjcmVhdGUoKnRoaXMpOworICAgIGF1 dG8gd3JhcHBlciA9IEZvbnRGYWNlOjpjcmVhdGUoY29udGV4dCwgKnRoaXMpOwogICAgIG1fd3Jh cHBlciA9IG1ha2VXZWFrUHRyKHdyYXBwZXIuZ2V0KCkpOwogICAgIGluaXRpYWxpemVXcmFwcGVy KCk7CiAgICAgcmV0dXJuIHdyYXBwZXI7CkBAIC00NTQsMTEgKzQ1Niw2IEBAIHZvaWQgQ1NTRm9u dEZhY2U6OmFkb3B0U291cmNlKHN0ZDo6dW5pcXVlX3B0cjxDU1NGb250RmFjZVNvdXJjZT4mJiBz b3VyY2UpCiAgICAgQVNTRVJUKCFtX3NvdXJjZXNQb3B1bGF0ZWQpOwogfQogCi1Eb2N1bWVudCog Q1NTRm9udEZhY2U6OmRvY3VtZW50KCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9mb250U2VsZWN0 b3IgPyBtX2ZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSA6IG51bGxwdHI7Ci19Ci0KIGF1dG8gQ1NT Rm9udEZhY2U6OmZvbnRMb2FkVGltaW5nKCkgY29uc3QgLT4gRm9udExvYWRUaW1pbmcKIHsKICAg ICBzd2l0Y2ggKG1fZm9udExvYWRUaW1pbmdPdmVycmlkZSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZh Y2UuaAppbmRleCBjYzE3YWVjMmYxY2Q5ZjU5ODBlZTQwZDg3YjE4ZDhkOGExMmI4N2Y5Li5mMjYy ZDA1ZjdkNzBlNWY5M2NjZjNhNjg1YWRmMTc0YWEzNjc0Nzc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2UuaApAQCAtNTMsNiArNTMsNyBAQCBjbGFzcyBEb2N1bWVudDsKIGNsYXNzIEZvbnREZXNj cmlwdGlvbjsKIGNsYXNzIEZvbnQ7CiBjbGFzcyBGb250RmFjZTsKK2NsYXNzIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ7CiBlbnVtIGNsYXNzIEV4dGVybmFsUmVzb3VyY2VEb3dubG9hZFBvbGljeTsK IAogREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lERU5USUZJRVIoQ1NTRm9udEZhY2UpOwpA QCAtMTQ1LDcgKzE0Niw3IEBAIHB1YmxpYzoKICAgICBib29sIHJhbmdlc01hdGNoQ29kZVBvaW50 KFVDaGFyMzIpIGNvbnN0OwogCiAgICAgLy8gV2UgZG9uJ3QgZ3VhcmFudGVlIHRoYXQgdGhlIEZv bnRGYWNlIHdyYXBwZXIgd2lsbCBiZSB0aGUgc2FtZSBldmVyeSB0aW1lIHlvdSBhc2sgZm9yIGl0 LgotICAgIFJlZjxGb250RmFjZT4gd3JhcHBlcigpOworICAgIFJlZjxGb250RmFjZT4gd3JhcHBl cihTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgdm9pZCBzZXRXcmFwcGVyKEZvbnRGYWNl Jik7CiAgICAgRm9udEZhY2UqIGV4aXN0aW5nV3JhcHBlcigpOwogCkBAIC0xNjUsOCArMTY2LDYg QEAgcHVibGljOgogICAgIGJvb2wgaGFzU1ZHRm9udEZhY2VTb3VyY2UoKSBjb25zdDsKICAgICB2 b2lkIHNldEVycm9yU3RhdGUoKTsKIAotICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0Owot CiBwcml2YXRlOgogICAgIENTU0ZvbnRGYWNlKENTU0ZvbnRTZWxlY3RvciosIFN0eWxlUnVsZUZv bnRGYWNlKiwgRm9udEZhY2UqLCBib29sIGlzTG9jYWxGYWxsYmFjayk7CiAgICAgQ1NTRm9udEZh Y2UoY29uc3QgU2V0dGluZ3MqLCBTdHlsZVJ1bGVGb250RmFjZSosIEZvbnRGYWNlKiwgYm9vbCBp c0xvY2FsRmFsbGJhY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5jcHAKaW5kZXggYzA2ZDFmMzgzYmY1 ZmExMzcwYjZjOGE5M2I1MTA1ZjgxYTBhOWY2MC4uM2Y3NjgyMWU0ZDA5ZWJhZjMyMGI0MzUyZGRl NjAzNDkzNzIyYmE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuY3BwCkBAIC0xNDAsOSArMTQwLDkg QEAgUmVmPEZvbnRGYWNlPiBGb250RmFjZTo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCwgY29u c3QgU3RyaW5nJiBmYW1pbHksIFNvdXJjZSYKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1SZWY8 Rm9udEZhY2U+IEZvbnRGYWNlOjpjcmVhdGUoQ1NTRm9udEZhY2UmIGZhY2UpCitSZWY8Rm9udEZh Y2U+IEZvbnRGYWNlOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgQ1NT Rm9udEZhY2UmIGZhY2UpCiB7Ci0gICAgYXV0byBmb250RmFjZSA9IGFkb3B0UmVmKCpuZXcgRm9u dEZhY2UoZmFjZSkpOworICAgIGF1dG8gZm9udEZhY2UgPSBhZG9wdFJlZigqbmV3IEZvbnRGYWNl KGNvbnRleHQsIGZhY2UpKTsKICAgICBmb250RmFjZS0+c3VzcGVuZElmTmVlZGVkKCk7CiAgICAg cmV0dXJuIGZvbnRGYWNlOwogfQpAQCAtMTU1LDggKzE1NSw4IEBAIEZvbnRGYWNlOjpGb250RmFj ZShDU1NGb250U2VsZWN0b3ImIGZvbnRTZWxlY3RvcikKICAgICBtX2JhY2tpbmctPmFkZENsaWVu dCgqdGhpcyk7CiB9CiAKLUZvbnRGYWNlOjpGb250RmFjZShDU1NGb250RmFjZSYgZmFjZSkKLSAg ICA6IEFjdGl2ZURPTU9iamVjdChmYWNlLmRvY3VtZW50KCkpCitGb250RmFjZTo6Rm9udEZhY2Uo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgQ1NTRm9udEZhY2UmIGZhY2UpCisgICAg OiBBY3RpdmVET01PYmplY3QoY29udGV4dCkKICAgICAsIG1fYmFja2luZyhmYWNlKQogICAgICwg bV9sb2FkZWRQcm9taXNlKG1ha2VVbmlxdWVSZWY8TG9hZGVkUHJvbWlzZT4oKnRoaXMsICZGb250 RmFjZTo6bG9hZGVkUHJvbWlzZVJlc29sdmUpKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL0ZvbnRGYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuaAppbmRleCA0 NGNhNmQ1ODg1YzNjODE1OTFmNjM4ZWRjZDk3NjM5NjE2N2UxMDY2Li5mYzE3ZWE2MWQ2ZjkzNGFl ZWVhZWUzYTYyNGRlY2QxZDQ3Y2UyYzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Rm9udEZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuaApAQCAtNTUsNyAr NTUsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdXNpbmcgU291cmNlID0gVmFyaWFudDxTdHJpbmcs IFJlZlB0cjxKU0M6OkFycmF5QnVmZmVyPiwgUmVmUHRyPEpTQzo6QXJyYXlCdWZmZXJWaWV3Pj47 CiAgICAgc3RhdGljIFJlZjxGb250RmFjZT4gY3JlYXRlKERvY3VtZW50JiwgY29uc3QgU3RyaW5n JiBmYW1pbHksIFNvdXJjZSYmLCBjb25zdCBEZXNjcmlwdG9ycyYpOwotICAgIHN0YXRpYyBSZWY8 Rm9udEZhY2U+IGNyZWF0ZShDU1NGb250RmFjZSYpOworICAgIHN0YXRpYyBSZWY8Rm9udEZhY2U+ IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQ1NTRm9udEZhY2UmKTsKICAgICB2aXJ0 dWFsIH5Gb250RmFjZSgpOwogCiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0RmFtaWx5KERvY3Vt ZW50JiwgY29uc3QgU3RyaW5nJik7CkBAIC05NCw3ICs5NCw3IEBAIHB1YmxpYzoKIAogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBGb250RmFjZShDU1NGb250U2VsZWN0b3ImKTsKLSAgICBleHBsaWNp dCBGb250RmFjZShDU1NGb250RmFjZSYpOworICAgIGV4cGxpY2l0IEZvbnRGYWNlKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBDU1NGb250RmFjZSYpOwogCiAgICAgLy8gQWN0aXZlRE9NT2JqZWN0 LgogICAgIGNvbnN0IGNoYXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCBmaW5hbDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvRm9udEZhY2VTZXQuY3BwCmluZGV4IDJhYzk1NzYxN2RmMDM2MTQ0ZTE3YzMyYTAz NzI0ZTU0NGQwOWZmZjAuLjIxYjZmNjhlZjMzMzZhNGE5Y2RiNzNjNTZlNWI1ZTc4ZTA0YWNkYzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcApAQCAtOTIsNyArOTIsNyBAQCBSZWZQdHI8 Rm9udEZhY2U+IEZvbnRGYWNlU2V0OjpJdGVyYXRvcjo6bmV4dCgpCiB7CiAgICAgaWYgKG1faW5k ZXggPT0gbV90YXJnZXQtPnNpemUoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgcmV0 dXJuIG1fdGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKCk7CisgICAgcmV0dXJu IG1fdGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKG1fdGFyZ2V0LT5zY3JpcHRF eGVjdXRpb25Db250ZXh0KCkpOwogfQogCiBGb250RmFjZVNldDo6UGVuZGluZ1Byb21pc2U6OlBl bmRpbmdQcm9taXNlKExvYWRQcm9taXNlJiYgcHJvbWlzZSkKQEAgLTE2MSw3ICsxNjEsNyBAQCB2 b2lkIEZvbnRGYWNlU2V0Ojpsb2FkKGNvbnN0IFN0cmluZyYgZm9udCwgY29uc3QgU3RyaW5nJiB0 ZXh0LCBMb2FkUHJvbWlzZSYmIHBybwogICAgIGJvb2wgd2FpdGluZyA9IGZhbHNlOwogCiAgICAg Zm9yIChhdXRvJiBmYWNlIDogbWF0Y2hpbmdGYWNlcykgewotICAgICAgICBwZW5kaW5nUHJvbWlz ZS0+ZmFjZXMuYXBwZW5kKGZhY2UuZ2V0KCkud3JhcHBlcigpKTsKKyAgICAgICAgcGVuZGluZ1By b21pc2UtPmZhY2VzLmFwcGVuZChmYWNlLmdldCgpLndyYXBwZXIoc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpKSk7CiAgICAgICAgIGlmIChmYWNlLmdldCgpLnN0YXR1cygpID09IENTU0ZvbnRGYWNl OjpTdGF0dXM6OlN1Y2Nlc3MpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgd2FpdGlu ZyA9IHRydWU7Cg== 419986 2021-02-11 07:23:32 -0800 2021-02-11 08:06:15 -0800 Patch bug-221753-20210211152331.patch text/plain 6625 clord U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAyYmM0YWVjZGY2NDUx NTFkNGMxYWRiYTY0Nzk4NDBjNmQyMzA5NC4uNTdmNDAwNTdhZDE2MmJlYjY4YWI2ZGNjOWRlMWVh NDhmNmNiMGNiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAyLTExICBDaHJp cyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgRm9udFNlbGVjdG9y IGRlcGVuZGVuY2UgaW4gQ1NTRm9udEZhY2Ugd2hlbiBjcmVhdGluZyBhIG5ldyBGb250RmFjZSB3 cmFwcGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjE3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBNeWxlcyBDLiBNYXhmaWVsZC4KKworICAgICAg ICBBZGQgYSBwYXJhbWV0ZXIgdG8gdGhlIENTU0ZvbnRGYWNlLWJhc2VkIEZvbnRGYWNlIGNvbnN0 cnVjdG9yIHRvIGFsbG93CisgICAgICAgIHNwZWNpZnlpbmcgdGhlIFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQgYW5kIHRoZXJlZm9yZSBhbGxvdyByZW1vdmFsIG9mCisgICAgICAgIGFub3RoZXIgZGVw ZW5kZW5jZSBvbiBtX2ZvbnRTZWxlY3RvciBpbiBDU1NGb250RmFjZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAg KiBjc3MvQ1NTRm9udEZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2U6Ondy YXBwZXIpOgorICAgICAgICAqIGNzcy9DU1NGb250RmFjZS5oOgorICAgICAgICAqIGNzcy9Gb250 RmFjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFjZTo6Y3JlYXRlKToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRGYWNlOjpGb250RmFjZSk6CisgICAgICAgICogY3NzL0ZvbnRGYWNlLmg6 CisgICAgICAgICogY3NzL0ZvbnRGYWNlU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRG YWNlU2V0OjpJdGVyYXRvcjo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250RmFjZVNldDo6 bG9hZCk6CisKIDIwMjEtMDItMDIgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgYW5vdGhlciB1c2Ugb2YgRm9udFNlbGVjdG9yIGZyb20g d2l0aGluIENTU0ZvbnRGYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAppbmRleCAwM2Yy NjJjMDFmODI2Zjg3MzU0MGM5ODhhNTQ1NmFmMWM4MzM5YWU4Li40MjgzMmNjNDlmNGQzZjIwMDgz YTIyOGE5YWJiYTdlYzc3OTgwNTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5jcHAKQEAg LTQyOSwxMiArNDI5LDE0IEBAIHZvaWQgQ1NTRm9udEZhY2U6OmluaXRpYWxpemVXcmFwcGVyKCkK ICAgICBtX21heUJlUHVyZ2VkID0gZmFsc2U7CiB9CiAKLVJlZjxGb250RmFjZT4gQ1NTRm9udEZh Y2U6OndyYXBwZXIoKQorUmVmPEZvbnRGYWNlPiBDU1NGb250RmFjZTo6d3JhcHBlcihTY3JpcHRF eGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQogewotICAgIGlmIChtX3dyYXBwZXIpCisgICAgaWYg KG1fd3JhcHBlcikgeworICAgICAgICBBU1NFUlQobV93cmFwcGVyLT5zY3JpcHRFeGVjdXRpb25D b250ZXh0KCkgPT0gY29udGV4dCk7CiAgICAgICAgIHJldHVybiAqbV93cmFwcGVyLmdldCgpOwor ICAgIH0KIAotICAgIGF1dG8gd3JhcHBlciA9IEZvbnRGYWNlOjpjcmVhdGUoKnRoaXMpOworICAg IGF1dG8gd3JhcHBlciA9IEZvbnRGYWNlOjpjcmVhdGUoY29udGV4dCwgKnRoaXMpOwogICAgIG1f d3JhcHBlciA9IG1ha2VXZWFrUHRyKHdyYXBwZXIuZ2V0KCkpOwogICAgIGluaXRpYWxpemVXcmFw cGVyKCk7CiAgICAgcmV0dXJuIHdyYXBwZXI7CkBAIC00NTQsMTEgKzQ1Niw2IEBAIHZvaWQgQ1NT Rm9udEZhY2U6OmFkb3B0U291cmNlKHN0ZDo6dW5pcXVlX3B0cjxDU1NGb250RmFjZVNvdXJjZT4m JiBzb3VyY2UpCiAgICAgQVNTRVJUKCFtX3NvdXJjZXNQb3B1bGF0ZWQpOwogfQogCi1Eb2N1bWVu dCogQ1NTRm9udEZhY2U6OmRvY3VtZW50KCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9mb250U2Vs ZWN0b3IgPyBtX2ZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSA6IG51bGxwdHI7Ci19Ci0KIGF1dG8g Q1NTRm9udEZhY2U6OmZvbnRMb2FkVGltaW5nKCkgY29uc3QgLT4gRm9udExvYWRUaW1pbmcKIHsK ICAgICBzd2l0Y2ggKG1fZm9udExvYWRUaW1pbmdPdmVycmlkZSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2UuaAppbmRleCBjYzE3YWVjMmYxY2Q5ZjU5ODBlZTQwZDg3YjE4ZDhkOGExMmI4N2Y5Li5m MjYyZDA1ZjdkNzBlNWY5M2NjZjNhNjg1YWRmMTc0YWEzNjc0Nzc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2UuaApAQCAtNTMsNiArNTMsNyBAQCBjbGFzcyBEb2N1bWVudDsKIGNsYXNzIEZvbnRE ZXNjcmlwdGlvbjsKIGNsYXNzIEZvbnQ7CiBjbGFzcyBGb250RmFjZTsKK2NsYXNzIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ7CiBlbnVtIGNsYXNzIEV4dGVybmFsUmVzb3VyY2VEb3dubG9hZFBvbGlj eTsKIAogREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lERU5USUZJRVIoQ1NTRm9udEZhY2Up OwpAQCAtMTQ1LDcgKzE0Niw3IEBAIHB1YmxpYzoKICAgICBib29sIHJhbmdlc01hdGNoQ29kZVBv aW50KFVDaGFyMzIpIGNvbnN0OwogCiAgICAgLy8gV2UgZG9uJ3QgZ3VhcmFudGVlIHRoYXQgdGhl IEZvbnRGYWNlIHdyYXBwZXIgd2lsbCBiZSB0aGUgc2FtZSBldmVyeSB0aW1lIHlvdSBhc2sgZm9y IGl0LgotICAgIFJlZjxGb250RmFjZT4gd3JhcHBlcigpOworICAgIFJlZjxGb250RmFjZT4gd3Jh cHBlcihTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgdm9pZCBzZXRXcmFwcGVyKEZvbnRG YWNlJik7CiAgICAgRm9udEZhY2UqIGV4aXN0aW5nV3JhcHBlcigpOwogCkBAIC0xNjUsOCArMTY2 LDYgQEAgcHVibGljOgogICAgIGJvb2wgaGFzU1ZHRm9udEZhY2VTb3VyY2UoKSBjb25zdDsKICAg ICB2b2lkIHNldEVycm9yU3RhdGUoKTsKIAotICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0 OwotCiBwcml2YXRlOgogICAgIENTU0ZvbnRGYWNlKENTU0ZvbnRTZWxlY3RvciosIFN0eWxlUnVs ZUZvbnRGYWNlKiwgRm9udEZhY2UqLCBib29sIGlzTG9jYWxGYWxsYmFjayk7CiAgICAgQ1NTRm9u dEZhY2UoY29uc3QgU2V0dGluZ3MqLCBTdHlsZVJ1bGVGb250RmFjZSosIEZvbnRGYWNlKiwgYm9v bCBpc0xvY2FsRmFsbGJhY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRG YWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5jcHAKaW5kZXggYzA2ZDFmMzgz YmY1ZmExMzcwYjZjOGE5M2I1MTA1ZjgxYTBhOWY2MC4uM2Y3NjgyMWU0ZDA5ZWJhZjMyMGI0MzUy ZGRlNjAzNDkzNzIyYmE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuY3BwCkBAIC0xNDAsOSArMTQw LDkgQEAgUmVmPEZvbnRGYWNlPiBGb250RmFjZTo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCwg Y29uc3QgU3RyaW5nJiBmYW1pbHksIFNvdXJjZSYKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1S ZWY8Rm9udEZhY2U+IEZvbnRGYWNlOjpjcmVhdGUoQ1NTRm9udEZhY2UmIGZhY2UpCitSZWY8Rm9u dEZhY2U+IEZvbnRGYWNlOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwg Q1NTRm9udEZhY2UmIGZhY2UpCiB7Ci0gICAgYXV0byBmb250RmFjZSA9IGFkb3B0UmVmKCpuZXcg Rm9udEZhY2UoZmFjZSkpOworICAgIGF1dG8gZm9udEZhY2UgPSBhZG9wdFJlZigqbmV3IEZvbnRG YWNlKGNvbnRleHQsIGZhY2UpKTsKICAgICBmb250RmFjZS0+c3VzcGVuZElmTmVlZGVkKCk7CiAg ICAgcmV0dXJuIGZvbnRGYWNlOwogfQpAQCAtMTU1LDggKzE1NSw4IEBAIEZvbnRGYWNlOjpGb250 RmFjZShDU1NGb250U2VsZWN0b3ImIGZvbnRTZWxlY3RvcikKICAgICBtX2JhY2tpbmctPmFkZENs aWVudCgqdGhpcyk7CiB9CiAKLUZvbnRGYWNlOjpGb250RmFjZShDU1NGb250RmFjZSYgZmFjZSkK LSAgICA6IEFjdGl2ZURPTU9iamVjdChmYWNlLmRvY3VtZW50KCkpCitGb250RmFjZTo6Rm9udEZh Y2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgQ1NTRm9udEZhY2UmIGZhY2UpCisg ICAgOiBBY3RpdmVET01PYmplY3QoY29udGV4dCkKICAgICAsIG1fYmFja2luZyhmYWNlKQogICAg ICwgbV9sb2FkZWRQcm9taXNlKG1ha2VVbmlxdWVSZWY8TG9hZGVkUHJvbWlzZT4oKnRoaXMsICZG b250RmFjZTo6bG9hZGVkUHJvbWlzZVJlc29sdmUpKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0ZvbnRGYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuaAppbmRl eCA0NGNhNmQ1ODg1YzNjODE1OTFmNjM4ZWRjZDk3NjM5NjE2N2UxMDY2Li5mYzE3ZWE2MWQ2Zjkz NGFlZWVhZWUzYTYyNGRlY2QxZDQ3Y2UyYzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvRm9udEZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuaApAQCAtNTUs NyArNTUsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdXNpbmcgU291cmNlID0gVmFyaWFudDxTdHJp bmcsIFJlZlB0cjxKU0M6OkFycmF5QnVmZmVyPiwgUmVmUHRyPEpTQzo6QXJyYXlCdWZmZXJWaWV3 Pj47CiAgICAgc3RhdGljIFJlZjxGb250RmFjZT4gY3JlYXRlKERvY3VtZW50JiwgY29uc3QgU3Ry aW5nJiBmYW1pbHksIFNvdXJjZSYmLCBjb25zdCBEZXNjcmlwdG9ycyYpOwotICAgIHN0YXRpYyBS ZWY8Rm9udEZhY2U+IGNyZWF0ZShDU1NGb250RmFjZSYpOworICAgIHN0YXRpYyBSZWY8Rm9udEZh Y2U+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQ1NTRm9udEZhY2UmKTsKICAgICB2 aXJ0dWFsIH5Gb250RmFjZSgpOwogCiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0RmFtaWx5KERv Y3VtZW50JiwgY29uc3QgU3RyaW5nJik7CkBAIC05NCw3ICs5NCw3IEBAIHB1YmxpYzoKIAogcHJp dmF0ZToKICAgICBleHBsaWNpdCBGb250RmFjZShDU1NGb250U2VsZWN0b3ImKTsKLSAgICBleHBs aWNpdCBGb250RmFjZShDU1NGb250RmFjZSYpOworICAgIGV4cGxpY2l0IEZvbnRGYWNlKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBDU1NGb250RmFjZSYpOwogCiAgICAgLy8gQWN0aXZlRE9NT2Jq ZWN0LgogICAgIGNvbnN0IGNoYXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCBmaW5hbDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRm9udEZhY2VTZXQuY3BwCmluZGV4IDJhYzk1NzYxN2RmMDM2MTQ0ZTE3YzMy YTAzNzI0ZTU0NGQwOWZmZjAuLjIxYjZmNjhlZjMzMzZhNGE5Y2RiNzNjNTZlNWI1ZTc4ZTA0YWNk YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmNwcApAQCAtOTIsNyArOTIsNyBAQCBSZWZQ dHI8Rm9udEZhY2U+IEZvbnRGYWNlU2V0OjpJdGVyYXRvcjo6bmV4dCgpCiB7CiAgICAgaWYgKG1f aW5kZXggPT0gbV90YXJnZXQtPnNpemUoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAg cmV0dXJuIG1fdGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKCk7CisgICAgcmV0 dXJuIG1fdGFyZ2V0LT5iYWNraW5nKClbbV9pbmRleCsrXS53cmFwcGVyKG1fdGFyZ2V0LT5zY3Jp cHRFeGVjdXRpb25Db250ZXh0KCkpOwogfQogCiBGb250RmFjZVNldDo6UGVuZGluZ1Byb21pc2U6 OlBlbmRpbmdQcm9taXNlKExvYWRQcm9taXNlJiYgcHJvbWlzZSkKQEAgLTE2MSw3ICsxNjEsNyBA QCB2b2lkIEZvbnRGYWNlU2V0Ojpsb2FkKGNvbnN0IFN0cmluZyYgZm9udCwgY29uc3QgU3RyaW5n JiB0ZXh0LCBMb2FkUHJvbWlzZSYmIHBybwogICAgIGJvb2wgd2FpdGluZyA9IGZhbHNlOwogCiAg ICAgZm9yIChhdXRvJiBmYWNlIDogbWF0Y2hpbmdGYWNlcykgewotICAgICAgICBwZW5kaW5nUHJv bWlzZS0+ZmFjZXMuYXBwZW5kKGZhY2UuZ2V0KCkud3JhcHBlcigpKTsKKyAgICAgICAgcGVuZGlu Z1Byb21pc2UtPmZhY2VzLmFwcGVuZChmYWNlLmdldCgpLndyYXBwZXIoc2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpKSk7CiAgICAgICAgIGlmIChmYWNlLmdldCgpLnN0YXR1cygpID09IENTU0ZvbnRG YWNlOjpTdGF0dXM6OlN1Y2Nlc3MpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgd2Fp dGluZyA9IHRydWU7Cg==