52960 2011-01-22 05:31:58 -0800 REGRESSION: Vertical line metrics incorrect 2011-01-22 05:46:57 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 51456 1 zimmermann zimmermann krit oldest_to_newest 338581 0 zimmermann 2011-01-22 05:31:58 -0800 After landing the FontMetrics abstraction from bug 51456, vertical line metrics are incorrect. There's a hack in SimpleFontDataMac.mm that modifies lineGap/descent for a certain vertical font. That hack now influences the lineSpacing, where it shouldn't. Attaching a patch soon, to restore the old behaviour. 338582 1 79844 zimmermann 2011-01-22 05:36:54 -0800 Created attachment 79844 Patch 338584 2 79844 krit 2011-01-22 05:39:41 -0800 Comment on attachment 79844 Patch r=me 338585 3 zimmermann 2011-01-22 05:46:57 -0800 Landed fix in r76445. Let's see.. 79844 2011-01-22 05:36:54 -0800 2011-01-22 05:39:41 -0800 Patch FixFontMetrics.diff text/plain 13408 zimmermann SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2NDQ0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMDEtMjIgIE5pa29sYXMg WmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTjogVmVydGljYWwgbGluZSBtZXRy aWNzIGluY29ycmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTI5NjAKKworICAgICAgICBTaW1wbGVGb250RGF0YU1hYy5tbSBjb250YWlucyBhIGhh Y2sgdG8gbW9kaWZpeSBsaW5lR2FwL2Rlc2NlbnQgZm9yIHRoZSAnSGlyYWdpbm8nIGZvbnQuCisg ICAgICAgIFRoYXQgZGlkbid0IGluZmx1ZW5jZSB0aGUgbGluZVNwYWNpbmcgc28gZmFyLCBidXQg ZG9lcyBub3csIGNhdXNpbmcgcmVncmVzc2lvbnMuCisKKyAgICAgICAgUmVzdG9yZSBvbGQgbGlu ZSBzcGFjaW5nIGJlaGF2aW91ciB0byBmaXggdGhlIHJlZ3Jlc3Npb24uCisgICAgICAgIENvdmVy ZWQgYnkgZXhpc3RpbmcgZmFzdC9ibG9ja2Zsb3csIGZhc3QvcmVwYWludCBhbmQgZmFzdC90ZXh0 L2ludGVybmF0aW9uYWwgdGVzdCBjYXNlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnRNZXRyaWNzLmg6CisgICAgICAgIChXZWJDb3JlOjpGb250TWV0cmljczo6Rm9udE1ldHJp Y3MpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udE1ldHJpY3M6OmZsb2F0TGluZVNwYWNpbmcpOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udE1ldHJpY3M6OnNldExpbmVTcGFjaW5nKToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRNZXRyaWNzOjpsaW5lU3BhY2luZyk6CisgICAgICAgIChXZWJDb3JlOjpG b250TWV0cmljczo6cmVzZXQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZv bnREYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpTaW1wbGVGb250 RGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxlRm9udERh dGFDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1Jbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1wbGVG b250RGF0YUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0 Zm9ybUluaXQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZv bnREYXRhRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBs YXRmb3JtSW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9u dERhdGFIYWlrdS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZv cm1Jbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9wYW5nby9TaW1wbGVGb250RGF0YVBhbmdvLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ0dXaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBs ZUZvbnREYXRhOjppbml0R0RJRm9udCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu Y2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250 RGF0YTo6cGxhdGZvcm1Jbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93eC9TaW1w bGVGb250RGF0YVd4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0 Zm9ybUluaXQpOgorCiAyMDExLTAxLTIyICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRNZXRyaWNzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udE1ldHJpY3MuaAko cmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 TWV0cmljcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBAIHB1YmxpYzoKICAgICAg ICAgLCBtX2FzY2VudCgwKQogICAgICAgICAsIG1fZGVzY2VudCgwKQogICAgICAgICAsIG1fbGlu ZUdhcCgwKQorICAgICAgICAsIG1fbGluZVNwYWNpbmcoMCkKICAgICAgICAgLCBtX3hIZWlnaHQo MCkKICAgICB7CiAgICAgfQpAQCAtNjYsNyArNjcsOCBAQCBwdWJsaWM6CiAgICAgZmxvYXQgZmxv YXRMaW5lR2FwKCkgY29uc3QgeyByZXR1cm4gbV9saW5lR2FwOyB9CiAgICAgdm9pZCBzZXRMaW5l R2FwKGZsb2F0IGxpbmVHYXApIHsgbV9saW5lR2FwID0gbGluZUdhcDsgfQogCi0gICAgZmxvYXQg ZmxvYXRMaW5lU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIG1fYXNjZW50ICsgbV9kZXNjZW50ICsg bV9saW5lR2FwOyB9CisgICAgZmxvYXQgZmxvYXRMaW5lU3BhY2luZygpIGNvbnN0IHsgcmV0dXJu IG1fbGluZVNwYWNpbmc7IH0KKyAgICB2b2lkIHNldExpbmVTcGFjaW5nKGZsb2F0IGxpbmVTcGFj aW5nKSB7IG1fbGluZVNwYWNpbmcgPSBsaW5lU3BhY2luZzsgfQogCiAgICAgZmxvYXQgeEhlaWdo dCgpIGNvbnN0IHsgcmV0dXJuIG1feEhlaWdodDsgfQogICAgIHZvaWQgc2V0WEhlaWdodChmbG9h dCB4SGVpZ2h0KSB7IG1feEhlaWdodCA9IHhIZWlnaHQ7IH0KQEAgLTkyLDEyICs5NCw3IEBAIHB1 YmxpYzoKICAgICB9CiAKICAgICBpbnQgbGluZUdhcCgpIGNvbnN0IHsgcmV0dXJuIGxyb3VuZGYo bV9saW5lR2FwKTsgfQotCi0gICAgaW50IGxpbmVTcGFjaW5nKCkgY29uc3QKLSAgICB7Ci0gICAg ICAgIC8vIFRoaXMgbWltaWNzIHRoZSBvbGQgV2ViQ29yZSBkZWZpbml0aW9uIG9mIGxpbmVTcGFj aW5nLiBDaGFuZ2luZyB0byBscm91bmRmKG1fYXNjZW50ICsgbV9kZXNjZW50ICsgbV9saW5lR2Fw KSBjYXVzZXMgbG90cyBvZiAxcHggaGVpZ2h0IGRpZmZlcmVuY2VzIGluIHRoZSBEUlQgZHVtcHMK LSAgICAgICAgcmV0dXJuIGxyb3VuZGYobV9hc2NlbnQpICsgbHJvdW5kZihtX2Rlc2NlbnQpICsg bHJvdW5kZihtX2xpbmVHYXApOwotICAgIH0KKyAgICBpbnQgbGluZVNwYWNpbmcoKSBjb25zdCB7 IHJldHVybiBscm91bmRmKG1fbGluZVNwYWNpbmcpOyB9CiAKIHByaXZhdGU6CiAgICAgZnJpZW5k IGNsYXNzIFNpbXBsZUZvbnREYXRhOwpAQCAtMTA4LDYgKzEwNSw3IEBAIHByaXZhdGU6CiAgICAg ICAgIG1fYXNjZW50ID0gMDsKICAgICAgICAgbV9kZXNjZW50ID0gMDsKICAgICAgICAgbV9saW5l R2FwID0gMDsKKyAgICAgICAgbV9saW5lU3BhY2luZyA9IDA7CiAgICAgICAgIG1feEhlaWdodCA9 IDA7CiAgICAgfQogCkBAIC0xMTUsNiArMTEzLDcgQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX2Fz Y2VudDsKICAgICBmbG9hdCBtX2Rlc2NlbnQ7CiAgICAgZmxvYXQgbV9saW5lR2FwOworICAgIGZs b2F0IG1fbGluZVNwYWNpbmc7CiAgICAgZmxvYXQgbV94SGVpZ2h0OwogfTsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmNw cAkocmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9T aW1wbGVGb250RGF0YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4LDYgKzg4LDcgQEAgU2ltcGxl Rm9udERhdGE6OlNpbXBsZUZvbnREYXRhKFBhc3NPd25QdAogICAgIG1fZm9udE1ldHJpY3Muc2V0 QXNjZW50KGFzY2VudCk7CiAgICAgbV9mb250TWV0cmljcy5zZXREZXNjZW50KGRlc2NlbnQpOwog ICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZUdhcChsaW5lR2FwKTsKKyAgICBtX2ZvbnRNZXRyaWNz LnNldExpbmVTcGFjaW5nKGFzY2VudCArIGRlc2NlbnQgKyBsaW5lR2FwKTsKICAgICBtX2ZvbnRN ZXRyaWNzLnNldFhIZWlnaHQoeEhlaWdodCk7CiAKICAgICBTVkdGb250RWxlbWVudCogYXNzb2Np YXRlZEZvbnRFbGVtZW50ID0gc3ZnRm9udEZhY2VFbGVtZW50LT5hc3NvY2lhdGVkRm9udEVsZW1l bnQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Np bXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3Bw CShyZXZpc2lvbiA3NjQ0MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 Nyw2ICs5Nyw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgbV9m b250TWV0cmljcy5zZXREZXNjZW50KGRlc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Muc2V0TGlu ZUdhcChsaW5lR2FwKTsKICAgICBtX2ZvbnRNZXRyaWNzLnNldFhIZWlnaHQoeEhlaWdodCk7Cisg ICAgbV9mb250TWV0cmljcy5zZXRMaW5lU3BhY2luZyhhc2NlbnQgKyBkZXNjZW50ICsgbGluZUdh cCk7CiAKICAgICBTZWxlY3RPYmplY3QoZGMsIG9sZEZvbnQpOwogICAgIFJlbGVhc2VEQygwLCBk Yyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1w bGVGb250RGF0YUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9TaW1wbGVGb250RGF0YUxpbnV4LmNwcAkocmV2aXNpb24gNzY0 NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1wbGVG b250RGF0YUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDggKzEwOSwxMCBAQCB2b2lk IFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgICAgICB4SGVpZ2h0ID0gYXNjZW50 ICogMC41NmY7CiAgICAgfQogCi0gICAgbV9mb250TWV0cmljcy5zZXRMaW5lR2FwKFNrU2NhbGFy VG9GbG9hdChtZXRyaWNzLmZMZWFkaW5nKSk7CisgICAgZmxvYXQgbGluZUdhcCA9IFNrU2NhbGFy VG9GbG9hdChtZXRyaWNzLmZMZWFkaW5nKTsKKyAgICBtX2ZvbnRNZXRyaWNzLnNldExpbmVHYXAo bGluZUdhcCk7CiAgICAgbV9mb250TWV0cmljcy5zZXRYSGVpZ2h0KHhIZWlnaHQpOworICAgIG1f Zm9udE1ldHJpY3Muc2V0TGluZVNwYWNpbmcobHJvdW5kZihhc2NlbnQpICsgbHJvdW5kZihkZXNj ZW50KSArIGxyb3VuZGYobGluZUdhcCkpOwogCiAgICAgaWYgKG1fb3JpZW50YXRpb24gPT0gVmVy dGljYWwpIHsKICAgICAgICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IHZoZWFUYWcgPSBTa1NldEZv dXJCeXRlVGFnKCd2JywgJ2gnLCAnZScsICdhJyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVG b250RGF0YUZyZWVUeXBlLmNwcAkocmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9y bUluaXQoKQogICAgIGZsb2F0IGxpbmVTcGFjaW5nID0gZm9udF9leHRlbnRzLmhlaWdodDsKICAg ICBpZiAobGluZVNwYWNpbmcgPCBmb250X2V4dGVudHMuYXNjZW50ICsgZm9udF9leHRlbnRzLmRl c2NlbnQpCiAgICAgICAgIGxpbmVTcGFjaW5nID0gZm9udF9leHRlbnRzLmFzY2VudCArIGZvbnRf ZXh0ZW50cy5kZXNjZW50OworCisgICAgbV9mb250TWV0cmljcy5zZXRMaW5lU3BhY2luZyhscm91 bmRmKGxpbmVTcGFjaW5nKSk7CiAgICAgbV9mb250TWV0cmljcy5zZXRMaW5lR2FwKGxpbmVTcGFj aW5nIC0gZm9udF9leHRlbnRzLmFzY2VudCAtIGZvbnRfZXh0ZW50cy5kZXNjZW50KTsKIAogICAg IGNhaXJvX3NjYWxlZF9mb250X3RleHRfZXh0ZW50cyhtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250 KCksICJ4IiwgJnRleHRfZXh0ZW50cyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9oYWlrdS9TaW1wbGVGb250RGF0YUhhaWt1LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9TaW1wbGVGb250RGF0YUhhaWt1LmNw cAkocmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9o YWlrdS9TaW1wbGVGb250RGF0YUhhaWt1LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIs NyBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgIG1fZm9udE1ldHJp Y3Muc2V0RGVzY2VudChoZWlnaHQuZGVzY2VudCk7CiAgICAgbV9mb250TWV0cmljcy5zZXRYSGVp Z2h0KGhlaWdodC5hc2NlbnQgKiAwLjU2Zik7IC8vIEhhY2sgdGFrZW4gZnJvbSB0aGUgd2luIHBv cnQuCiAgICAgbV9mb250TWV0cmljcy5zZXRMaW5lR2FwKGhlaWdodC5sZWFkaW5nKTsKKyAgICBt X2ZvbnRNZXRyaWNzLnNldExpbmVTcGFjaW5nKGxyb3VuZGYoaGVpZ2h0LmFzY2VudCkgKyBscm91 bmRmKGhlaWdodC5kZXNjZW50KSArIGxyb3VuZGYoaGVpZ2h0LmxlYWRpbmcpKTsKIH0KIAogdm9p ZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1DaGFyV2lkdGhJbml0KCkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERh dGFNYWMubW0JKHJldmlzaW9uIDc2NDQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNDksNiAr MjQ5LDkgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAgICAgICAgZGVz Y2VudCAqPSAyLmY7CiAgICAgfQogCisgICAgLy8gQ29tcHV0ZSBhbmQgc3RvcmUgbGluZSBzcGFj aW5nLCBiZWZvcmUgdGhlIGxpbmUgbWV0cmljcyBoYWNrcyBhcmUgYXBwbGllZC4KKyAgICBtX2Zv bnRNZXRyaWNzLnNldExpbmVTcGFjaW5nKGxyb3VuZGYoYXNjZW50KSArIGxyb3VuZGYoZGVzY2Vu dCkgKyBscm91bmRmKGxpbmVHYXApKTsKKwogICAgIC8vIEhhY2sgSGlyYWdpbm8gbGluZSBtZXRy aWNzIHRvIGFsbG93IHJvb20gZm9yIG1hcmtlZCB0ZXh0IHVuZGVybGluZXMuCiAgICAgLy8gPHJk YXI6Ly9wcm9ibGVtLzUzODYxODM+CiAgICAgaWYgKGRlc2NlbnQgPCAzICYmIGxpbmVHYXAgPj0g MyAmJiBbZmFtaWx5TmFtZSBoYXNQcmVmaXg6QCJIaXJhZ2lubyJdKSB7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9wYW5nby9TaW1wbGVGb250RGF0YVBhbmdvLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9wYW5nby9TaW1w bGVGb250RGF0YVBhbmdvLmNwcAkocmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9wYW5nby9TaW1wbGVGb250RGF0YVBhbmdvLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjEsNiArNjEsNyBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQo KQogICAgIGZsb2F0IGxpbmVTcGFjaW5nID0gZm9udF9leHRlbnRzLmhlaWdodDsKICAgICBpZiAo bGluZVNwYWNpbmcgPCBmb250X2V4dGVudHMuYXNjZW50ICsgZm9udF9leHRlbnRzLmRlc2NlbnQp CiAgICAgICAgIGxpbmVTcGFjaW5nID0gZm9udF9leHRlbnRzLmFzY2VudCArIGZvbnRfZXh0ZW50 cy5kZXNjZW50OworICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZVNwYWNpbmcobHJvdW5kZihsaW5l U3BhY2luZykpOwogICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZUdhcChsaW5lU3BhY2luZyAtIGZv bnRfZXh0ZW50cy5hc2NlbnQgLSBmb250X2V4dGVudHMuZGVzY2VudCk7CiAKICAgICBjYWlyb19z Y2FsZWRfZm9udF90ZXh0X2V4dGVudHMobV9wbGF0Zm9ybURhdGEubV9zY2FsZWRGb250LCAieCIs ICZ0ZXh0X2V4dGVudHMpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvU2ltcGxlRm9udERhdGFRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAJKHJldmlzaW9uIDc2NDQyKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6 cGxhdGZvcm1Jbml0KCkKICAgICBtX2ZvbnRNZXRyaWNzLnNldERlc2NlbnQoZm0uZGVzY2VudCgp KTsKICAgICBtX2ZvbnRNZXRyaWNzLnNldFhIZWlnaHQoZm0ueEhlaWdodCgpKTsKICAgICBtX2Zv bnRNZXRyaWNzLnNldExpbmVHYXAoZm0ubGVhZGluZygpKTsKKyAgICBtX2ZvbnRNZXRyaWNzLnNl dExpbmVTcGFjaW5nKGZtLmxpbmVTcGFjaW5nKCkpOwogICAgIG1fc3BhY2VXaWR0aCA9IGZtLndp ZHRoKFFMYXRpbjFDaGFyKCcgJykpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDR1dpbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ0dXaW4uY3Bw CShyZXZpc2lvbiA3NjQ0MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9TaW1wbGVGb250RGF0YUNHV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsNyBA QCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgIG1fZm9udE1ldHJpY3Mu c2V0QXNjZW50KGZBc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Muc2V0RGVzY2VudChmRGVzY2Vu dCk7CiAgICAgbV9mb250TWV0cmljcy5zZXRMaW5lR2FwKGZMaW5lR2FwKTsKKyAgICBtX2ZvbnRN ZXRyaWNzLnNldExpbmVTcGFjaW5nKGxyb3VuZGYoZkFzY2VudCkgKyBscm91bmRmKGZEZXNjZW50 KSArIGxyb3VuZGYoZkxpbmVHYXApKTsKIAogICAgIC8vIE1lYXN1cmUgdGhlIGFjdHVhbCBjaGFy YWN0ZXIgIngiLCBiZWNhdXNlIEFwcEtpdCBzeW50aGVzaXplcyBYIGhlaWdodCByYXRoZXIgdGhh biBnZXR0aW5nIGl0IGZyb20gdGhlIGZvbnQuCiAgICAgLy8gVW5mb3J0dW5hdGVseSwgTlNGb250 IHdpbGwgcm91bmQgdGhpcyBmb3IgdXMgc28gd2UgZG9uJ3QgcXVpdGUgZ2V0IHRoZSByaWdodCB2 YWx1ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVG b250RGF0YUNhaXJvV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDYWlyb1dpbi5jcHAJKHJldmlzaW9uIDc2NDQy KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRh Q2Fpcm9XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3MCw3IEBAIHZvaWQgU2ltcGxl Rm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgbV9mb250TWV0cmljcy5zZXRBc2NlbnQoYXNj ZW50KTsKICAgICBtX2ZvbnRNZXRyaWNzLnNldERlc2NlbnQoZGVzY2VudCk7CiAgICAgbV9mb250 TWV0cmljcy5zZXRMaW5lR2FwKGxpbmVHYXApOworICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZVNw YWNpbmcobHJvdW5kZihhc2NlbnQpICsgbHJvdW5kZihkZXNjZW50KSArIGxyb3VuZGYobGluZUdh cCkpOwogICAgIG1fYXZnQ2hhcldpZHRoID0gdGV4dE1ldHJpY3MudG1BdmVDaGFyV2lkdGggKiBt ZXRyaWNzTXVsdGlwbGllcjsKICAgICBtX21heENoYXJXaWR0aCA9IHRleHRNZXRyaWNzLnRtTWF4 Q2hhcldpZHRoICogbWV0cmljc011bHRpcGxpZXI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNw cAkocmV2aXNpb24gNzY0NDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Myw2ICs4Myw3IEBA IHZvaWQgU2ltcGxlRm9udERhdGE6OmluaXRHRElGb250KCkKICAgICAgbV9mb250TWV0cmljcy5z ZXRBc2NlbnQoYXNjZW50KTsKICAgICAgbV9mb250TWV0cmljcy5zZXREZXNjZW50KGRlc2NlbnQp OwogICAgICBtX2ZvbnRNZXRyaWNzLnNldExpbmVHYXAobGluZUdhcCk7CisgICAgIG1fZm9udE1l dHJpY3Muc2V0TGluZVNwYWNpbmcobHJvdW5kZihhc2NlbnQpICsgbHJvdW5kZihkZXNjZW50KSAr IGxyb3VuZGYobGluZUdhcCkpOwogICAgICBtX2F2Z0NoYXJXaWR0aCA9IHRleHRNZXRyaWNzLnRt QXZlQ2hhcldpZHRoOwogICAgICBtX21heENoYXJXaWR0aCA9IHRleHRNZXRyaWNzLnRtTWF4Q2hh cldpZHRoOwogICAgICBmbG9hdCB4SGVpZ2h0ID0gYXNjZW50ICogMC41NmY7IC8vIEJlc3QgZ3Vl c3MgZm9yIHhIZWlnaHQgaWYgbm8geCBnbHlwaCBpcyBwcmVzZW50LgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxl Rm9udERhdGFXaW5DRS5jcHAJKHJldmlzaW9uIDc2NDQyKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTU3LDYgKzU3LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkK ICAgICBtX2ZvbnRNZXRyaWNzLnNldEFzY2VudChhc2NlbnQpOwogICAgIG1fZm9udE1ldHJpY3Mu c2V0RGVzY2VudChkZXNjZW50KTsKICAgICBtX2ZvbnRNZXRyaWNzLnNldExpbmVHYXAobGluZUdh cCk7CisgICAgbV9mb250TWV0cmljcy5zZXRMaW5lU3BhY2luZyhscm91bmRmKGFzY2VudCkgKyBs cm91bmRmKGRlc2NlbnQpICsgbHJvdW5kZihsaW5lR2FwKSk7CiAgICAgbV9mb250TWV0cmljcy5z ZXRYSGVpZ2h0KGFzY2VudCAqIDAuNTZmKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd3gvU2ltcGxlRm9udERhdGFXeC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvU2ltcGxlRm9udERhdGFXeC5jcHAJKHJl dmlzaW9uIDc2NDQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvU2lt cGxlRm9udERhdGFXeC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAgdm9pZCBT aW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAgICAgICAgbV9mb250TWV0cmljcy5zZXRY SGVpZ2h0KHByb3BzLkdldFhIZWlnaHQoKSk7CiAgICAgICAgIG1fZm9udE1ldHJpY3Muc2V0VW5p dHNQZXJFbSgxKTsgLy8gRklYTUUhCiAgICAgICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZUdhcChw cm9wcy5HZXRMaW5lR2FwKCkpOworICAgICAgICBtX2ZvbnRNZXRyaWNzLnNldExpbmVTcGFjaW5n KHByb3BzLkdldExpbmVTcGFjaW5nKCkpOwogICAgIH0KIAogICAgIG1fc3ludGhldGljQm9sZE9m ZnNldCA9IDAuMGY7Cg==