140007 2014-12-30 11:15:01 -0800 Move '-webkit-font-variant-ligature' CSS property to the new StyleBuilder 2014-12-30 14:25:44 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez benjamin commit-queue kling koivisto sam oldest_to_newest 1058196 0 cdumez 2014-12-30 11:15:01 -0800 Move '-webkit-font-variant-ligature' CSS property to the new StyleBuilder. 1058198 1 243827 cdumez 2014-12-30 11:57:38 -0800 Created attachment 243827 Patch 1058201 2 243827 darin 2014-12-30 12:51:48 -0800 Comment on attachment 243827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243827&action=review > Source/WebCore/css/StyleBuilderCustom.h:1262 > +#if !ASSERT_DISABLED Why is this #if needed? The else has only the assertion in it. Is this a pattern followed in other functions in this file? 1058202 3 243827 cdumez 2014-12-30 12:57:16 -0800 Comment on attachment 243827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243827&action=review >> Source/WebCore/css/StyleBuilderCustom.h:1262 >> +#if !ASSERT_DISABLED > > Why is this #if needed? The else has only the assertion in it. Is this a pattern followed in other functions in this file? I merely moved this code. I don't think this pattern is used elsewhere in this file. I will drop it as it likely builds fine without it. 1058207 4 243829 cdumez 2014-12-30 13:43:56 -0800 Created attachment 243829 Patch 1058209 5 243829 commit-queue 2014-12-30 14:25:36 -0800 Comment on attachment 243829 Patch Clearing flags on attachment: 243829 Committed r177827: <http://trac.webkit.org/changeset/177827> 1058210 6 commit-queue 2014-12-30 14:25:44 -0800 All reviewed patches have been landed. Closing bug. 243827 2014-12-30 11:57:38 -0800 2014-12-30 13:43:53 -0800 Patch bug-140007-20141230115740.patch text/plain 12892 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3ODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJlZjQwNzNhZjUyMTNi OWUyY2FlZmI0ZWZlY2M4ZGVhOTg5MDBlZC4uYTNiZTc4ZGYxNmRlNGQwNGIzZmJmNGJjM2YzYTY3 NmI1NDM5MjdiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTEyLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnLXdlYmtpdC1mb250 LXZhcmlhbnQtbGlnYXR1cmUnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMDA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSAnLXdl YmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmUnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxl QnVpbGRlcgorICAgICAgICBieSB1c2luZyBjdXN0b20gY29kZS4KKworICAgICAgICAqIGNzcy9D U1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0 ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnRWYXJp YW50TGlnYXR1cmVzOjphcHBseUluaGVyaXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmFwcGx5SW5pdGlhbFZhbHVl KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlGb250VmFyaWFudExp Z2F0dXJlczo6YXBwbHlWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVBy b3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAg ICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl QnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsV2Via2l0Rm9udFZhcmlhbnRMaWdhdHVyZXMpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRXZWJraXRG b250VmFyaWFudExpZ2F0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0 b206OmFwcGx5VmFsdWVXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyk6CisKIDIwMTQtMTItMjkg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGFuaW1hdGlv biAvIHRyYW5zaXRpb24gQ1NTIHByb3BlcnRpZXMgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggMjgyNjg0NTIyZjA1ZjcxMzQ2 ZThlZjQwZjM3YjY4ZmU1MTYzMjY0MC4uOTAxOGE4OWZjNjI4YTdjMWRmZTMxODUzMWE0MzdhOTc3 MjY3NTlhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMu aW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KQEAgLTkzLDcg KzkzLDcgQEAgdGV4dC1yZW5kZXJpbmcgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQog LXdlYmtpdC1mb250LWZlYXR1cmUtc2V0dGluZ3MgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWls ZGVyXQogLXdlYmtpdC1mb250LWtlcm5pbmcgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVy XQogLXdlYmtpdC1mb250LXNtb290aGluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJd Ci0td2Via2l0LWZvbnQtdmFyaWFudC1saWdhdHVyZXMgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVC dWlsZGVyXQorLXdlYmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmVzIFtJbmhlcml0ZWQsIEN1c3Rv bT1BbGxdCiAtd2Via2l0LWxvY2FsZSBbSW5oZXJpdGVkLCBDdXN0b209VmFsdWVdCiAtd2Via2l0 LXRleHQtb3JpZW50YXRpb24gW0luaGVyaXRlZCwgQ3VzdG9tPVZhbHVlXQogLWVwdWItdGV4dC1v cmllbnRhdGlvbiA9IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IGI2NDZmMGRlY2VlZWEzZjdiMjFm ZmUyYmRiNmRlOGUzMjUyM2E1MTcuLjUwNmZkMmNlMDM0MzQ2MDE2Mzk1YWRjY2U0NDhkZmRkNjA1 MWIxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWls ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5j cHAKQEAgLTMxMyw4NiArMzEzLDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRs ZXIgY3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0 VmFsdWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9CiB9OwogCi1jbGFzcyBB cHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXMgewotcHVibGljOgotICAgIHN0YXRpYyB2 b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxl UmVzb2x2ZXIpCi0gICAgewotICAgICAgICBjb25zdCBGb250RGVzY3JpcHRpb24mIHBhcmVudEZv bnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXItPnBhcmVudEZvbnREZXNjcmlwdGlvbigpOwot ICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci0+ Zm9udERlc2NyaXB0aW9uKCk7Ci0KLSAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldENvbW1vbkxp Z2F0dXJlc1N0YXRlKHBhcmVudEZvbnREZXNjcmlwdGlvbi5jb21tb25MaWdhdHVyZXNTdGF0ZSgp KTsKLSAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldERpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0 ZShwYXJlbnRGb250RGVzY3JpcHRpb24uZGlzY3JldGlvbmFyeUxpZ2F0dXJlc1N0YXRlKCkpOwot ICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0SGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlKHBhcmVu dEZvbnREZXNjcmlwdGlvbi5oaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoKSk7Ci0KLSAgICAgICAg c3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0gICAg fQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5 bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAgICB7Ci0gICAgICAgIEZvbnREZXNjcmlwdGlv biBmb250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLT5mb250RGVzY3JpcHRpb24oKTsKLQot ICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3RhdGUoRm9udERlc2Ny aXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5z ZXREaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdh dHVyZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRIaXN0b3JpY2FsTGlnYXR1 cmVzU3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7Ci0KLSAgICAg ICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0g ICAgfQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJl c29sdmVyKiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBG b250RGVzY3JpcHRpb246OkxpZ2F0dXJlc1N0YXRlIGNvbW1vbkxpZ2F0dXJlc1N0YXRlID0gRm9u dERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZTsKLSAgICAgICAgRm9udERlc2NyaXB0 aW9uOjpMaWdhdHVyZXNTdGF0ZSBkaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVz Y3JpcHRpb246Ok5vcm1hbExpZ2F0dXJlc1N0YXRlOwotICAgICAgICBGb250RGVzY3JpcHRpb246 OkxpZ2F0dXJlc1N0YXRlIGhpc3RvcmljYWxMaWdhdHVyZXNTdGF0ZSA9IEZvbnREZXNjcmlwdGlv bjo6Tm9ybWFsTGlnYXR1cmVzU3RhdGU7Ci0KLSAgICAgICAgaWYgKGlzPENTU1ZhbHVlTGlzdD4o KnZhbHVlKSkgewotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0JiB2YWx1ZUxpc3QgPSBkb3duY2Fz dDxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IHZhbHVlTGlzdC5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAgICAgICAgICAgQ1NTVmFsdWUq IGl0ZW0gPSB2YWx1ZUxpc3QuaXRlbVdpdGhvdXRCb3VuZHNDaGVjayhpKTsKLSAgICAgICAgICAg ICAgICBpZiAoaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCppdGVtKSkgewotICAgICAgICAgICAgICAg ICAgICBzd2l0Y2ggKGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqaXRlbSkuZ2V0VmFsdWVJ RCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb0NvbW1vbkxpZ2F0dXJl czoKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1vbkxpZ2F0dXJlc1N0YXRlID0gRm9udERl c2NyaXB0aW9uOjpEaXNhYmxlZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVDb21tb25MaWdhdHVy ZXM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb21tb25MaWdhdHVyZXNTdGF0ZSA9IEZvbnRE ZXNjcmlwdGlvbjo6RW5hYmxlZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb0Rpc2NyZXRpb25h cnlMaWdhdHVyZXM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaXNjcmV0aW9uYXJ5TGlnYXR1 cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkRpc2FibGVkTGlnYXR1cmVzU3RhdGU7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBDU1NW YWx1ZURpc2NyZXRpb25hcnlMaWdhdHVyZXM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaXNj cmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVy ZXNTdGF0ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg ICAgICBjYXNlIENTU1ZhbHVlTm9IaXN0b3JpY2FsTGlnYXR1cmVzOgotICAgICAgICAgICAgICAg ICAgICAgICAgaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpEaXNh YmxlZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVIaXN0b3JpY2FsTGlnYXR1cmVzOgotICAgICAg ICAgICAgICAgICAgICAgICAgaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0 aW9uOjpFbmFibGVkTGlnYXR1cmVzU3RhdGU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KLSNpZiAhQVNTRVJUX0RJU0FCTEVECi0gICAgICAgIGVsc2UKLSAgICAgICAgICAg IEFTU0VSVChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKS5nZXRWYWx1ZUlEKCkg PT0gQ1NTVmFsdWVOb3JtYWwpOwotI2VuZGlmCi0KLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGZv bnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXItPmZvbnREZXNjcmlwdGlvbigpOwotICAgICAg ICBmb250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3RhdGUoY29tbW9uTGlnYXR1cmVz U3RhdGUpOwotICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0RGlzY3JldGlvbmFyeUxpZ2F0dXJl c1N0YXRlKGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlw dGlvbi5zZXRIaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRl KTsKLSAgICAgICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlw dGlvbik7Ci0gICAgfQotCi0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVy KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZh bHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsKLSAgICB9Ci19OwotCiBjb25z dCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyJiBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpzaGFyZWRT dHlsZUJ1aWxkZXIoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxEZXByZWNhdGVkU3R5 bGVCdWlsZGVyPiBzdHlsZUJ1aWxkZXJJbnN0YW5jZTsKQEAgLTQyNiw3ICszNDYsNiBAQCBEZXBy ZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kU2l6ZSwgQ1NTUHJvcGVydHlC YWNrZ3JvdW5kU2l6ZSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 Rm9udEtlcm5pbmcsIEFwcGx5UHJvcGVydHlGb250PEZvbnREZXNjcmlwdGlvbjo6S2VybmluZywg JkZvbnREZXNjcmlwdGlvbjo6a2VybmluZywgJkZvbnREZXNjcmlwdGlvbjo6c2V0S2VybmluZywg Rm9udERlc2NyaXB0aW9uOjpBdXRvS2VybmluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Rm9udFNtb290aGluZywgQXBwbHlQcm9w ZXJ0eUZvbnQ8Rm9udFNtb290aGluZ01vZGUsICZGb250RGVzY3JpcHRpb246OmZvbnRTbW9vdGhp bmcsICZGb250RGVzY3JpcHRpb246OnNldEZvbnRTbW9vdGhpbmcsIEF1dG9TbW9vdGhpbmc+Ojpj cmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtp dEZvbnRWYXJpYW50TGlnYXR1cmVzLCBBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6 OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Vi a2l0TWFza0NsaXAsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8RUZpbGxCb3gsIENTU1Byb3BlcnR5 V2Via2l0TWFza0NsaXAsIE1hc2tGaWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNjZXNzTWFza0xh eWVycywgJlJlbmRlclN0eWxlOjptYXNrTGF5ZXJzLCAmRmlsbExheWVyOjppc0NsaXBTZXQsICZG aWxsTGF5ZXI6OmNsaXAsICZGaWxsTGF5ZXI6OnNldENsaXAsICZGaWxsTGF5ZXI6OmNsZWFyQ2xp cCwgJkZpbGxMYXllcjo6aW5pdGlhbEZpbGxDbGlwLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENs aXA+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVdlYmtpdE1hc2tDb21wb3NpdGUsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8Q29tcG9zaXRlT3Bl cmF0b3IsIENTU1Byb3BlcnR5V2Via2l0TWFza0NvbXBvc2l0ZSwgTWFza0ZpbGxMYXllciwgJlJl bmRlclN0eWxlOjphY2Nlc3NNYXNrTGF5ZXJzLCAmUmVuZGVyU3R5bGU6Om1hc2tMYXllcnMsICZG aWxsTGF5ZXI6OmlzQ29tcG9zaXRlU2V0LCAmRmlsbExheWVyOjpjb21wb3NpdGUsICZGaWxsTGF5 ZXI6OnNldENvbXBvc2l0ZSwgJkZpbGxMYXllcjo6Y2xlYXJDb21wb3NpdGUsICZGaWxsTGF5ZXI6 OmluaXRpYWxGaWxsQ29tcG9zaXRlLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENvbXBvc2l0ZT46 OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Vi a2l0TWFza09yaWdpbiwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxFRmlsbEJveCwgQ1NTUHJvcGVy dHlXZWJraXRNYXNrT3JpZ2luLCBNYXNrRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vzc01h c2tMYXllcnMsICZSZW5kZXJTdHlsZTo6bWFza0xheWVycywgJkZpbGxMYXllcjo6aXNPcmlnaW5T ZXQsICZGaWxsTGF5ZXI6Om9yaWdpbiwgJkZpbGxMYXllcjo6c2V0T3JpZ2luLCAmRmlsbExheWVy OjpjbGVhck9yaWdpbiwgJkZpbGxMYXllcjo6aW5pdGlhbEZpbGxPcmlnaW4sICZDU1NUb1N0eWxl TWFwOjptYXBGaWxsT3JpZ2luPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCA3MjA5NjM4YzViNWQ2YTcxOGYxZTUwMzE0MjZkMGU1 NDUwODI1ZjIwLi4wYjY1ZDZiMjA3ZDcwNWE3NmFjMTY3N2FlNTE4ZWI5ZWE5MGUzYTFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC03NCw2ICs3NCw3IEBAIHB1 YmxpYzoKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhUZXh0U2hhZG93KTsK ICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJraXRBc3BlY3RSYXRpbyk7 CiAgICAgREVDTEFSRV9QUk9QRVJUWV9DVVNUT01fSEFORExFUlMoV2Via2l0Qm94U2hhZG93KTsK KyAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJraXRGb250VmFyaWFudExp Z2F0dXJlcyk7CiAgICAgREVDTEFSRV9QUk9QRVJUWV9DVVNUT01fSEFORExFUlMoV2Via2l0TWFz a0JveEltYWdlT3V0c2V0KTsKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhX ZWJraXRNYXNrQm94SW1hZ2VSZXBlYXQpOwogICAgIERFQ0xBUkVfUFJPUEVSVFlfQ1VTVE9NX0hB TkRMRVJTKFdlYmtpdE1hc2tCb3hJbWFnZVNsaWNlKTsKQEAgLTEyMDIsNiArMTIwMyw3NCBAQCBp bmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb2x1bW5HYXAoU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlcgogICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNl dENvbHVtbkdhcChTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRDb21wdXRlZExlbmd0aDxm bG9hdD4oc3R5bGVSZXNvbHZlciwgdmFsdWUpKTsKIH0KIAoraW5saW5lIHZvaWQgU3R5bGVCdWls ZGVyQ3VzdG9tOjphcHBseUluaXRpYWxXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyhTdHlsZVJl c29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3Jp cHRpb24gPSBzdHlsZVJlc29sdmVyLmZvbnREZXNjcmlwdGlvbigpOworCisgICAgZm9udERlc2Ny aXB0aW9uLnNldENvbW1vbkxpZ2F0dXJlc1N0YXRlKEZvbnREZXNjcmlwdGlvbjo6Tm9ybWFsTGln YXR1cmVzU3RhdGUpOworICAgIGZvbnREZXNjcmlwdGlvbi5zZXREaXNjcmV0aW9uYXJ5TGlnYXR1 cmVzU3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7CisgICAgZm9u dERlc2NyaXB0aW9uLnNldEhpc3RvcmljYWxMaWdhdHVyZXNTdGF0ZShGb250RGVzY3JpcHRpb246 Ok5vcm1hbExpZ2F0dXJlc1N0YXRlKTsKKworICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2Ny aXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1 c3RvbTo6YXBwbHlJbmhlcml0V2Via2l0Rm9udFZhcmlhbnRMaWdhdHVyZXMoU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBjb25zdCBGb250RGVzY3JpcHRpb24mIHBhcmVudEZv bnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIucGFyZW50Rm9udERlc2NyaXB0aW9uKCk7Cisg ICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIuZm9udERl c2NyaXB0aW9uKCk7CisKKyAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3Rh dGUocGFyZW50Rm9udERlc2NyaXB0aW9uLmNvbW1vbkxpZ2F0dXJlc1N0YXRlKCkpOworICAgIGZv bnREZXNjcmlwdGlvbi5zZXREaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUocGFyZW50Rm9udERl c2NyaXB0aW9uLmRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSgpKTsKKyAgICBmb250RGVzY3Jp cHRpb24uc2V0SGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlKHBhcmVudEZvbnREZXNjcmlwdGlvbi5o aXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoKSk7CisKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnRE ZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxk ZXJDdXN0b206OmFwcGx5VmFsdWVXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyhTdHlsZVJlc29s dmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgRm9udERlc2NyaXB0 aW9uOjpMaWdhdHVyZXNTdGF0ZSBjb21tb25MaWdhdHVyZXNTdGF0ZSA9IEZvbnREZXNjcmlwdGlv bjo6Tm9ybWFsTGlnYXR1cmVzU3RhdGU7CisgICAgRm9udERlc2NyaXB0aW9uOjpMaWdhdHVyZXNT dGF0ZSBkaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246Ok5vcm1h bExpZ2F0dXJlc1N0YXRlOworICAgIEZvbnREZXNjcmlwdGlvbjo6TGlnYXR1cmVzU3RhdGUgaGlz dG9yaWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNT dGF0ZTsKKworICAgIGlmIChpczxDU1NWYWx1ZUxpc3Q+KHZhbHVlKSkgeworICAgICAgICBmb3Ig KGF1dG8mIGl0ZW0gOiBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KHZhbHVlKSkgeworICAgICAgICAg ICAgc3dpdGNoIChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oaXRlbS5nZXQoKSkuZ2V0VmFs dWVJRCgpKSB7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9Db21tb25MaWdhdHVyZXM6Cisg ICAgICAgICAgICAgICAgY29tbW9uTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkRp c2FibGVkTGlnYXR1cmVzU3RhdGU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICBjYXNlIENTU1ZhbHVlQ29tbW9uTGlnYXR1cmVzOgorICAgICAgICAgICAgICAgIGNvbW1vbkxp Z2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpFbmFibGVkTGlnYXR1cmVzU3RhdGU7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9EaXNjcmV0 aW9uYXJ5TGlnYXR1cmVzOgorICAgICAgICAgICAgICAgIGRpc2NyZXRpb25hcnlMaWdhdHVyZXNT dGF0ZSA9IEZvbnREZXNjcmlwdGlvbjo6RGlzYWJsZWRMaWdhdHVyZXNTdGF0ZTsKKyAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVEaXNjcmV0aW9uYXJ5TGln YXR1cmVzOgorICAgICAgICAgICAgICAgIGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSA9IEZv bnREZXNjcmlwdGlvbjo6RW5hYmxlZExpZ2F0dXJlc1N0YXRlOworICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZU5vSGlzdG9yaWNhbExpZ2F0dXJlczoKKyAg ICAgICAgICAgICAgICBoaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246 OkRpc2FibGVkTGlnYXR1cmVzU3RhdGU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBjYXNlIENTU1ZhbHVlSGlzdG9yaWNhbExpZ2F0dXJlczoKKyAgICAgICAgICAgICAgICBo aXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVy ZXNTdGF0ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisjaWYgIUFTU0VSVF9ESVNBQkxF RAorICAgIGVsc2UKKyAgICAgICAgQVNTRVJUKGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2 YWx1ZSkuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlTm9ybWFsKTsKKyNlbmRpZgorCisgICAgRm9u dERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIuZm9udERlc2NyaXB0 aW9uKCk7CisgICAgZm9udERlc2NyaXB0aW9uLnNldENvbW1vbkxpZ2F0dXJlc1N0YXRlKGNvbW1v bkxpZ2F0dXJlc1N0YXRlKTsKKyAgICBmb250RGVzY3JpcHRpb24uc2V0RGlzY3JldGlvbmFyeUxp Z2F0dXJlc1N0YXRlKGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSk7CisgICAgZm9udERlc2Ny aXB0aW9uLnNldEhpc3RvcmljYWxMaWdhdHVyZXNTdGF0ZShoaXN0b3JpY2FsTGlnYXR1cmVzU3Rh dGUpOworICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlv bik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFN0eWxlQnVpbGRl ckN1c3RvbV9oCg== 243829 2014-12-30 13:43:56 -0800 2014-12-30 14:25:36 -0800 Patch bug-140007-20141230134359.patch text/plain 12854 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3ODI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJlZjQwNzNhZjUyMTNi OWUyY2FlZmI0ZWZlY2M4ZGVhOTg5MDBlZC4uMWI5NmI4ODU5MTU1YjVhNWU3Yjg5YTZjMTA3NTcx YTc3N2NiNTBlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTEyLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnLXdlYmtpdC1mb250 LXZhcmlhbnQtbGlnYXR1cmUnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMDA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgTW92ZSAnLXdlYmtp dC1mb250LXZhcmlhbnQtbGlnYXR1cmUnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVp bGRlcgorICAgICAgICBieSB1c2luZyBjdXN0b20gY29kZS4KKworICAgICAgICAqIGNzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRT dHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnRWYXJpYW50 TGlnYXR1cmVzOjphcHBseUluaGVyaXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmFwcGx5SW5pdGlhbFZhbHVlKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlGb250VmFyaWFudExpZ2F0 dXJlczo6YXBwbHlWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3Bl cnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAg ICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVp bGRlckN1c3RvbTo6YXBwbHlJbml0aWFsV2Via2l0Rm9udFZhcmlhbnRMaWdhdHVyZXMpOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRXZWJraXRGb250 VmFyaWFudExpZ2F0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206 OmFwcGx5VmFsdWVXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyk6CisKIDIwMTQtMTItMjkgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGFuaW1hdGlvbiAv IHRyYW5zaXRpb24gQ1NTIHByb3BlcnRpZXMgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggMjgyNjg0NTIyZjA1ZjcxMzQ2ZThl ZjQwZjM3YjY4ZmU1MTYzMjY0MC4uOTAxOGE4OWZjNjI4YTdjMWRmZTMxODUzMWE0MzdhOTc3MjY3 NTlhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4K KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KQEAgLTkzLDcgKzkz LDcgQEAgdGV4dC1yZW5kZXJpbmcgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQogLXdl YmtpdC1mb250LWZlYXR1cmUtc2V0dGluZ3MgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVy XQogLXdlYmtpdC1mb250LWtlcm5pbmcgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQog LXdlYmtpdC1mb250LXNtb290aGluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCi0t d2Via2l0LWZvbnQtdmFyaWFudC1saWdhdHVyZXMgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWls ZGVyXQorLXdlYmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmVzIFtJbmhlcml0ZWQsIEN1c3RvbT1B bGxdCiAtd2Via2l0LWxvY2FsZSBbSW5oZXJpdGVkLCBDdXN0b209VmFsdWVdCiAtd2Via2l0LXRl eHQtb3JpZW50YXRpb24gW0luaGVyaXRlZCwgQ3VzdG9tPVZhbHVlXQogLWVwdWItdGV4dC1vcmll bnRhdGlvbiA9IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IGI2NDZmMGRlY2VlZWEzZjdiMjFmZmUy YmRiNmRlOGUzMjUyM2E1MTcuLjUwNmZkMmNlMDM0MzQ2MDE2Mzk1YWRjY2U0NDhkZmRkNjA1MWIx ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK QEAgLTMxMyw4NiArMzEzLDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIg Y3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0VmFs dWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9CiB9OwogCi1jbGFzcyBBcHBs eVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXMgewotcHVibGljOgotICAgIHN0YXRpYyB2b2lk IGFwcGx5SW5oZXJpdFZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVz b2x2ZXIpCi0gICAgewotICAgICAgICBjb25zdCBGb250RGVzY3JpcHRpb24mIHBhcmVudEZvbnRE ZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXItPnBhcmVudEZvbnREZXNjcmlwdGlvbigpOwotICAg ICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci0+Zm9u dERlc2NyaXB0aW9uKCk7Ci0KLSAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldENvbW1vbkxpZ2F0 dXJlc1N0YXRlKHBhcmVudEZvbnREZXNjcmlwdGlvbi5jb21tb25MaWdhdHVyZXNTdGF0ZSgpKTsK LSAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldERpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZShw YXJlbnRGb250RGVzY3JpcHRpb24uZGlzY3JldGlvbmFyeUxpZ2F0dXJlc1N0YXRlKCkpOwotICAg ICAgICBmb250RGVzY3JpcHRpb24uc2V0SGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlKHBhcmVudEZv bnREZXNjcmlwdGlvbi5oaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoKSk7Ci0KLSAgICAgICAgc3R5 bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0gICAgfQot Ci0gICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVS ZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAgICB7Ci0gICAgICAgIEZvbnREZXNjcmlwdGlvbiBm b250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLT5mb250RGVzY3JpcHRpb24oKTsKLQotICAg ICAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3RhdGUoRm9udERlc2NyaXB0 aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRE aXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVy ZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRIaXN0b3JpY2FsTGlnYXR1cmVz U3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7Ci0KLSAgICAgICAg c3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0gICAg fQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29s dmVyKiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBGb250 RGVzY3JpcHRpb246OkxpZ2F0dXJlc1N0YXRlIGNvbW1vbkxpZ2F0dXJlc1N0YXRlID0gRm9udERl c2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZTsKLSAgICAgICAgRm9udERlc2NyaXB0aW9u OjpMaWdhdHVyZXNTdGF0ZSBkaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3Jp cHRpb246Ok5vcm1hbExpZ2F0dXJlc1N0YXRlOwotICAgICAgICBGb250RGVzY3JpcHRpb246Okxp Z2F0dXJlc1N0YXRlIGhpc3RvcmljYWxMaWdhdHVyZXNTdGF0ZSA9IEZvbnREZXNjcmlwdGlvbjo6 Tm9ybWFsTGlnYXR1cmVzU3RhdGU7Ci0KLSAgICAgICAgaWYgKGlzPENTU1ZhbHVlTGlzdD4oKnZh bHVlKSkgewotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0JiB2YWx1ZUxpc3QgPSBkb3duY2FzdDxD U1NWYWx1ZUxpc3Q+KCp2YWx1ZSk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHZhbHVlTGlzdC5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAgICAgICAgICAgQ1NTVmFsdWUqIGl0 ZW0gPSB2YWx1ZUxpc3QuaXRlbVdpdGhvdXRCb3VuZHNDaGVjayhpKTsKLSAgICAgICAgICAgICAg ICBpZiAoaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCppdGVtKSkgewotICAgICAgICAgICAgICAgICAg ICBzd2l0Y2ggKGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqaXRlbSkuZ2V0VmFsdWVJRCgp KSB7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb0NvbW1vbkxpZ2F0dXJlczoK LSAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1vbkxpZ2F0dXJlc1N0YXRlID0gRm9udERlc2Ny aXB0aW9uOjpEaXNhYmxlZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVDb21tb25MaWdhdHVyZXM6 Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb21tb25MaWdhdHVyZXNTdGF0ZSA9IEZvbnREZXNj cmlwdGlvbjo6RW5hYmxlZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb0Rpc2NyZXRpb25hcnlM aWdhdHVyZXM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaXNjcmV0aW9uYXJ5TGlnYXR1cmVz U3RhdGUgPSBGb250RGVzY3JpcHRpb246OkRpc2FibGVkTGlnYXR1cmVzU3RhdGU7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBDU1NWYWx1 ZURpc2NyZXRpb25hcnlMaWdhdHVyZXM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaXNjcmV0 aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVyZXNT dGF0ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAg ICBjYXNlIENTU1ZhbHVlTm9IaXN0b3JpY2FsTGlnYXR1cmVzOgotICAgICAgICAgICAgICAgICAg ICAgICAgaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpEaXNhYmxl ZExpZ2F0dXJlc1N0YXRlOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVIaXN0b3JpY2FsTGlnYXR1cmVzOgotICAgICAgICAg ICAgICAgICAgICAgICAgaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9u OjpFbmFibGVkTGlnYXR1cmVzU3RhdGU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLSNpZiAhQVNTRVJUX0RJU0FCTEVECi0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIEFT U0VSVChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKS5nZXRWYWx1ZUlEKCkgPT0g Q1NTVmFsdWVOb3JtYWwpOwotI2VuZGlmCi0KLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGZvbnRE ZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXItPmZvbnREZXNjcmlwdGlvbigpOwotICAgICAgICBm b250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3RhdGUoY29tbW9uTGlnYXR1cmVzU3Rh dGUpOwotICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0RGlzY3JldGlvbmFyeUxpZ2F0dXJlc1N0 YXRlKGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSk7Ci0gICAgICAgIGZvbnREZXNjcmlwdGlv bi5zZXRIaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoaGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlKTsK LSAgICAgICAgc3R5bGVSZXNvbHZlci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlv bik7Ci0gICAgfQotCi0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkK LSAgICB7Ci0gICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZhbHVl LCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsKLSAgICB9Ci19OwotCiBjb25zdCBE ZXByZWNhdGVkU3R5bGVCdWlsZGVyJiBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpzaGFyZWRTdHls ZUJ1aWxkZXIoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxEZXByZWNhdGVkU3R5bGVC dWlsZGVyPiBzdHlsZUJ1aWxkZXJJbnN0YW5jZTsKQEAgLTQyNiw3ICszNDYsNiBAQCBEZXByZWNh dGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kU2l6ZSwgQ1NTUHJvcGVydHlCYWNr Z3JvdW5kU2l6ZSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Rm9u dEtlcm5pbmcsIEFwcGx5UHJvcGVydHlGb250PEZvbnREZXNjcmlwdGlvbjo6S2VybmluZywgJkZv bnREZXNjcmlwdGlvbjo6a2VybmluZywgJkZvbnREZXNjcmlwdGlvbjo6c2V0S2VybmluZywgRm9u dERlc2NyaXB0aW9uOjpBdXRvS2VybmluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Rm9udFNtb290aGluZywgQXBwbHlQcm9wZXJ0 eUZvbnQ8Rm9udFNtb290aGluZ01vZGUsICZGb250RGVzY3JpcHRpb246OmZvbnRTbW9vdGhpbmcs ICZGb250RGVzY3JpcHRpb246OnNldEZvbnRTbW9vdGhpbmcsIEF1dG9TbW9vdGhpbmc+OjpjcmVh dGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZv bnRWYXJpYW50TGlnYXR1cmVzLCBBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 TWFza0NsaXAsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8RUZpbGxCb3gsIENTU1Byb3BlcnR5V2Vi a2l0TWFza0NsaXAsIE1hc2tGaWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNjZXNzTWFza0xheWVy cywgJlJlbmRlclN0eWxlOjptYXNrTGF5ZXJzLCAmRmlsbExheWVyOjppc0NsaXBTZXQsICZGaWxs TGF5ZXI6OmNsaXAsICZGaWxsTGF5ZXI6OnNldENsaXAsICZGaWxsTGF5ZXI6OmNsZWFyQ2xpcCwg JkZpbGxMYXllcjo6aW5pdGlhbEZpbGxDbGlwLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENsaXA+ OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdl YmtpdE1hc2tDb21wb3NpdGUsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8Q29tcG9zaXRlT3BlcmF0 b3IsIENTU1Byb3BlcnR5V2Via2l0TWFza0NvbXBvc2l0ZSwgTWFza0ZpbGxMYXllciwgJlJlbmRl clN0eWxlOjphY2Nlc3NNYXNrTGF5ZXJzLCAmUmVuZGVyU3R5bGU6Om1hc2tMYXllcnMsICZGaWxs TGF5ZXI6OmlzQ29tcG9zaXRlU2V0LCAmRmlsbExheWVyOjpjb21wb3NpdGUsICZGaWxsTGF5ZXI6 OnNldENvbXBvc2l0ZSwgJkZpbGxMYXllcjo6Y2xlYXJDb21wb3NpdGUsICZGaWxsTGF5ZXI6Omlu aXRpYWxGaWxsQ29tcG9zaXRlLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENvbXBvc2l0ZT46OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 TWFza09yaWdpbiwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxFRmlsbEJveCwgQ1NTUHJvcGVydHlX ZWJraXRNYXNrT3JpZ2luLCBNYXNrRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vzc01hc2tM YXllcnMsICZSZW5kZXJTdHlsZTo6bWFza0xheWVycywgJkZpbGxMYXllcjo6aXNPcmlnaW5TZXQs ICZGaWxsTGF5ZXI6Om9yaWdpbiwgJkZpbGxMYXllcjo6c2V0T3JpZ2luLCAmRmlsbExheWVyOjpj bGVhck9yaWdpbiwgJkZpbGxMYXllcjo6aW5pdGlhbEZpbGxPcmlnaW4sICZDU1NUb1N0eWxlTWFw OjptYXBGaWxsT3JpZ2luPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZUJ1aWxkZXJDdXN0b20uaAppbmRleCA3MjA5NjM4YzViNWQ2YTcxOGYxZTUwMzE0MjZkMGU1NDUw ODI1ZjIwLi4xYzIxOWU2MGQzMmRkZTg0ZjNiMTJhZjllMTJlMTVlZDQ5NzZiYzg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC03NCw2ICs3NCw3IEBAIHB1Ymxp YzoKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhUZXh0U2hhZG93KTsKICAg ICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJraXRBc3BlY3RSYXRpbyk7CiAg ICAgREVDTEFSRV9QUk9QRVJUWV9DVVNUT01fSEFORExFUlMoV2Via2l0Qm94U2hhZG93KTsKKyAg ICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJraXRGb250VmFyaWFudExpZ2F0 dXJlcyk7CiAgICAgREVDTEFSRV9QUk9QRVJUWV9DVVNUT01fSEFORExFUlMoV2Via2l0TWFza0Jv eEltYWdlT3V0c2V0KTsKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJr aXRNYXNrQm94SW1hZ2VSZXBlYXQpOwogICAgIERFQ0xBUkVfUFJPUEVSVFlfQ1VTVE9NX0hBTkRM RVJTKFdlYmtpdE1hc2tCb3hJbWFnZVNsaWNlKTsKQEAgLTEyMDIsNiArMTIwMyw3MSBAQCBpbmxp bmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb2x1bW5HYXAoU3R5bGVSZXNv bHZlciYgc3R5bGVSZXNvbHZlcgogICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldENv bHVtbkdhcChTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRDb21wdXRlZExlbmd0aDxmbG9h dD4oc3R5bGVSZXNvbHZlciwgdmFsdWUpKTsKIH0KIAoraW5saW5lIHZvaWQgU3R5bGVCdWlsZGVy Q3VzdG9tOjphcHBseUluaXRpYWxXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyhTdHlsZVJlc29s dmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRp b24gPSBzdHlsZVJlc29sdmVyLmZvbnREZXNjcmlwdGlvbigpOworCisgICAgZm9udERlc2NyaXB0 aW9uLnNldENvbW1vbkxpZ2F0dXJlc1N0YXRlKEZvbnREZXNjcmlwdGlvbjo6Tm9ybWFsTGlnYXR1 cmVzU3RhdGUpOworICAgIGZvbnREZXNjcmlwdGlvbi5zZXREaXNjcmV0aW9uYXJ5TGlnYXR1cmVz U3RhdGUoRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0ZSk7CisgICAgZm9udERl c2NyaXB0aW9uLnNldEhpc3RvcmljYWxMaWdhdHVyZXNTdGF0ZShGb250RGVzY3JpcHRpb246Ok5v cm1hbExpZ2F0dXJlc1N0YXRlKTsKKworICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0 aW9uKGZvbnREZXNjcmlwdGlvbik7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3Rv bTo6YXBwbHlJbmhlcml0V2Via2l0Rm9udFZhcmlhbnRMaWdhdHVyZXMoU3R5bGVSZXNvbHZlciYg c3R5bGVSZXNvbHZlcikKK3sKKyAgICBjb25zdCBGb250RGVzY3JpcHRpb24mIHBhcmVudEZvbnRE ZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIucGFyZW50Rm9udERlc2NyaXB0aW9uKCk7CisgICAg Rm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIuZm9udERlc2Ny aXB0aW9uKCk7CisKKyAgICBmb250RGVzY3JpcHRpb24uc2V0Q29tbW9uTGlnYXR1cmVzU3RhdGUo cGFyZW50Rm9udERlc2NyaXB0aW9uLmNvbW1vbkxpZ2F0dXJlc1N0YXRlKCkpOworICAgIGZvbnRE ZXNjcmlwdGlvbi5zZXREaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUocGFyZW50Rm9udERlc2Ny aXB0aW9uLmRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSgpKTsKKyAgICBmb250RGVzY3JpcHRp b24uc2V0SGlzdG9yaWNhbExpZ2F0dXJlc1N0YXRlKHBhcmVudEZvbnREZXNjcmlwdGlvbi5oaXN0 b3JpY2FsTGlnYXR1cmVzU3RhdGUoKSk7CisKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnREZXNj cmlwdGlvbihmb250RGVzY3JpcHRpb24pOworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJD dXN0b206OmFwcGx5VmFsdWVXZWJraXRGb250VmFyaWFudExpZ2F0dXJlcyhTdHlsZVJlc29sdmVy JiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgRm9udERlc2NyaXB0aW9u OjpMaWdhdHVyZXNTdGF0ZSBjb21tb25MaWdhdHVyZXNTdGF0ZSA9IEZvbnREZXNjcmlwdGlvbjo6 Tm9ybWFsTGlnYXR1cmVzU3RhdGU7CisgICAgRm9udERlc2NyaXB0aW9uOjpMaWdhdHVyZXNTdGF0 ZSBkaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246Ok5vcm1hbExp Z2F0dXJlc1N0YXRlOworICAgIEZvbnREZXNjcmlwdGlvbjo6TGlnYXR1cmVzU3RhdGUgaGlzdG9y aWNhbExpZ2F0dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpOb3JtYWxMaWdhdHVyZXNTdGF0 ZTsKKworICAgIGlmIChpczxDU1NWYWx1ZUxpc3Q+KHZhbHVlKSkgeworICAgICAgICBmb3IgKGF1 dG8mIGl0ZW0gOiBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KHZhbHVlKSkgeworICAgICAgICAgICAg c3dpdGNoIChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oaXRlbS5nZXQoKSkuZ2V0VmFsdWVJ RCgpKSB7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9Db21tb25MaWdhdHVyZXM6CisgICAg ICAgICAgICAgICAgY29tbW9uTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkRpc2Fi bGVkTGlnYXR1cmVzU3RhdGU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBj YXNlIENTU1ZhbHVlQ29tbW9uTGlnYXR1cmVzOgorICAgICAgICAgICAgICAgIGNvbW1vbkxpZ2F0 dXJlc1N0YXRlID0gRm9udERlc2NyaXB0aW9uOjpFbmFibGVkTGlnYXR1cmVzU3RhdGU7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9EaXNjcmV0aW9u YXJ5TGlnYXR1cmVzOgorICAgICAgICAgICAgICAgIGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0 ZSA9IEZvbnREZXNjcmlwdGlvbjo6RGlzYWJsZWRMaWdhdHVyZXNTdGF0ZTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVEaXNjcmV0aW9uYXJ5TGlnYXR1 cmVzOgorICAgICAgICAgICAgICAgIGRpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZSA9IEZvbnRE ZXNjcmlwdGlvbjo6RW5hYmxlZExpZ2F0dXJlc1N0YXRlOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZU5vSGlzdG9yaWNhbExpZ2F0dXJlczoKKyAgICAg ICAgICAgICAgICBoaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkRp c2FibGVkTGlnYXR1cmVzU3RhdGU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICBjYXNlIENTU1ZhbHVlSGlzdG9yaWNhbExpZ2F0dXJlczoKKyAgICAgICAgICAgICAgICBoaXN0 b3JpY2FsTGlnYXR1cmVzU3RhdGUgPSBGb250RGVzY3JpcHRpb246OkVuYWJsZWRMaWdhdHVyZXNT dGF0ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9IGVsc2UKKyAgICAgICAgQVNTRVJUKGRv d25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSkuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVl Tm9ybWFsKTsKKworICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBzdHlsZVJl c29sdmVyLmZvbnREZXNjcmlwdGlvbigpOworICAgIGZvbnREZXNjcmlwdGlvbi5zZXRDb21tb25M aWdhdHVyZXNTdGF0ZShjb21tb25MaWdhdHVyZXNTdGF0ZSk7CisgICAgZm9udERlc2NyaXB0aW9u LnNldERpc2NyZXRpb25hcnlMaWdhdHVyZXNTdGF0ZShkaXNjcmV0aW9uYXJ5TGlnYXR1cmVzU3Rh dGUpOworICAgIGZvbnREZXNjcmlwdGlvbi5zZXRIaXN0b3JpY2FsTGlnYXR1cmVzU3RhdGUoaGlz dG9yaWNhbExpZ2F0dXJlc1N0YXRlKTsKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnREZXNjcmlw dGlvbihmb250RGVzY3JpcHRpb24pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBTdHlsZUJ1aWxkZXJDdXN0b21faAo=