81507 2012-03-19 06:49:21 -0700 [EFL] Use jhbuild downloaded fonts instead of hardcoded system font paths 2012-03-21 13:24:31 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Linux RESOLVED FIXED P2 Normal --- 1 d-r d-r gyuyoung.kim mrobinson rakuco tonikitoo webkit.review.bot oldest_to_newest 581739 0 d-r 2012-03-19 06:49:21 -0700 Now that we have jhbuild in place, I propose to use the fonts that we download using jhbuild, instead of system provided ones. This should further help to get stable test results across machines. 581740 1 132569 d-r 2012-03-19 06:54:23 -0700 Created attachment 132569 Use downloaded fonts Quick patch, feedback on how to determine the right path is welcome. Also, if this change is accepted in general, I think we can get rid of the getFontDirectories() function. 583014 2 rakuco 2012-03-20 06:40:02 -0700 Looks fine to me if it passes the EWS checks. We should pass the path to DOWNLOADED_FONTS_DIR in a more flexible way in 81475. 583104 3 132834 d-r 2012-03-20 08:41:44 -0700 Created attachment 132834 Diff of results before and after font change applied, r111388 Fixes about 60 cases, makes three different ones fail, as it seems. I think we should apply this. I will upload a new version of the patch that simplifies FontManagement.cpp. 583908 4 132995 d-r 2012-03-21 01:55:58 -0700 Created attachment 132995 Use downloaded fonts, simplify FontManagement.cpp 583916 5 132995 gyuyoung.kim 2012-03-21 02:13:53 -0700 Comment on attachment 132995 Use downloaded fonts, simplify FontManagement.cpp View in context: https://bugs.webkit.org/attachment.cgi?id=132995&action=review > Tools/DumpRenderTree/efl/FontManagement.cpp:56 > +static bool addFontDirectory(const String& fontDirectory, FcConfig* config) In my opinion, we should not use WebKit utilities in order to avoid WebKit dependency. However, it seems this is ok for now. 583949 6 d-r 2012-03-21 03:14:18 -0700 (In reply to comment #5) > (From update of attachment 132995 [details]) > In my opinion, we should not use WebKit utilities in order to avoid WebKit dependency. However, it seems this is ok for now. Alright - thanks. Let's handle this concern separately in bug 80683 since I am not adding/changing any class usage dependency. 584080 7 132995 rakuco 2012-03-21 06:36:03 -0700 Comment on attachment 132995 Use downloaded fonts, simplify FontManagement.cpp Looks awesome, thanks. 584456 8 132995 mrobinson 2012-03-21 12:02:34 -0700 Comment on attachment 132995 Use downloaded fonts, simplify FontManagement.cpp View in context: https://bugs.webkit.org/attachment.cgi?id=132995&action=review Looks good, but I have a concern about using the system filesystem encoding. > Tools/DumpRenderTree/efl/FontManagement.cpp:62 > + if (!ecore_file_is_dir(path) > + || !FcConfigAppFontAddDir(config, reinterpret_cast<const FcChar8*>(path))) { Do these functions accept paths in UTF-8 or in the system encoding? If it's in the system encoding you need to convert them from UTF-8 first. 584465 9 132995 mrobinson 2012-03-21 12:06:53 -0700 Comment on attachment 132995 Use downloaded fonts, simplify FontManagement.cpp View in context: https://bugs.webkit.org/attachment.cgi?id=132995&action=review > Tools/DumpRenderTree/efl/FontManagement.cpp:93 > - if (!addFontDirectories(getFontDirectories(), config)) { > + if (!addFontDirectory(String(DOWNLOADED_FONTS_DIR), config)) { You can avoid this problem entirely simply by making the argument to addFontDirectories a CString. 584516 10 133099 d-r 2012-03-21 12:48:15 -0700 Created attachment 133099 Use downloaded fonts, simplify FontManagement.cpp, CString Review comment about utf8 vs system locale addressed by using CString. 584560 11 133099 webkit.review.bot 2012-03-21 13:24:25 -0700 Comment on attachment 133099 Use downloaded fonts, simplify FontManagement.cpp, CString Clearing flags on attachment: 133099 Committed r111598: <http://trac.webkit.org/changeset/111598> 584561 12 webkit.review.bot 2012-03-21 13:24:31 -0700 All reviewed patches have been landed. Closing bug. 132569 2012-03-19 06:54:23 -0700 2012-03-21 01:55:58 -0700 Use downloaded fonts bug81507.patch text/plain 2253 d-r ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZWQ5 NjQyLi5iMTk3NTQzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTItMDMtMTkgIERvbWluaWsgUsO2dHRzY2hlcyAg PGRvbWluaWsucm90dHNjaGVzQGxpbnV4LmludGVsLmNvbT4KIAorICAgICAgICBbRUZMXSBVc2Ug amhidWlsZCBkb3dubG9hZGVkIGZvbnRzIGluc3RlYWQgb2YgaGFyZGNvZGVkIHN5c3RlbSBmb250 IHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MTUwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlzdHMudHh0OgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHA6CisgICAgICAgIChnZXRGb250RGlyZWN0b3JpZXMp OgorCisyMDEyLTAzLTE5ICBEb21pbmlrIFLDtnR0c2NoZXMgIDxkb21pbmlrLnJvdHRzY2hlc0Bs aW51eC5pbnRlbC5jb20+CisKICAgICAgICAgW0VGTF0gUHJlZml4IHJ1bi1sYXVuY2hlciB3aXRo IHJ1bi13aXRoLWpoYnVpbGQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTgwMDI2CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9D TWFrZUxpc3RzLnR4dCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9DTWFrZUxpc3RzLnR4dApp bmRleCAzYzFmZWFiLi4zZWUwMzg5IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvQ01ha2VMaXN0cy50eHQKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlz dHMudHh0CkBAIC0xMDgsNiArMTA4LDcgQEAgU0VUKER1bXBSZW5kZXJUcmVlX0xJTktfRkxBR1MK ICkKIAogQUREX0RFRklOSVRJT05TKC1ERk9OVFNfQ09ORl9ESVI9IiR7VE9PTFNfRElSfS9EdW1w UmVuZGVyVHJlZS9ndGsvZm9udHMiCisgICAgICAgICAgICAgICAgLURET1dOTE9BREVEX0ZPTlRT X0RJUj0iJHtDTUFLRV9CSU5BUllfRElSfS8uLi9EZXBlbmRlbmNpZXMvU291cmNlL3dlYmtpdGd0 ay10ZXN0LWZvbnRzLTAuMC4xIgogICAgICAgICAgICAgICAgIC1EREFUQV9ESVI9IiR7VEhFTUVf QklOQVJZX0RJUn0iKQogCiBJTkNMVURFX0RJUkVDVE9SSUVTKCR7RHVtcFJlbmRlclRyZWVfSU5D TFVERV9ESVJFQ1RPUklFU30pCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwv Rm9udE1hbmFnZW1lbnQuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0ZvbnRNYW5hZ2Vt ZW50LmNwcAppbmRleCA0Y2YyZmI2Li40NDJlZjE2IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2VmbC9Gb250TWFuYWdlbWVudC5jcHAKQEAgLTM3LDE0ICszNyw3IEBAIHN0YXRpYyBWZWN0b3I8 U3RyaW5nPiBnZXRGb250RGlyZWN0b3JpZXMoKQogewogICAgIFZlY3RvcjxTdHJpbmc+IGZvbnRE aXJQYXRoczsKIAotICAgIGZvbnREaXJQYXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2Zv bnRzL1RURi8iKSk7Ci0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUv Zm9udHMvdHJ1ZXR5cGUvdHRmLWxpYmVyYXRpb24vIikpOwotICAgIGZvbnREaXJQYXRocy5hcHBl bmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL2xpYmVyYXRpb24vIikpOwotICAgIGZvbnREaXJQ YXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1kZWphdnUv IikpOwotICAgIGZvbnREaXJQYXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL2Rl amF2dS8iKSk7Ci0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9u dHMvT1RGLyIpKTsgLy8gTWF0aE1MCi0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91 c3Ivc2hhcmUvZm9udHMvb3BlbnR5cGUvc3RpeC8iKSk7IC8vIE1hdGhNTAotICAgIGZvbnREaXJQ YXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL3N0aXgvIikpOyAvLyBNYXRoTUwK KyAgICBmb250RGlyUGF0aHMuYXBwZW5kKFN0cmluZyhET1dOTE9BREVEX0ZPTlRTX0RJUikpOwog CiAgICAgcmV0dXJuIGZvbnREaXJQYXRoczsKIH0K 132834 2012-03-20 08:41:44 -0700 2012-03-20 08:41:44 -0700 Diff of results before and after font change applied, r111388 preVsPost_Results_r111388.txt text/plain 8977 d-r LS0tIHdpdGhvdXRfZm9udF9jaGFuZ2UudHh0CTIwMTItMDMtMjAgMTY6Mjg6NDUuMTM1NzUxNTMy ICswMjAwCisrKyB3aXRoX2ZvbnRfY2hhbmdlLnR4dAkyMDEyLTAzLTIwIDE2OjI4OjM5LjI5NTc1 MTUwNyArMDIwMApAQCAtMSwxNCArMSwxNCBAQAotPT4gUmVzdWx0czogMTk0NzYvMjg3ODIgdGVz dHMgcGFzc2VkICg2Ny43JSkKKz0+IFJlc3VsdHM6IDE5NTQwLzI4NzgyIHRlc3RzIHBhc3NlZCAo NjcuOSUpCiAKLT0+IFRlc3RzIHRvIGJlIGZpeGVkICg5MzA2KToKKz0+IFRlc3RzIHRvIGJlIGZp eGVkICg5MjQyKToKICAgICAgIDEgY3Jhc2ggICAgICAgICAgICAgICAgICAgICggMC4wJSkKLSAg ICA1OTYgdGV4dCBkaWZmIG1pc21hdGNoICAgICAgICggNi40JSkKKyAgICA1MzIgdGV4dCBkaWZm IG1pc21hdGNoICAgICAgICggNS44JSkKICAgICAgMjIgaW1hZ2UgbWlzbWF0Y2ggICAgICAgICAg ICggMC4yJSkKLSAgIDg2ODcgc2tpcHBlZCAgICAgICAgICAgICAgICAgICg5My4zJSkKKyAgIDg2 ODcgc2tpcHBlZCAgICAgICAgICAgICAgICAgICg5NC4wJSkKIAogPT4gVGVzdHMgdGhhdCB3aWxs IG9ubHkgYmUgZml4ZWQgaWYgdGhleSBjcmFzaCAoV09OVEZJWCkgKDApOgogCi1FeHBlY3RlZCB0 byBmYWlsLCBidXQgcGFzc2VkOiAoMjkpCitFeHBlY3RlZCB0byBmYWlsLCBidXQgcGFzc2VkOiAo MzEpCiAgIGFuaW1hdGlvbnMvY29tYm8tdHJhbnNmb3JtLXRyYW5zbGF0ZStzY2FsZS5odG1sCiAg IGZhc3QvYmxvY2svZmxvYXQvc2hyaW5rLXRvLWF2b2lkLWZsb2F0LWNvbXBsZXhpdHkuaHRtbAog ICBmYXN0L2Jsb2NrL2xpbmVib3hjb250YWluL2Jsb2NrLWdseXBocy5odG1sCkBAIC0yOSw4ICsy OSwxMCBAQAogICBmYXN0L2Zvcm1zL251bWJlci9pbnB1dC1hcHBlYXJhbmNlLXNwaW5idXR0b24t ZGlzYWJsZWQtcmVhZG9ubHkuaHRtbAogICBmYXN0L2Zvcm1zL251bWJlci9pbnB1dC1hcHBlYXJh bmNlLXNwaW5idXR0b24tbGF5ZXIuaHRtbAogICBmYXN0L2Zvcm1zL3NlYXJjaC1kaXNwbGF5LW5v bmUtY2FuY2VsLWJ1dHRvbi5odG1sCisgIGZhc3QvZm9ybXMvc2VhcmNoLXJ0bC5odG1sCiAgIGZh c3QvZm9ybXMvc2VhcmNoLXZlcnRpY2FsLWFsaWdubWVudC5odG1sCiAgIGZhc3QvZm9ybXMvdGV4 dC1zdHlsZS1jb2xvci5odG1sCisgIGZhc3QvZm9ybXMvdmlzdWFsLWhlYnJldy10ZXh0LWZpZWxk Lmh0bWwKICAgZmFzdC9saXN0cy9keW5hbWljLW1hcmtlci1jcmFzaC5odG1sCiAgIGZhc3Qvb3Zl cmZsb3cvbGluZS1jbGFtcC5odG1sCiAgIGZhc3QvcmVwYWludC9pZnJhbWUtc2Nyb2xsLXJlcGFp bnQuaHRtbApAQCAtNDAsNyArNDIsNyBAQAogICBmYXN0L3RhYmxlL3NwYW5PdmVybGFwUmVwYWlu dC5odG1sCiAKIAotVW5leHBlY3RlZCBmbGFraW5lc3M6IHRleHQgZGlmZiBtaXNtYXRjaCAoMjcz KQorVW5leHBlY3RlZCBmbGFraW5lc3M6IHRleHQgZGlmZiBtaXNtYXRjaCAoMjIzKQogICBmYXN0 L2Nzcy9pbWFnZVRpbGVPcGFjaXR5Lmh0bWwgPSBURVhUIFBBU1MKICAgZmFzdC9jc3MvaW1wb3J0 LXJ1bGUtcmVncmVzc2lvbi0xMTU5MC5odG1sID0gVEVYVCBQQVNTCiAgIGZhc3QvY3NzL2ltcG9y dF93aXRoX2Jhc2V1cmwuaHRtbCA9IFRFWFQgUEFTUwpAQCAtODgsNiArOTAsNyBAQAogICBmYXN0 L2Nzcy9yZXNpemUtY29ybmVyLXRyYWNraW5nLXRyYW5zZm9ybWVkLmh0bWwgPSBURVhUIFBBU1MK ICAgZmFzdC9jc3MvcmVzaXplLWNvcm5lci10cmFja2luZy5odG1sID0gVEVYVCBQQVNTCiAgIGZh c3QvY3NzL3JnYi1mbG9hdC5odG1sID0gVEVYVCBQQVNTCisgIGZhc3QvY3NzL3J0bC1vcmRlcmlu Zy5odG1sID0gVEVYVCBQQVNTCiAgIGZhc3QvY3NzL3J0bC10by12aWV3cG9ydC5odG1sID0gVEVY VCBQQVNTCiAgIGZhc3QvY3NzL3NpbXBsZS1zZWxlY3Rvci1jaGFpbi1wYXJzaW5nLmh0bWwgPSBU RVhUIFBBU1MKICAgZmFzdC9jc3Mvc3R5bGUtb3V0c2lkZS1oZWFkLmh0bWwgPSBURVhUIFBBU1MK QEAgLTk2LDYgKzk5LDkgQEAKICAgZmFzdC9jc3MvdGFibGUtdGV4dC1hbGlnbi1zdHJpY3QuaHRt bCA9IFRFWFQgUEFTUwogICBmYXN0L2Nzcy90YXJnZXQtZnJhZ21lbnQtbWF0Y2guaHRtbCA9IFRF WFQgUEFTUwogICBmYXN0L2Nzcy90ZXh0LWFsaWduLmh0bWwgPSBURVhUIFBBU1MKKyAgZmFzdC9j c3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1iaWRpLmh0bWwgPSBURVhUIFBBU1MKKyAgZmFzdC9j c3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1zdHJpY3QuaHRtbCA9IFRFWFQgUEFTUworICBmYXN0 L2Nzcy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLmh0bWwgPSBURVhUIFBBU1MKICAgZmFzdC9jc3Mv dGV4dC1zZWN1cml0eS5odG1sID0gVEVYVCBQQVNTCiAgIGZhc3QvY3NzL3RleHQtdHJhbnNmb3Jt LXNlbGVjdC5odG1sID0gVEVYVCBQQVNTCiAgIGZhc3QvY3NzL3RleHRDYXBpdGFsaXplRWRnZUNh c2VzLmh0bWwgPSBURVhUIFBBU1MKQEAgLTI1Nyw2NiArMjYzLDEyIEBACiAgIGZhc3QvaW52YWxp ZC90YWJsZS1pbnNpZGUtc3RyYXktdGFibGUtY29udGVudC5odG1sID0gVEVYVCBQQVNTCiAgIGZh c3QvaW52YWxpZC90ZC1pbnNpZGUtb2JqZWN0Lmh0bWwgPSBURVhUIFBBU1MKICAgZmFzdC9qcy9z dGFjay10cmFjZS5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3JpdGluZy1tb2RlL2JhY2tncm91 bmQtaG9yaXpvbnRhbC1idC5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3JpdGluZy1tb2RlL2Jh Y2tncm91bmQtdmVydGljYWwtbHIuaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0L3dyaXRpbmctbW9k ZS9iYWNrZ3JvdW5kLXZlcnRpY2FsLXJsLmh0bWwgPSBURVhUIFBBU1MKLSAgZmFzdC93cml0aW5n LW1vZGUvYmFzaWMtdmVydGljYWwtbGluZS5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3JpdGlu Zy1tb2RlL2JvcmRlci1pbWFnZS1ob3Jpem9udGFsLWJ0Lmh0bWwgPSBURVhUIFBBU1MKLSAgZmFz dC93cml0aW5nLW1vZGUvYm9yZGVyLWltYWdlLXZlcnRpY2FsLWxyLmh0bWwgPSBURVhUIFBBU1MK LSAgZmFzdC93cml0aW5nLW1vZGUvYm9yZGVyLWltYWdlLXZlcnRpY2FsLXJsLmh0bWwgPSBURVhU IFBBU1MKLSAgZmFzdC93cml0aW5nLW1vZGUvYm9yZGVyLXJhZGl1cy1jbGlwcGluZy12ZXJ0aWNh bC1sci5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3JpdGluZy1tb2RlL2JvcmRlci1zdHlsZXMt dmVydGljYWwtbHIuaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0L3dyaXRpbmctbW9kZS9ib3JkZXIt c3R5bGVzLXZlcnRpY2FsLXJsLmh0bWwgPSBURVhUIFBBU1MKLSAgZmFzdC93cml0aW5nLW1vZGUv Ym94LXNoYWRvdy1ob3Jpem9udGFsLWJ0Lmh0bWwgPSBURVhUIFBBU1MKLSAgZmFzdC93cml0aW5n LW1vZGUvYm94LXNoYWRvdy12ZXJ0aWNhbC1sci5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3Jp dGluZy1tb2RlL2JveC1zaGFkb3ctdmVydGljYWwtcmwuaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0 L3dyaXRpbmctbW9kZS9icm9rZW4taWRlb2dyYXBoLXNtYWxsLWNhcHMuaHRtbCA9IFRFWFQgUEFT UwotICBmYXN0L3dyaXRpbmctbW9kZS9icm9rZW4taWRlb2dyYXBoaWMtZm9udC5odG1sID0gVEVY VCBQQVNTCi0gIGZhc3Qvd3JpdGluZy1tb2RlL2VuZ2xpc2gtYnQtdGV4dC5odG1sID0gVEVYVCBQ QVNTCi0gIGZhc3Qvd3JpdGluZy1tb2RlL2VuZ2xpc2gtbHItdGV4dC5odG1sID0gVEVYVCBQQVNT Ci0gIGZhc3Qvd3JpdGluZy1tb2RlL2VuZ2xpc2gtcmwtdGV4dC5odG1sID0gVEVYVCBQQVNTCi0g IGZhc3Qvd3JpdGluZy1tb2RlL2ZpZWxkc2V0cy5odG1sID0gVEVYVCBQQVNTCi0gIGZhc3Qvd3Jp dGluZy1tb2RlL2hvcml6b250YWwtYnQtcmVwbGFjZWQtc2VsZWN0aW9uLmh0bWwgPSBURVhUIFBB U1MKLSAgZmFzdC93cml0aW5nLW1vZGUvbWFyZ2luLWNvbGxhcHNlLmh0bWwgPSBURVhUIFBBU1MK LSAgZmFzdC93cml0aW5nLW1vZGUvdmVydGljYWwtYWxpZ24tdGFibGUtYmFzZWxpbmUuaHRtbCA9 IFRFWFQgUEFTUwotICBmYXN0L3dyaXRpbmctbW9kZS92ZXJ0aWNhbC1iYXNlbGluZS1hbGlnbm1l bnQuaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0L3dyaXRpbmctbW9kZS92ZXJ0aWNhbC1sci1yZXBs YWNlZC1zZWxlY3Rpb24uaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0L3dyaXRpbmctbW9kZS92ZXJ0 aWNhbC1ybC1yZXBsYWNlZC1zZWxlY3Rpb24uaHRtbCA9IFRFWFQgUEFTUwotICBmYXN0L3hzbC9k b2N1bWVudC1mdW5jdGlvbi54bWwgPSBURVhUIFBBU1MKLSAgZmFzdC94c2wveHNsdC1lbmMtY3ly LnhtbCA9IFRFWFQgUEFTUwotICBmYXN0L3hzbC94c2x0LWVuYy54bWwgPSBURVhUIFBBU1MKLSAg ZmFzdC94c2wveHNsdC1lbmMxNi54bWwgPSBURVhUIFBBU1MKLSAgZmFzdC94c2wveHNsdC1lbmMx NnRvMTYueG1sID0gVEVYVCBQQVNTCi0gIGZhc3QveHNsL3hzbHQtZW50aXR5LnhtbCA9IFRFWFQg UEFTUwotICBmYXN0L3hzbC94c2x0LWV4dHJhLWNvbnRlbnQtYXQtZW5kLnhtbCA9IFRFWFQgUEFT UwotICBmYXN0L3hzbC94c2x0LWltcG9ydC1kZXB0aC54bWwgPSBURVhUIFBBU1MKLSAgZmFzdC94 c2wveHNsdC1taXNzaW5nLW5hbWVzcGFjZS1pbi14c2x0LnhtbCA9IFRFWFQgUEFTUwotICBmYXN0 L3hzbC94c2x0LXJlbGF0aXZlLXBhdGgueG1sID0gVEVYVCBQQVNTCi0gIGZhc3QveHNsL3hzbHRf dW5pY29kZS54bWwgPSBURVhUIFBBU1MKLSAgc3ZnL2FzLWJhY2tncm91bmQtaW1hZ2UvYW5pbWF0 ZWQtc3ZnLWFzLWJhY2tncm91bmQuaHRtbCA9IFRFWFQgUEFTUwotICBzdmcvYXMtYmFja2dyb3Vu ZC1pbWFnZS9iYWNrZ3JvdW5kLWltYWdlLXByZXNlcnZlYXNwZWN0UmF0aW8tc3VwcG9ydC5odG1s ID0gVEVYVCBQQVNTCi0gIHN2Zy9hcy1iYWNrZ3JvdW5kLWltYWdlL3N2Zy1hcy1iYWNrZ3JvdW5k LTEuaHRtbCA9IFRFWFQgUEFTUwotICBzdmcvYXMtYmFja2dyb3VuZC1pbWFnZS9zdmctYXMtYmFj a2dyb3VuZC0yLmh0bWwgPSBURVhUIFBBU1MKLSAgc3ZnL2FzLWJhY2tncm91bmQtaW1hZ2Uvc3Zn LWFzLWJhY2tncm91bmQtMy5odG1sID0gVEVYVCBQQVNTCi0gIHN2Zy9hcy1iYWNrZ3JvdW5kLWlt YWdlL3N2Zy1hcy1iYWNrZ3JvdW5kLTQuaHRtbCA9IFRFWFQgUEFTUwotICBzdmcvYXMtYmFja2dy b3VuZC1pbWFnZS9zdmctYXMtYmFja2dyb3VuZC01Lmh0bWwgPSBURVhUIFBBU1MKLSAgc3ZnL2Fz LWJhY2tncm91bmQtaW1hZ2Uvc3ZnLWFzLWJhY2tncm91bmQtNi5odG1sID0gVEVYVCBQQVNTCi0g IHN2Zy9hcy1iYWNrZ3JvdW5kLWltYWdlL3N2Zy1hcy1iYWNrZ3JvdW5kLXdpdGgtcmVsYXRpdmUt c2l6ZS5odG1sID0gVEVYVCBQQVNTCi0gIHN2Zy9hcy1iYWNrZ3JvdW5kLWltYWdlL3N2Zy1hcy1i YWNrZ3JvdW5kLXdpdGgtdmlld0JveC5odG1sID0gVEVYVCBQQVNTCi0gIHN2Zy9hcy1iYWNrZ3Jv dW5kLWltYWdlL3N2Zy1hcy1iYWNrZ3JvdW5kLmh0bWwgPSBURVhUIFBBU1MKLSAgc3ZnL2FzLWJh Y2tncm91bmQtaW1hZ2Uvc3ZnLWFzLXRpbGVkLWJhY2tncm91bmQuaHRtbCA9IFRFWFQgUEFTUwot ICBzdmcvYXMtYmFja2dyb3VuZC1pbWFnZS9zdmctYmFja2dyb3VuZC1wYXJ0aWFsLXJlZHJhdy5o dG1sID0gVEVYVCBQQVNTCi0gIHN2Zy9hcy1iYWNrZ3JvdW5kLWltYWdlL3N2Zy13aWR0aC0xMDBw LWFzLWJhY2tncm91bmQuaHRtbCA9IFRFWFQgUEFTUwotICB0cmFuc2Zvcm1zLzJkL2NvbXBvdW5k LXRyYW5zZm9ybXMtdnMtY29udGFpbmVycy5odG1sID0gVEVYVCBQQVNTCi0gIHRyYW5zZm9ybXMv MmQvaGluZGktcm90YXRlZC5odG1sID0gVEVYVCBQQVNTCi0gIHRyYW5zZm9ybXMvMmQvdHJhbnNm b3JtLTJkLmh0bWwgPSBURVhUIFBBU1MKLSAgdHJhbnNmb3Jtcy8yZC90cmFuc2Zvcm0tYm9yZGVy Ym94Lmh0bWwgPSBURVhUIFBBU1MKLSAgdHJhbnNmb3Jtcy8yZC90cmFuc2Zvcm0tZml4ZWQtY29u dGFpbmVyLmh0bWwgPSBURVhUIFBBU1MKLSAgdHJhbnNmb3Jtcy8yZC90cmFuc2Zvcm0tb3JpZ2lu LWJvcmRlcmJveC5odG1sID0gVEVYVCBQQVNTCi0gIHRyYW5zZm9ybXMvMmQvem9vbS1tZW51bGlz dC5odG1sID0gVEVYVCBQQVNTCisgIHRyYW5zaXRpb25zL2ZvbnQtZmFtaWx5LWR1cmluZy10cmFu c2l0aW9uLmh0bWwgPSBURVhUIFBBU1MKKyAgdHJhbnNpdGlvbnMvdHJhbnNpdGlvbi1oaXQtdGVz dC10cmFuc2Zvcm0uaHRtbCA9IFRFWFQgUEFTUworICB0cmFuc2l0aW9ucy90cmFuc2l0aW9uLWhp dC10ZXN0Lmh0bWwgPSBURVhUIFBBU1MKIAogCi1SZWdyZXNzaW9uczogVW5leHBlY3RlZCB0ZXh0 IGRpZmYgbWlzbWF0Y2ggOiAoMjUxKQorUmVncmVzc2lvbnM6IFVuZXhwZWN0ZWQgdGV4dCBkaWZm IG1pc21hdGNoIDogKDIzOSkKICAgY3NzMS9ib3hfcHJvcGVydGllcy9jbGVhcl9mbG9hdC5odG1s ID0gVEVYVAogICBjc3MxL2JveF9wcm9wZXJ0aWVzL2Zsb2F0X29uX3RleHRfZWxlbWVudHMuaHRt bCA9IFRFWFQKICAgY3NzMS9mb250X3Byb3BlcnRpZXMvZm9udF9zaXplLmh0bWwgPSBURVhUCkBA IC0zNDgsNyArMzAwLDYgQEAKICAgY3NzMy9zZWxlY3RvcnMzL3htbC9jc3MzLW1vZHNlbC0zOWEu eG1sID0gVEVYVAogICBjc3MzL3NlbGVjdG9yczMveG1sL2NzczMtbW9kc2VsLTM5Yi54bWwgPSBU RVhUCiAgIGNzczMvc2VsZWN0b3JzMy94bWwvY3NzMy1tb2RzZWwtMzljLnhtbCA9IFRFWFQKLSAg Y3NzMy91bmljb2RlLWJpZGktaXNvbGF0ZS1iYXNpYy5odG1sID0gVEVYVAogICBkb20veGh0bWwv bGV2ZWwzL2NvcmUvbm9kZXJlcGxhY2VjaGlsZDMwLnhodG1sID0gVEVYVAogICBlZGl0aW5nL2lu cHV0L3Bhc3RlLXRleHQtZW5kaW5nLXdpdGgtaW50ZXJjaGFuZ2UtbmV3bGluZS5odG1sID0gVEVY VAogICBlZGl0aW5nL2lucHV0L3JldmVhbC1jb250ZW50ZWRpdGFibGUtb24tcGFzdGUtdmVydGlj YWxseS5odG1sID0gVEVYVApAQCAtMzY5LDkgKzMyMCw2IEBACiAgIGZhc3QvYmxvY2svcG9zaXRp b25pbmcvMDUxLmh0bWwgPSBURVhUCiAgIGZhc3QvYmxvY2svcG9zaXRpb25pbmcvMDU2Lmh0bWwg PSBURVhUCiAgIGZhc3QvYmxvY2svcG9zaXRpb25pbmcvcmVwbGFjZWQtaW5zaWRlLWZpeGVkLXRv cC1ib3R0b20uaHRtbCA9IFRFWFQKLSAgZmFzdC9ib3JkZXJzL2JpZGktMDEyLmh0bWwgPSBURVhU Ci0gIGZhc3QvYm9yZGVycy9ydGwtYm9yZGVyLTA0Lmh0bWwgPSBURVhUCi0gIGZhc3QvYm9yZGVy cy9ydGwtYm9yZGVyLTA1Lmh0bWwgPSBURVhUCiAgIGZhc3QvYm94LXNoYWRvdy9iYXNpYy1zaGFk b3dzLmh0bWwgPSBURVhUCiAgIGZhc3QvYm94LXNpemluZy9ib3gtc2l6aW5nLmh0bWwgPSBURVhU CiAgIGZhc3QvY2FudmFzL2NhbnZhcy10b0RhdGFVUkwtd2VicC5odG1sID0gVEVYVApAQCAtNDEw LDE0ICszNTgsOSBAQAogICBmYXN0L2Nzcy9pbnZhbGlkYXRpb24tZXJyb3JzLTMuaHRtbCA9IFRF WFQKICAgZmFzdC9jc3MvcGVyY2VudGFnZS1ub24taW50ZWdlci5odG1sID0gVEVYVAogICBmYXN0 L2Nzcy9wc2V1ZG8tZmlyc3QtbGluZS1ib3JkZXItd2lkdGguaHRtbCA9IFRFWFQKLSAgZmFzdC9j c3MvcnRsLW9yZGVyaW5nLmh0bWwgPSBURVhUCiAgIGZhc3QvY3NzL3NlbGVjdG9yLXNldC1hdHRy aWJ1dGUuaHRtbCA9IFRFWFQKLSAgZmFzdC9jc3MvdGV4dC1vdmVyZmxvdy1lbGxpcHNpcy1iaWRp Lmh0bWwgPSBURVhUCi0gIGZhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMtc3RyaWN0Lmh0 bWwgPSBURVhUCi0gIGZhc3QvY3NzL3RleHQtb3ZlcmZsb3ctZWxsaXBzaXMuaHRtbCA9IFRFWFQK ICAgZmFzdC9jc3MvdHJhbnNmb3JtLWRlZmF1bHQtcGFyYW1ldGVyLmh0bWwgPSBURVhUCiAgIGZh c3QvY3NzL3pvb20tZm9udC1zaXplLmh0bWwgPSBURVhUCi0gIGZhc3QvZG9tLzM0MTc2Lmh0bWwg PSBURVhUCiAgIGZhc3QvZG9tL0RPTVVSTC9jaGVjay1pbnN0YW5jZW9mLWRvbXVybC1mdW5jdGlv bnMuaHRtbCA9IFRFWFQKICAgZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1ib3VuZGFy eS12YWx1ZXMuaHRtbCA9IFRFWFQKICAgZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1v cHRpbXVtcy5odG1sID0gVEVYVApAQCAtNDY3LDcgKzQxMCw2IEBACiAgIGZhc3QvZm9ybXMvZmls ZS9yZWNvdmVyLWZpbGUtaW5wdXQtaW4tdW5wb3N0ZWQtZm9ybS5odG1sID0gVEVYVAogICBmYXN0 L2Zvcm1zL2lucHV0LWxpdmUtcHNldWRvLXNlbGVjdG9ycy5odG1sID0gVEVYVAogICBmYXN0L2Zv cm1zL2xlZ2VuZC1hY2Nlc3Mta2V5Lmh0bWwgPSBURVhUCi0gIGZhc3QvZm9ybXMvbGlzdGJveC1i aWRpLWFsaWduLmh0bWwgPSBURVhUCiAgIGZhc3QvZm9ybXMvbGlzdGJveC10eXBlYWhlYWQtY3ly aWxsaWMuaHRtbCA9IFRFWFQKICAgZmFzdC9mb3Jtcy9saXN0Ym94LXR5cGVhaGVhZC1ncmVlay5o dG1sID0gVEVYVAogICBmYXN0L2Zvcm1zL2xpc3Rib3gtdHlwZWFoZWFkLXNjcm9sbC5odG1sID0g VEVYVApAQCAtNDc4LDggKzQyMCw2IEBACiAgIGZhc3QvZm9ybXMvc2VsZWN0LWFjY2Vzc2tleS5o dG1sID0gVEVYVAogICBmYXN0L2Zvcm1zL3NlbGVjdC1zY3JpcHQtb25jaGFuZ2UuaHRtbCA9IFRF WFQKICAgZmFzdC9mb3Jtcy9zZWxlY3QtdHlwZS1haGVhZC1ub24tbGF0aW4uaHRtbCA9IFRFWFQK LSAgZmFzdC9mb3Jtcy9zZWxlY3QtdmlzdWFsLWhlYnJldy5odG1sID0gVEVYVAotICBmYXN0L2Zv cm1zL3NlbGVjdC13cml0aW5nLWRpcmVjdGlvbi1uYXR1cmFsLmh0bWwgPSBURVhUCiAgIGZhc3Qv Zm9ybXMvc2VsZWN0L21lbnVsaXN0LXR5cGUtYWhlYWQtZmluZC5odG1sID0gVEVYVAogICBmYXN0 L2Zvcm1zL3RleHQtaW5wdXQtZXZlbnQuaHRtbCA9IFRFWFQKICAgZmFzdC9mb3Jtcy90ZXh0YXJl YS1pbnB1dC1ldmVudC5odG1sID0gVEVYVApAQCAtNTk2LDMgKzUzNiw0IEBACiBSZWdyZXNzaW9u czogVW5leHBlY3RlZCBjcmFzaGVzIDogKDEpCiAgIGZhc3QvZG9tL25hdmlnYXRvci1kZXRhY2hl ZC1uby1jcmFzaC5odG1sID0gQ1JBU0gKIAorCg== 132995 2012-03-21 01:55:58 -0700 2012-03-21 12:48:15 -0700 Use downloaded fonts, simplify FontManagement.cpp bug81507_v2.patch text/plain 4128 d-r ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkNjM3 ZjkzLi4zYmM3NDI3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDMtMjEgIERvbWluaWsgUsO2dHRzY2hlcyAg PGRvbWluaWsucm90dHNjaGVzQGxpbnV4LmludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBVc2Ug amhidWlsZCBkb3dubG9hZGVkIGZvbnRzIGluc3RlYWQgb2YgaGFyZGNvZGVkIHN5c3RlbSBmb250 IHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MTUwNworCisgICAgICAgIE5vdyB0aGF0IHdlJ3JlIG9ubHkgbG9hZGluZyBmcm9tIG9uZSBkaXJl Y3RvcnksIG5vIG5lZWQgdG8KKyAgICAgICAgaXRlcmF0ZSBvdmVyIGEgbGlzdCBvZiBkaXJlY3Rv cmllcyBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlzdHMudHh0OgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHA6CisgICAgICAgIChhZGRGb250RGly ZWN0b3J5KToKKyAgICAgICAgKGFkZEZvbnRzVG9FbnZpcm9ubWVudCk6CisKIDIwMTItMDMtMjAg IEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUgd3RmL1BsYXRm b3JtLmggZnJvbSBKYXZhU2NyaXB0Q29yZSB0byBTb3VyY2UvV1RGL3d0ZgpkaWZmIC0tZ2l0IGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlzdHMudHh0IGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvZWZsL0NNYWtlTGlzdHMudHh0CmluZGV4IGNhYmU0Y2YuLjI5YWU1ZjYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9DTWFrZUxpc3RzLnR4dAorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9lZmwvQ01ha2VMaXN0cy50eHQKQEAgLTEwOSw2ICsxMDksNyBAQCBTRVQo RHVtcFJlbmRlclRyZWVfTElOS19GTEFHUwogKQogCiBBRERfREVGSU5JVElPTlMoLURGT05UU19D T05GX0RJUj0iJHtUT09MU19ESVJ9L0R1bXBSZW5kZXJUcmVlL2d0ay9mb250cyIKKyAgICAgICAg ICAgICAgICAtRERPV05MT0FERURfRk9OVFNfRElSPSIke0NNQUtFX0JJTkFSWV9ESVJ9Ly4uL0Rl cGVuZGVuY2llcy9Tb3VyY2Uvd2Via2l0Z3RrLXRlc3QtZm9udHMtMC4wLjEiCiAgICAgICAgICAg ICAgICAgLUREQVRBX0RJUj0iJHtUSEVNRV9CSU5BUllfRElSfSIpCiAKIElOQ0xVREVfRElSRUNU T1JJRVMoJHtEdW1wUmVuZGVyVHJlZV9JTkNMVURFX0RJUkVDVE9SSUVTfSkKZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCmluZGV4IDRjZjJmYjYuLmEwZjJjZWYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcApAQCAtMzMs MjIgKzMzLDYgQEAKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CiAKLXN0YXRpYyBWZWN0b3I8U3RyaW5nPiBnZXRGb250RGlyZWN0 b3JpZXMoKQotewotICAgIFZlY3RvcjxTdHJpbmc+IGZvbnREaXJQYXRoczsKLQotICAgIGZvbnRE aXJQYXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL1RURi8iKSk7Ci0gICAgZm9u dERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWxp YmVyYXRpb24vIikpOwotICAgIGZvbnREaXJQYXRocy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJl L2ZvbnRzL2xpYmVyYXRpb24vIikpOwotICAgIGZvbnREaXJQYXRocy5hcHBlbmQoU3RyaW5nKCIv dXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1kZWphdnUvIikpOwotICAgIGZvbnREaXJQYXRo cy5hcHBlbmQoU3RyaW5nKCIvdXNyL3NoYXJlL2ZvbnRzL2RlamF2dS8iKSk7Ci0gICAgZm9udERp clBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvT1RGLyIpKTsgLy8gTWF0aE1M Ci0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvb3BlbnR5 cGUvc3RpeC8iKSk7IC8vIE1hdGhNTAotICAgIGZvbnREaXJQYXRocy5hcHBlbmQoU3RyaW5nKCIv dXNyL3NoYXJlL2ZvbnRzL3N0aXgvIikpOyAvLyBNYXRoTUwKLQotICAgIHJldHVybiBmb250RGly UGF0aHM7Ci19Ci0KIHN0YXRpYyBWZWN0b3I8U3RyaW5nPiBnZXRGb250RmlsZXMoKQogewogICAg IFZlY3RvcjxTdHJpbmc+IGZvbnRGaWxlUGF0aHM7CkBAIC02OSwyNiArNTMsMTcgQEAgc3RhdGlj IFZlY3RvcjxTdHJpbmc+IGdldEZvbnRGaWxlcygpCiAgICAgcmV0dXJuIGZvbnRGaWxlUGF0aHM7 CiB9CiAKLXN0YXRpYyBzaXplX3QgYWRkRm9udERpcmVjdG9yaWVzKGNvbnN0IFZlY3RvcjxTdHJp bmc+JiBmb250RGlyZWN0b3JpZXMsIEZjQ29uZmlnKiBjb25maWcpCitzdGF0aWMgYm9vbCBhZGRG b250RGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgZm9udERpcmVjdG9yeSwgRmNDb25maWcqIGNvbmZp ZykKIHsKLSAgICBzaXplX3QgYWRkZWREaXJlY3RvcmllcyA9IDA7CisgICAgY29uc3QgQ1N0cmlu ZyBkaXJlY3RvcnkgPSBmb250RGlyZWN0b3J5LnV0ZjgoKTsKKyAgICBjb25zdCBjaGFyKiBwYXRo ID0gZGlyZWN0b3J5LmRhdGEoKTsKIAotICAgIGZvciAoVmVjdG9yPFN0cmluZz46OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gZm9udERpcmVjdG9yaWVzLmJlZ2luKCk7Ci0gICAgICAgICBpdCAhPSBmb250 RGlyZWN0b3JpZXMuZW5kKCk7ICsraXQpIHsKLSAgICAgICAgY29uc3QgQ1N0cmluZyBjdXJyZW50 RGlyZWN0b3J5ID0gKCppdCkudXRmOCgpOwotICAgICAgICBjb25zdCBjaGFyKiBwYXRoID0gY3Vy cmVudERpcmVjdG9yeS5kYXRhKCk7Ci0KLSAgICAgICAgaWYgKGVjb3JlX2ZpbGVfaXNfZGlyKHBh dGgpKSB7Ci0gICAgICAgICAgICBpZiAoIUZjQ29uZmlnQXBwRm9udEFkZERpcihjb25maWcsIHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KHBhdGgpKSkgewotICAgICAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAiQ291bGQgbm90IGxvYWQgZm9udCBhdCAlcyFcbiIsIHBhdGgpOwot ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAr K2FkZGVkRGlyZWN0b3JpZXM7Ci0gICAgICAgIH0KKyAgICBpZiAoIWVjb3JlX2ZpbGVfaXNfZGly KHBhdGgpCisgICAgICAgIHx8ICFGY0NvbmZpZ0FwcEZvbnRBZGREaXIoY29uZmlnLCByZWludGVy cHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgqPihwYXRoKSkpIHsKKyAgICAgICAgZnByaW50ZihzdGRl cnIsICJDb3VsZCBub3QgYWRkIGZvbnQgZGlyZWN0b3J5ICVzIVxuIiwgcGF0aCk7CisgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9Ci0KLSAgICByZXR1cm4gYWRkZWREaXJlY3RvcmllczsKKyAg ICByZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGljIHZvaWQgYWRkRm9udEZpbGVzKGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBmb250RmlsZXMsIEZjQ29uZmlnKiBjb25maWcpCkBAIC0xMTUsNyArOTAsNyBA QCB2b2lkIGFkZEZvbnRzVG9FbnZpcm9ubWVudCgpCiAgICAgICAgIGV4aXQoMSk7CiAgICAgfQog Ci0gICAgaWYgKCFhZGRGb250RGlyZWN0b3JpZXMoZ2V0Rm9udERpcmVjdG9yaWVzKCksIGNvbmZp ZykpIHsKKyAgICBpZiAoIWFkZEZvbnREaXJlY3RvcnkoU3RyaW5nKERPV05MT0FERURfRk9OVFNf RElSKSwgY29uZmlnKSkgewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIk5vbmUgb2YgdGhlIGZv bnQgZGlyZWN0b3JpZXMgY291bGQgYmUgYWRkZWQuIEVpdGhlciBpbnN0YWxsIHRoZW0gIgogICAg ICAgICAgICAgICAgICAgICAgICAgIm9yIGZpbGUgYSBidWcgYXQgaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZyBpZiB0aGV5IGFyZSBpbnN0YWxsZWQgaW4gIgogICAgICAgICAgICAgICAgICAgICAgICAg ImFub3RoZXIgbG9jYXRpb24uXG4iKTsK 133099 2012-03-21 12:48:15 -0700 2012-03-21 13:24:25 -0700 Use downloaded fonts, simplify FontManagement.cpp, CString bug81507_v3.patch text/plain 4089 d-r ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNjkz Zjg5Li5jZmM1NTc5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDMtMjEgIERvbWluaWsgUsO2dHRzY2hlcyAg PGRvbWluaWsucm90dHNjaGVzQGxpbnV4LmludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBVc2Ug amhidWlsZCBkb3dubG9hZGVkIGZvbnRzIGluc3RlYWQgb2YgaGFyZGNvZGVkIHN5c3RlbSBmb250 IHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MTUwNworCisgICAgICAgIE5vdyB0aGF0IHdlJ3JlIG9ubHkgbG9hZGluZyBmcm9tIG9uZSBkaXJl Y3RvcnksIG5vIG5lZWQgdG8KKyAgICAgICAgaXRlcmF0ZSBvdmVyIGEgbGlzdCBvZiBkaXJlY3Rv cmllcyBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlzdHMudHh0OgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHA6CisgICAgICAgIChhZGRGb250RGly ZWN0b3J5KToKKyAgICAgICAgKGFkZEZvbnRzVG9FbnZpcm9ubWVudCk6CisKIDIwMTItMDMtMjEg IFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtNYWNdIHJh bmxpYiBzZWdmYXVsdHMgd2hlbiBjcmVhdGluZyBzeW1ib2wgdGFibGVzIGZvciBsaWJXZWJDb3Jl LmEuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvQ01ha2VMaXN0cy50eHQg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvQ01ha2VMaXN0cy50eHQKaW5kZXggY2FiZTRjZi4u MjlhZTVmNiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0NNYWtlTGlzdHMu dHh0CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9DTWFrZUxpc3RzLnR4dApAQCAtMTA5 LDYgKzEwOSw3IEBAIFNFVChEdW1wUmVuZGVyVHJlZV9MSU5LX0ZMQUdTCiApCiAKIEFERF9ERUZJ TklUSU9OUygtREZPTlRTX0NPTkZfRElSPSIke1RPT0xTX0RJUn0vRHVtcFJlbmRlclRyZWUvZ3Rr L2ZvbnRzIgorICAgICAgICAgICAgICAgIC1ERE9XTkxPQURFRF9GT05UU19ESVI9IiR7Q01BS0Vf QklOQVJZX0RJUn0vLi4vRGVwZW5kZW5jaWVzL1NvdXJjZS93ZWJraXRndGstdGVzdC1mb250cy0w LjAuMSIKICAgICAgICAgICAgICAgICAtRERBVEFfRElSPSIke1RIRU1FX0JJTkFSWV9ESVJ9IikK IAogSU5DTFVERV9ESVJFQ1RPUklFUygke0R1bXBSZW5kZXJUcmVlX0lOQ0xVREVfRElSRUNUT1JJ RVN9KQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0ZvbnRNYW5hZ2VtZW50 LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9Gb250TWFuYWdlbWVudC5jcHAKaW5kZXgg NGNmMmZiNi4uZGNkNDI1MyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0Zv bnRNYW5hZ2VtZW50LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRm9udE1hbmFn ZW1lbnQuY3BwCkBAIC0zMywyMiArMzMsNiBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAotc3RhdGljIFZlY3RvcjxTdHJp bmc+IGdldEZvbnREaXJlY3RvcmllcygpCi17Ci0gICAgVmVjdG9yPFN0cmluZz4gZm9udERpclBh dGhzOwotCi0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMv VFRGLyIpKTsKLSAgICBmb250RGlyUGF0aHMuYXBwZW5kKFN0cmluZygiL3Vzci9zaGFyZS9mb250 cy90cnVldHlwZS90dGYtbGliZXJhdGlvbi8iKSk7Ci0gICAgZm9udERpclBhdGhzLmFwcGVuZChT dHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvbGliZXJhdGlvbi8iKSk7Ci0gICAgZm9udERpclBhdGhz LmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWRlamF2dS8iKSk7 Ci0gICAgZm9udERpclBhdGhzLmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvZGVqYXZ1 LyIpKTsKLSAgICBmb250RGlyUGF0aHMuYXBwZW5kKFN0cmluZygiL3Vzci9zaGFyZS9mb250cy9P VEYvIikpOyAvLyBNYXRoTUwKLSAgICBmb250RGlyUGF0aHMuYXBwZW5kKFN0cmluZygiL3Vzci9z aGFyZS9mb250cy9vcGVudHlwZS9zdGl4LyIpKTsgLy8gTWF0aE1MCi0gICAgZm9udERpclBhdGhz LmFwcGVuZChTdHJpbmcoIi91c3Ivc2hhcmUvZm9udHMvc3RpeC8iKSk7IC8vIE1hdGhNTAotCi0g ICAgcmV0dXJuIGZvbnREaXJQYXRoczsKLX0KLQogc3RhdGljIFZlY3RvcjxTdHJpbmc+IGdldEZv bnRGaWxlcygpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4gZm9udEZpbGVQYXRoczsKQEAgLTY5LDI2 ICs1MywxNiBAQCBzdGF0aWMgVmVjdG9yPFN0cmluZz4gZ2V0Rm9udEZpbGVzKCkKICAgICByZXR1 cm4gZm9udEZpbGVQYXRoczsKIH0KIAotc3RhdGljIHNpemVfdCBhZGRGb250RGlyZWN0b3JpZXMo Y29uc3QgVmVjdG9yPFN0cmluZz4mIGZvbnREaXJlY3RvcmllcywgRmNDb25maWcqIGNvbmZpZykK K3N0YXRpYyBib29sIGFkZEZvbnREaXJlY3RvcnkoY29uc3QgQ1N0cmluZyYgZm9udERpcmVjdG9y eSwgRmNDb25maWcqIGNvbmZpZykKIHsKLSAgICBzaXplX3QgYWRkZWREaXJlY3RvcmllcyA9IDA7 CisgICAgY29uc3QgY2hhciogcGF0aCA9IGZvbnREaXJlY3RvcnkuZGF0YSgpOwogCi0gICAgZm9y IChWZWN0b3I8U3RyaW5nPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBmb250RGlyZWN0b3JpZXMuYmVn aW4oKTsKLSAgICAgICAgIGl0ICE9IGZvbnREaXJlY3Rvcmllcy5lbmQoKTsgKytpdCkgewotICAg ICAgICBjb25zdCBDU3RyaW5nIGN1cnJlbnREaXJlY3RvcnkgPSAoKml0KS51dGY4KCk7Ci0gICAg ICAgIGNvbnN0IGNoYXIqIHBhdGggPSBjdXJyZW50RGlyZWN0b3J5LmRhdGEoKTsKLQotICAgICAg ICBpZiAoZWNvcmVfZmlsZV9pc19kaXIocGF0aCkpIHsKLSAgICAgICAgICAgIGlmICghRmNDb25m aWdBcHBGb250QWRkRGlyKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4o cGF0aCkpKSB7Ci0gICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJDb3VsZCBub3QgbG9h ZCBmb250IGF0ICVzIVxuIiwgcGF0aCk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgICsrYWRkZWREaXJlY3RvcmllczsKLSAgICAgICAgfQor ICAgIGlmICghZWNvcmVfZmlsZV9pc19kaXIocGF0aCkKKyAgICAgICAgfHwgIUZjQ29uZmlnQXBw Rm9udEFkZERpcihjb25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KHBhdGgp KSkgeworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkNvdWxkIG5vdCBhZGQgZm9udCBkaXJlY3Rv cnkgJXMhXG4iLCBwYXRoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQotICAgIHJl dHVybiBhZGRlZERpcmVjdG9yaWVzOworICAgIHJldHVybiB0cnVlOwogfQogCiBzdGF0aWMgdm9p ZCBhZGRGb250RmlsZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZvbnRGaWxlcywgRmNDb25maWcq IGNvbmZpZykKQEAgLTExNSw3ICs4OSw3IEBAIHZvaWQgYWRkRm9udHNUb0Vudmlyb25tZW50KCkK ICAgICAgICAgZXhpdCgxKTsKICAgICB9CiAKLSAgICBpZiAoIWFkZEZvbnREaXJlY3Rvcmllcyhn ZXRGb250RGlyZWN0b3JpZXMoKSwgY29uZmlnKSkgeworICAgIGlmICghYWRkRm9udERpcmVjdG9y eShET1dOTE9BREVEX0ZPTlRTX0RJUiwgY29uZmlnKSkgewogICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIk5vbmUgb2YgdGhlIGZvbnQgZGlyZWN0b3JpZXMgY291bGQgYmUgYWRkZWQuIEVpdGhlciBp bnN0YWxsIHRoZW0gIgogICAgICAgICAgICAgICAgICAgICAgICAgIm9yIGZpbGUgYSBidWcgYXQg aHR0cDovL2J1Z3Mud2Via2l0Lm9yZyBpZiB0aGV5IGFyZSBpbnN0YWxsZWQgaW4gIgogICAgICAg ICAgICAgICAgICAgICAgICAgImFub3RoZXIgbG9jYXRpb24uXG4iKTsK