135340 2014-07-28 11:07:44 -0700 [CSS Font Loading] Update Font Loading Code 2014-07-29 10:46:57 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 135390 1 betravis betravis commit-queue oldest_to_newest 1025152 0 betravis 2014-07-28 11:07:44 -0700 Trunk has evolved since bug 98395 originally implemented the Font Loading (previously Font Loader) specification. The code no longer compiles, and this patch gets it compiling again. The specification has also changed, and so the implementation needs some additional updates. It also needs to be enabled in the nightlies. Those tasks will be accomplished in separate bugs. 1025156 1 235598 betravis 2014-07-28 11:19:13 -0700 Created attachment 235598 Patch 1025211 2 235598 commit-queue 2014-07-28 13:41:47 -0700 Comment on attachment 235598 Patch Clearing flags on attachment: 235598 Committed r171690: <http://trac.webkit.org/changeset/171690> 1025212 3 commit-queue 2014-07-28 13:41:49 -0700 All reviewed patches have been landed. Closing bug. 235598 2014-07-28 11:19:13 -0700 2014-07-28 13:41:47 -0700 Patch bug-135340-20140728111859.patch text/plain 12796 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM0M2M1M2E5YTUxYWNk MWYyMjg5MjRmYjRhMzM1NjBiYmFkZTAwNy4uZjMzOTJlMDM1MDhkOGMxNzkxMjNjMGNjZWU3ZDQ0 MzRjYjY0NGU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA3LTI4ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIEZvbnQgTG9hZGlu Z10gVXBkYXRlIEZvbnQgTG9hZGluZyBDb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIEZvbnQgTG9hZGluZyBjb2RlIHRvIGJ1aWxk IGFnYWluLCBhcyB0cnVuayBoYXMgZXZvbHZlZAorICAgICAgICBzaW5jZSB0aGUgZmVhdHVyZSB3 YXMgb3JpZ2luYWxseSB3cml0dGVuLiBNb3N0bHksIHRoaXMgcmVxdWlyZXMKKyAgICAgICAgdXBk YXRpbmcgdGhlIGNvZGUgdG8gd29yayB3aXRoIHRoZSBuZXcgRm9udCByZXByZXNlbnRhdGlvbi4K KworICAgICAgICBUaGUgb3JpZ2luYWwgdGVzdHMgd2VyZSBlbmFibGVkIG9ubHkgZm9yIHRoZSBD aHJvbWl1bSBwb3J0LgorICAgICAgICBUaGV5IHdpbGwgbmVlZCB0byBiZSB1cGRhdGVkIHdoZW4g dGhlIGZlYXR1cmUgaXMgZW5hYmxlZCBieSBkZWZhdWx0LgorCisgICAgICAgICogV2ViQ29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBBZGQgbWlzc2luZyBmaWxlcy4KKyAgICAgICAgKiBj c3MvRm9udExvYWRlci5jcHA6IFVwZGF0ZSB0byBuZXcgRm9udCByZXByZXNlbnRhdGlvbi4KKyAg ICAgICAgKFdlYkNvcmU6OkxvYWRGb250Q2FsbGJhY2s6OmNyZWF0ZUZyb21QYXJhbXMpOgorICAg ICAgICAoV2ViQ29yZTo6TG9hZEZvbnRDYWxsYmFjazo6fkxvYWRGb250Q2FsbGJhY2spOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udExvYWRlcjo6bG9hZEZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udExvYWRlcjo6Y2hlY2tGb250KToKKyAgICAgICAgKFdlYkNvcmU6OmFwcGx5UHJvcGVydHlU b0N1cnJlbnRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpGb250TG9hZGVyOjpyZXNvbHZlRm9u dFN0eWxlKToKKwogMjAxNC0wNy0yOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkICdtZXJnZScgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDlhMDkzNmUzZjgwZjJk ZGI0NzdkYjQ4MzliNzNkNGFjZjcwNThlNTkuLjdlZGJmNDRkYTljNjZiM2NlYjczYmVmYzQzOWNm YTUxYzhiM2IxM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKQEAgLTY1MDUsNiArNjUwNSw3IEBACiAJCUZENDVBOTU5MTc1RDQxNzEw MEMyMUVDOCAvKiBQb2x5Z29uU2hhcGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gRkQwOEE4N0ExNzVEMzkyNjAwMkNEMzYwIC8qIFBvbHlnb25TaGFw ZS5jcHAgKi87IH07CiAJCUZENDVBOTVBMTc1RDQxNzEwMEMyMUVDOCAvKiBSZWN0YW5nbGVTaGFw ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRDA4 QTg3QzE3NUQzOTI2MDAyQ0QzNjAgLyogUmVjdGFuZ2xlU2hhcGUuY3BwICovOyB9OwogCQlGRDQ1 QTk1QjE3NUQ0MUVFMDBDMjFFQzggLyogU2hhcGVJbnRlcnZhbC5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkQwOEE4ODUxNzVEMzkyNjAwMkNEMzYwIC8q IFNoYXBlSW50ZXJ2YWwuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp OyB9OyB9OworCQlGRDRFNUQzQjE5ODMxNzU1MDBEOTNBNzcgLyogSlNGb250TG9hZGVyLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZEOTZDOUE0MTk4 MzE0QTUwMDg2RTE1NiAvKiBKU0ZvbnRMb2FkZXIuY3BwICovOyB9OwogCQlGRDUzNzM1MjEzN0I2 NTE4MDAwMDhEQ0UgLyogWmVyb1BvbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gRkQ1MzczNTAxMzdCNjUxODAwMDA4RENFIC8qIFplcm9Qb2xlLmNw cCAqLzsgfTsKIAkJRkQ1MzczNTMxMzdCNjUxODAwMDA4RENFIC8qIFplcm9Qb2xlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRDUzNzM1MTEzN0I2NTE4 MDAwMDhEQ0UgLyogWmVyb1BvbGUuaCAqLzsgfTsKIAkJRkQ1MzczNTYxMzdCNjUzQjAwMDA4RENF IC8qIER5bmFtaWNzQ29tcHJlc3Nvcktlcm5lbC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRDUzNzM1NDEzN0I2NTNCMDAwMDhEQ0UgLyogRHluYW1p Y3NDb21wcmVzc29yS2VybmVsLmNwcCAqLzsgfTsKQEAgLTY1NDUsNiArNjU0Niw3IEBACiAJCUZE OEFBNjNFMTY5NTE0QTcwMEQyRUE2OCAvKiBKU1Bhbm5lck5vZGVDdXN0b20uY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkQ4QUE2M0QxNjk1MTRBNzAw RDJFQTY4IC8qIEpTUGFubmVyTm9kZUN1c3RvbS5jcHAgKi87IH07CiAJCUZEOEM0NkVCMTU0NjA4 RTcwMEE1OTEwQyAvKiBBdWRpb1NjaGVkdWxlZFNvdXJjZU5vZGUuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRkQ4QzQ2RTkxNTQ2MDhFNzAwQTU5MTBD IC8qIEF1ZGlvU2NoZWR1bGVkU291cmNlTm9kZS5jcHAgKi87IH07CiAJCUZEOEM0NkVDMTU0NjA4 RTcwMEE1OTEwQyAvKiBBdWRpb1NjaGVkdWxlZFNvdXJjZU5vZGUuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZEOEM0NkVBMTU0NjA4RTcwMEE1OTEwQyAv KiBBdWRpb1NjaGVkdWxlZFNvdXJjZU5vZGUuaCAqLzsgfTsKKwkJRkQ5NkM5OTcxOTgyRkJERjAw ODZFMTU2IC8qIEZvbnRMb2FkZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gRkQ5NkM5OTYxOTgyRkI0QzAwODZFMTU2IC8qIEZvbnRMb2FkZXIuY3Bw ICovOyB9OwogCQlGREExNUU5RDEyQjAzRUUxMDAzQTU4M0EgLyogSlNBdWRpb0J1ZmZlci5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGREExNUU4MTEy QjAzRUUxMDAzQTU4M0EgLyogSlNBdWRpb0J1ZmZlci5jcHAgKi87IH07CiAJCUZEQTE1RTlFMTJC MDNFRTEwMDNBNTgzQSAvKiBKU0F1ZGlvQnVmZmVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGREExNUU4MjEyQjAzRUUxMDAzQTU4M0EgLyogSlNBdWRp b0J1ZmZlci5oICovOyB9OwogCQlGREExNUU5RjEyQjAzRUUxMDAzQTU4M0EgLyogSlNBdWRpb0J1 ZmZlclNvdXJjZU5vZGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gRkRBMTVFODMxMkIwM0VFMTAwM0E1ODNBIC8qIEpTQXVkaW9CdWZmZXJTb3VyY2VO b2RlLmNwcCAqLzsgfTsKQEAgLTE0MTE4LDYgKzE0MTIwLDggQEAKIAkJRkQ4QUE2M0QxNjk1MTRB NzAwRDJFQTY4IC8qIEpTUGFubmVyTm9kZUN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKU1Bhbm5lck5vZGVDdXN0b20uY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlGRDhDNDZFOTE1NDYwOEU3MDBBNTkxMEMgLyogQXVkaW9TY2hlZHVsZWRT b3VyY2VOb2RlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEF1ZGlv U2NoZWR1bGVkU291cmNlTm9kZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZE OEM0NkVBMTU0NjA4RTcwMEE1OTEwQyAvKiBBdWRpb1NjaGVkdWxlZFNvdXJjZU5vZGUuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQXVkaW9TY2hlZHVsZWRTb3VyY2VOb2RlLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUZEOTZDOTk2MTk4MkZCNEMwMDg2RTE1NiAv KiBGb250TG9hZGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZv bnRMb2FkZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlGRDk2QzlBNDE5ODMx NEE1MDA4NkUxNTYgLyogSlNGb250TG9hZGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IEpTRm9udExvYWRlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUZEQTE1RTgxMTJCMDNFRTEwMDNBNTgzQSAvKiBKU0F1ZGlvQnVmZmVyLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTQXVkaW9CdWZmZXIuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlGREExNUU4MjEyQjAzRUUxMDAzQTU4M0EgLyogSlNBdWRp b0J1ZmZlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU0F1ZGlvQnVmZmVy Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUZEQTE1RTgzMTJCMDNFRTEwMDNBNTgz QSAvKiBKU0F1ZGlvQnVmZmVyU291cmNlTm9kZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBKU0F1ZGlvQnVmZmVyU291cmNlTm9kZS5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CkBAIC0xNjI1OCw2ICsxNjI2Miw3IEBACiAJCQkJNDA5RUJEQzIxNkI3RjNB NjAwQ0JBM0ZDIC8qIEpTQ1NTRm9udEZhY2VMb2FkRXZlbnQuaCAqLywKIAkJCQk0MEVDQUU4MDE2 QjhCNjhBMDBDMzYxMDMgLyogSlNET01FcnJvci5jcHAgKi8sCiAJCQkJNDBFQ0FFN0QxNkI4QjY3 MjAwQzM2MTAzIC8qIEpTRE9NRXJyb3IuaCAqLywKKwkJCQlGRDk2QzlBNDE5ODMxNEE1MDA4NkUx NTYgLyogSlNGb250TG9hZGVyLmNwcCAqLywKIAkJCQk0MDlFQkRCRjE2QjdGMzhFMDBDQkEzRkMg LyogSlNGb250TG9hZGVyLmggKi8sCiAJCQkJOTM4RTY1RjYwOUYwOTg1RDAwOEE0OEVDIC8qIEpT SFRNTEVsZW1lbnRXcmFwcGVyRmFjdG9yeS5jcHAgKi8sCiAJCQkJOTM4RTY1RjAwOUYwOTg0MDAw OEE0OEVDIC8qIEpTSFRNTEVsZW1lbnRXcmFwcGVyRmFjdG9yeS5oICovLApAQCAtMjIxMDYsNiAr MjIxMTEsNyBAQAogCQkJCUZDOUEwRjczMTY0MDk0Q0YwMDNENkI4RCAvKiBET01XaW5kb3dDU1Mu aWRsICovLAogCQkJCUZCREI2MTlBMTZENjAzMkEwMEJCMzM5NCAvKiBFbGVtZW50UnVsZUNvbGxl Y3Rvci5jcHAgKi8sCiAJCQkJRkJEQjYxOUUxNkQ2MDM2NTAwQkIzMzk0IC8qIEVsZW1lbnRSdWxl Q29sbGVjdG9yLmggKi8sCisJCQkJRkQ5NkM5OTYxOTgyRkI0QzAwODZFMTU2IC8qIEZvbnRMb2Fk ZXIuY3BwICovLAogCQkJCTQwOUVCREI1MTZCN0VFQTMwMENCQTNGQyAvKiBGb250TG9hZGVyLmgg Ki8sCiAJCQkJNDA5RUJEQjcxNkI3RUVCQTAwQ0JBM0ZDIC8qIEZvbnRMb2FkZXIuaWRsICovLAog CQkJCUNENEUwQUZBMTFGN0JDMjcwMDlEMzgxMSAvKiBmdWxsc2NyZWVuLmNzcyAqLywKQEAgLTI3 MDUxLDYgKzI3MDU3LDggQEAKIAkJCWlzYSA9IFBCWFNvdXJjZXNCdWlsZFBoYXNlOwogCQkJYnVp bGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKIAkJCWZpbGVzID0gKAorCQkJCUZENEU1RDNCMTk4 MzE3NTUwMEQ5M0E3NyAvKiBKU0ZvbnRMb2FkZXIuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJRkQ5 NkM5OTcxOTgyRkJERjAwODZFMTU2IC8qIEZvbnRMb2FkZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJNDFFMUIxRDAwRkY1OTg2OTAwNTc2QjNCIC8qIEFic3RyYWN0V29ya2VyLmNwcCBpbiBTb3Vy Y2VzICovLAogCQkJCTBGMjlDMTZFMTMwMEMyRTIwMDJENzk0RSAvKiBBY2Nlc3NpYmlsaXR5QWxs SW5PbmUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNzZDREQyRjIxMTAzREE2NjAwNjgwNTIxIC8q IEFjY2Vzc2liaWxpdHlNZW51TGlzdC5jcHAgaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9Gb250TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250 TG9hZGVyLmNwcAppbmRleCBlNzY2ZjdhNWZhNjhkNmZkZWVhMGM5YTAxZTFjNjVhMDYwMGRmYzc3 Li5hODlkOTMyYjQ1MmIxZTBlNzZmY2FiMzdhOTQ3ZTY4MmU1ZDUxMWNlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvRm9udExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L0ZvbnRMb2FkZXIuY3BwCkBAIC0zNSw2ICszNSw4IEBACiAjaW5jbHVkZSAiQ1NTU2VnbWVudGVk Rm9udEZhY2UuaCIKICNpbmNsdWRlICJEaWN0aW9uYXJ5LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQu aCIKKyNpbmNsdWRlICJFeGNlcHRpb25Db2RlRGVzY3JpcHRpb24uaCIKKyNpbmNsdWRlICJGb250 LmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgi CiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlci5oIgpAQCAtNTEsNyArNTMsNyBAQCBwdWJsaWM6CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZjxMb2FkRm9udENhbGxiYWNrPihuZXcgTG9hZEZvbnRDYWxs YmFjayhudW1Mb2FkaW5nLCBsb2FkQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKICAgICB9CiAK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxMb2FkRm9udENhbGxiYWNrPiBjcmVhdGVGcm9tUGFyYW1z KGNvbnN0IERpY3Rpb25hcnkmIHBhcmFtcywgY29uc3QgRm9udEZhbWlseSYgZmFtaWx5KQorICAg IHN0YXRpYyBQYXNzUmVmUHRyPExvYWRGb250Q2FsbGJhY2s+IGNyZWF0ZUZyb21QYXJhbXMoY29u c3QgRGljdGlvbmFyeSYgcGFyYW1zLCBjb25zdCBGb250JiBmb250KQogICAgIHsKICAgICAgICAg UmVmUHRyPFZvaWRDYWxsYmFjaz4gb25zdWNjZXNzOwogICAgICAgICBSZWZQdHI8Vm9pZENhbGxi YWNrPiBvbmVycm9yOwpAQCAtNTksMTQgKzYxLDE0IEBAIHB1YmxpYzoKICAgICAgICAgcGFyYW1z LmdldCgib25lcnJvciIsIG9uZXJyb3IpOwogICAgICAgICBpZiAoIW9uc3VjY2VzcyAmJiAhb25l cnJvcikKICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBpbnQgbnVtRmFtaWxpZXMgPSAw OwotICAgICAgICBmb3IgKGNvbnN0IEZvbnRGYW1pbHkqIGYgPSAmZmFtaWx5OyBmOyBmID0gZi0+ bmV4dCgpKQotICAgICAgICAgICAgbnVtRmFtaWxpZXMrKzsKKyAgICAgICAgaW50IG51bUZhbWls aWVzID0gZm9udC5mYW1pbHlDb3VudCgpOwogICAgICAgICByZXR1cm4gTG9hZEZvbnRDYWxsYmFj azo6Y3JlYXRlKG51bUZhbWlsaWVzLCBvbnN1Y2Nlc3MsIG9uZXJyb3IpOwogICAgIH0KIAogICAg IHZpcnR1YWwgdm9pZCBub3RpZnlMb2FkZWQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQg bm90aWZ5RXJyb3IoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIH5Mb2FkRm9udENhbGxiYWNrKCkg eyB9OworCiBwcml2YXRlOgogICAgIExvYWRGb250Q2FsbGJhY2soaW50IG51bUxvYWRpbmcsIFBh c3NSZWZQdHI8Vm9pZENhbGxiYWNrPiBsb2FkQ2FsbGJhY2ssIFBhc3NSZWZQdHI8Vm9pZENhbGxi YWNrPiBlcnJvckNhbGxiYWNrKQogICAgICAgICA6IG1fbnVtTG9hZGluZyhudW1Mb2FkaW5nKQpA QCAtMjM0LDEwICsyMzYsMTAgQEAgdm9pZCBGb250TG9hZGVyOjpsb2FkRm9udChjb25zdCBEaWN0 aW9uYXJ5JiBwYXJhbXMpCiAgICAgRm9udCBmb250OwogICAgIGlmICghcmVzb2x2ZUZvbnRTdHls ZShmb250U3RyaW5nLCBmb250KSkKICAgICAgICAgcmV0dXJuOwotICAgIFJlZlB0cjxMb2FkRm9u dENhbGxiYWNrPiBjYWxsYmFjayA9IExvYWRGb250Q2FsbGJhY2s6OmNyZWF0ZUZyb21QYXJhbXMo cGFyYW1zLCBmb250LmZhbWlseSgpKTsKKyAgICBSZWZQdHI8TG9hZEZvbnRDYWxsYmFjaz4gY2Fs bGJhY2sgPSBMb2FkRm9udENhbGxiYWNrOjpjcmVhdGVGcm9tUGFyYW1zKHBhcmFtcywgZm9udCk7 CiAgICAgCi0gICAgZm9yIChjb25zdCBGb250RmFtaWx5KiBmID0gJmZvbnQuZmFtaWx5KCk7IGY7 IGYgPSBmLT5uZXh0KCkpIHsKLSAgICAgICAgQ1NTU2VnbWVudGVkRm9udEZhY2UqIGZhY2UgPSBt X2RvY3VtZW50LT5lbnN1cmVTdHlsZVJlc29sdmVyKCktPmZvbnRTZWxlY3RvcigpLT5nZXRGb250 RmFjZShmb250LmZvbnREZXNjcmlwdGlvbigpLCBmLT5mYW1pbHkoKSk7CisgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGZvbnQuZmFtaWx5Q291bnQoKTsgaSsrKSB7CisgICAgICAgIENTU1Nl Z21lbnRlZEZvbnRGYWNlKiBmYWNlID0gbV9kb2N1bWVudC0+ZW5zdXJlU3R5bGVSZXNvbHZlcigp LmZvbnRTZWxlY3RvcigpLT5nZXRGb250RmFjZShmb250LmZvbnREZXNjcmlwdGlvbigpLCBmb250 LmZhbWlseUF0KGkpKTsKICAgICAgICAgaWYgKCFmYWNlKSB7CiAgICAgICAgICAgICBpZiAoY2Fs bGJhY2spCiAgICAgICAgICAgICAgICAgY2FsbGJhY2stPm5vdGlmeUVycm9yKCk7CkBAIC0yNTMs MTcgKzI1NSwxNyBAQCBib29sIEZvbnRMb2FkZXI6OmNoZWNrRm9udChjb25zdCBTdHJpbmcmIGZv bnRTdHJpbmcsIGNvbnN0IFN0cmluZyYpCiAgICAgRm9udCBmb250OwogICAgIGlmICghcmVzb2x2 ZUZvbnRTdHlsZShmb250U3RyaW5nLCBmb250KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IGZvciAoY29uc3QgRm9udEZhbWlseSogZiA9ICZmb250LmZhbWlseSgpOyBmOyBmID0gZi0+bmV4 dCgpKSB7Ci0gICAgICAgIENTU1NlZ21lbnRlZEZvbnRGYWNlKiBmYWNlID0gbV9kb2N1bWVudC0+ ZW5zdXJlU3R5bGVSZXNvbHZlcigpLT5mb250U2VsZWN0b3IoKS0+Z2V0Rm9udEZhY2UoZm9udC5m b250RGVzY3JpcHRpb24oKSwgZi0+ZmFtaWx5KCkpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBmb250LmZhbWlseUNvdW50KCk7IGkrKykgeworICAgICAgICBDU1NTZWdtZW50ZWRGb250 RmFjZSogZmFjZSA9IG1fZG9jdW1lbnQtPmVuc3VyZVN0eWxlUmVzb2x2ZXIoKS5mb250U2VsZWN0 b3IoKS0+Z2V0Rm9udEZhY2UoZm9udC5mb250RGVzY3JpcHRpb24oKSwgZm9udC5mYW1pbHlBdChp KSk7CiAgICAgICAgIGlmICghZmFjZSB8fCAhZmFjZS0+Y2hlY2tGb250KCkpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgdm9p ZCBhcHBseVByb3BlcnR5VG9DdXJyZW50U3R5bGUoU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZl ciwgQ1NTUHJvcGVydHlJRCBpZCwgY29uc3QgUmVmUHRyPFN0eWxlUHJvcGVydGllcz4mIHBhcnNl ZFN0eWxlKQorc3RhdGljIHZvaWQgYXBwbHlQcm9wZXJ0eVRvQ3VycmVudFN0eWxlKFN0eWxlUmVz b2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1Byb3BlcnR5SUQgaWQsIGNvbnN0IFJlZlB0cjxTdHls ZVByb3BlcnRpZXM+JiBwYXJzZWRTdHlsZSkKIHsKLSAgICBzdHlsZVJlc29sdmVyLT5hcHBseVBy b3BlcnR5VG9DdXJyZW50U3R5bGUoaWQsIHBhcnNlZFN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVl KGlkKS5nZXQoKSk7CisgICAgc3R5bGVSZXNvbHZlci5hcHBseVByb3BlcnR5VG9DdXJyZW50U3R5 bGUoaWQsIHBhcnNlZFN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKGlkKS5nZXQoKSk7CiB9CiAK IGJvb2wgRm9udExvYWRlcjo6cmVzb2x2ZUZvbnRTdHlsZShjb25zdCBTdHJpbmcmIGZvbnRTdHJp bmcsIEZvbnQmIGZvbnQpCkBAIC0yODAsMTEgKzI4Miw4IEBAIGJvb2wgRm9udExvYWRlcjo6cmVz b2x2ZUZvbnRTdHlsZShjb25zdCBTdHJpbmcmIGZvbnRTdHJpbmcsIEZvbnQmIGZvbnQpCiAKICAg ICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZSgpOwogCi0g ICAgRm9udEZhbWlseSBmb250RmFtaWx5OwotICAgIGZvbnRGYW1pbHkuc2V0RmFtaWx5KGRlZmF1 bHRGb250RmFtaWx5KTsKLQogICAgIEZvbnREZXNjcmlwdGlvbiBkZWZhdWx0Rm9udERlc2NyaXB0 aW9uOwotICAgIGRlZmF1bHRGb250RGVzY3JpcHRpb24uc2V0RmFtaWx5KGZvbnRGYW1pbHkpOwor ICAgIGRlZmF1bHRGb250RGVzY3JpcHRpb24uc2V0T25lRmFtaWx5KGRlZmF1bHRGb250RmFtaWx5 KTsKICAgICBkZWZhdWx0Rm9udERlc2NyaXB0aW9uLnNldFNwZWNpZmllZFNpemUoZGVmYXVsdEZv bnRTaXplKTsKICAgICBkZWZhdWx0Rm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShkZWZh dWx0Rm9udFNpemUpOwogCkBAIC0yOTMsOCArMjkyLDggQEAgYm9vbCBGb250TG9hZGVyOjpyZXNv bHZlRm9udFN0eWxlKGNvbnN0IFN0cmluZyYgZm9udFN0cmluZywgRm9udCYgZm9udCkKICAgICBz dHlsZS0+Zm9udCgpLnVwZGF0ZShzdHlsZS0+Zm9udCgpLmZvbnRTZWxlY3RvcigpKTsKIAogICAg IC8vIE5vdyBtYXAgdGhlIGZvbnQgcHJvcGVydHkgbG9uZ2hhbmRzIGludG8gdGhlIHN0eWxlLgot ICAgIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIgPSBtX2RvY3VtZW50LT5lbnN1cmVTdHls ZVJlc29sdmVyKCk7Ci0gICAgc3R5bGVSZXNvbHZlci0+YXBwbHlQcm9wZXJ0eVRvU3R5bGUoQ1NT UHJvcGVydHlGb250RmFtaWx5LCBwYXJzZWRTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQ cm9wZXJ0eUZvbnRGYW1pbHkpLmdldCgpLCBzdHlsZS5nZXQoKSk7CisgICAgU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlciA9IG1fZG9jdW1lbnQtPmVuc3VyZVN0eWxlUmVzb2x2ZXIoKTsKKyAg ICBzdHlsZVJlc29sdmVyLmFwcGx5UHJvcGVydHlUb1N0eWxlKENTU1Byb3BlcnR5Rm9udEZhbWls eSwgcGFyc2VkU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250RmFtaWx5 KS5nZXQoKSwgc3R5bGUuZ2V0KCkpOwogICAgIGFwcGx5UHJvcGVydHlUb0N1cnJlbnRTdHlsZShz dHlsZVJlc29sdmVyLCBDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgcGFyc2VkU3R5bGUpOwogICAgIGFw cGx5UHJvcGVydHlUb0N1cnJlbnRTdHlsZShzdHlsZVJlc29sdmVyLCBDU1NQcm9wZXJ0eUZvbnRW YXJpYW50LCBwYXJzZWRTdHlsZSk7CiAgICAgYXBwbHlQcm9wZXJ0eVRvQ3VycmVudFN0eWxlKHN0 eWxlUmVzb2x2ZXIsIENTU1Byb3BlcnR5Rm9udFdlaWdodCwgcGFyc2VkU3R5bGUpOwpAQCAtMzAy LDEzICszMDEsMTMgQEAgYm9vbCBGb250TG9hZGVyOjpyZXNvbHZlRm9udFN0eWxlKGNvbnN0IFN0 cmluZyYgZm9udFN0cmluZywgRm9udCYgZm9udCkKICAgICAvLyBBcyBkZXNjcmliZWQgaW4gQlVH NjYyOTEsIHNldHRpbmcgZm9udC1zaXplIGFuZCBsaW5lLWhlaWdodCBvbiBhIGZvbnQgbWF5IGVu dGFpbCBhIENTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoRG91YmxlIGNhbGwsCiAgICAg Ly8gd2hpY2ggYXNzdW1lcyB0aGUgZm9udE1ldHJpY3MgYXJlIGF2YWlsYWJsZSBmb3IgdGhlIGFm ZmVjdGVkIGZvbnQsIG90aGVyd2lzZSBhIGNyYXNoIG9jY3VycyAoc2VlIGh0dHA6Ly90cmFjLndl YmtpdC5vcmcvY2hhbmdlc2V0Lzk2MTIyKS4KICAgICAvLyBUaGUgdXBkYXRlRm9udCgpIGNhbGxz IGJlbG93IHVwZGF0ZSB0aGUgZm9udE1ldHJpY3MgYW5kIGVuc3VyZSB0aGUgcHJvcGVyIHNldHRp bmcgb2YgZm9udC1zaXplIGFuZCBsaW5lLWhlaWdodC4KLSAgICBzdHlsZVJlc29sdmVyLT51cGRh dGVGb250KCk7CisgICAgc3R5bGVSZXNvbHZlci51cGRhdGVGb250KCk7CiAgICAgYXBwbHlQcm9w ZXJ0eVRvQ3VycmVudFN0eWxlKHN0eWxlUmVzb2x2ZXIsIENTU1Byb3BlcnR5Rm9udFNpemUsIHBh cnNlZFN0eWxlKTsKLSAgICBzdHlsZVJlc29sdmVyLT51cGRhdGVGb250KCk7CisgICAgc3R5bGVS ZXNvbHZlci51cGRhdGVGb250KCk7CiAgICAgYXBwbHlQcm9wZXJ0eVRvQ3VycmVudFN0eWxlKHN0 eWxlUmVzb2x2ZXIsIENTU1Byb3BlcnR5TGluZUhlaWdodCwgcGFyc2VkU3R5bGUpOwogCiAgICAg Zm9udCA9IHN0eWxlLT5mb250KCk7Ci0gICAgZm9udC51cGRhdGUoc3R5bGVSZXNvbHZlci0+Zm9u dFNlbGVjdG9yKCkpOworICAgIGZvbnQudXBkYXRlKHN0eWxlUmVzb2x2ZXIuZm9udFNlbGVjdG9y KCkpOwogICAgIHJldHVybiB0cnVlOwogfQogCg==