89437 2012-06-18 23:50:43 -0700 [GTK] Read fonts path when running layout tests from alternative fonts dir when main dir doesn't exist 2012-07-02 09:11:08 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned abarth dpranke gustavo mrobinson ojan pnormand webkit.review.bot oldest_to_newest 652113 0 cgarcia 2012-06-18 23:50:43 -0700 This would allow to use DRT with the fonts installed in any place. 652118 1 148267 cgarcia 2012-06-18 23:53:57 -0700 Created attachment 148267 Patch 653858 2 148267 pnormand 2012-06-20 13:50:58 -0700 Comment on attachment 148267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148267&action=review Looks good. Can you please also update the relevant wiki page? Thanks! > Tools/Scripts/webkitpy/layout_tests/port/gtk.py:68 > + if os.environ.get('WEBKIT_TEST_FONTS_PATH'): > + environment['WEBKIT_TEST_FONTS_PATH'] = os.environ['WEBKIT_TEST_FONTS_PATH'] This can be one line environment['WEBKIT_TEST_FONTS_PATH'] = os.environ.get('WEBKIT_TEST_FONTS_PATH','') 653864 3 mrobinson 2012-06-20 13:57:44 -0700 I think Carlos and I agreed that instead of an environment variable we should just look for fonts in an alternate location. 653865 4 pnormand 2012-06-20 14:00:12 -0700 Oh, ok I didn't know about that. Might have been a good idea to comment on the bug and/or pull the patch out :) 661368 5 150391 cgarcia 2012-07-02 03:38:23 -0700 Created attachment 150391 Updated patch Use an alternative directory instead of an env var as suggested by Martin. 661486 6 150391 mrobinson 2012-07-02 07:37:48 -0700 Comment on attachment 150391 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=150391&action=review This patch looks great, except that it should probably also deal with WebKitTestRunner in Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp. > Tools/DumpRenderTree/gtk/DumpRenderTree.cpp:176 > + const char* webkitOutputDir = g_getenv("WEBKITOUTPUTDIR"); Perhaps you could do: GOwnPtr<char> defaultOutputDir = g_build_filename(getTopLevelPath().data(), "WebKitBuild"); const char* outputDirFromEnvironment = g_getenv("WEBKITOUTPUTDIR"); const char* webkitOutputDir = outputDirFromEnvironment ? outputDirFromEnvironment : topLevelPath.get(); and avoid the duplication below? 661519 7 150430 cgarcia 2012-07-02 08:49:51 -0700 Created attachment 150430 Updated patch 661522 8 150430 mrobinson 2012-07-02 08:54:17 -0700 Comment on attachment 150430 Updated patch Thanks! 661538 9 cgarcia 2012-07-02 09:11:08 -0700 Committed r121684: <http://trac.webkit.org/changeset/121684> 148267 2012-06-18 23:53:57 -0700 2012-07-02 03:38:23 -0700 Patch wk-drt-external-fonts-dir.diff text/plain 3460 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0MTlh MGExLi5mZDQ2NWU3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDYtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlYWQgZm9udHMgcGF0aCBp biBEUlQgZnJvbSBXRUJLSVRfVEVTVF9GT05UU19QQVRIIGVudiB2YXIgaWYgcHJlc2VudAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk0MzcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChnZXRGb250c1BhdGgpOiBDaGVj ayBXRUJLSVRfVEVTVF9GT05UU19QQVRIIGVudiB2YXIgYW5kIHJldHVybiBpcworICAgICAgICB2 YWx1ZSBpZiBwcmVzZW50LgorICAgICAgICAoaW5pdGlhbGl6ZUZvbnRzKTogVXNlIGdldEZvbnRz UGF0aCgpIGRpcmVjdGx5IHNpbmNlIG5vdyBpdAorICAgICAgICByZXR1cm5zIHRoZSBmdWxsIHBh dGggdG8gdGhlIGZvbnRzIGRpci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2d0ay5weToKKyAgICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2Vy dmVyKTogUGFzcyBXRUJLSVRfVEVTVF9GT05UU19QQVRIIHRvCisgICAgICAgIHRoZSBEUlQgZW52 aXJvbm1lbnQgaWYgcHJlc2VudC4KKwogMjAxMi0wNi0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBnYXJkZW4tby1tYXRpYyAnUmVzdWx0cycgcGFu ZWwgaXMgYnJva2VuIGZvciB0aGUgQXBwbGUgcGxhdGZvcm0KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDk3NDBkMjcuLjliZDA2ZDYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtMTY5LDYgKzE2OSwx NyBAQCBDU3RyaW5nIGdldFRvcExldmVsUGF0aCgpCiAgICAgcmV0dXJuIFRPUF9MRVZFTF9ESVI7 CiB9CiAKK3N0YXRpYyBjaGFyKiBnZXRGb250c1BhdGgoKQoreworICAgIGNvbnN0IGNoYXIqIGZv bnRzUGF0aCA9IGdfZ2V0ZW52KCJXRUJLSVRfVEVTVF9GT05UU19QQVRIIik7CisgICAgaWYgKGZv bnRzUGF0aCkKKyAgICAgICAgcmV0dXJuIGdfc3RyZHVwKGZvbnRzUGF0aCk7CisKKyAgICBDU3Ry aW5nIHRvcExldmVsUGF0aCA9IGdldFRvcExldmVsUGF0aCgpOworICAgIHJldHVybiBnX2J1aWxk X2ZpbGVuYW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWlsZCIsICJEZXBlbmRlbmNp ZXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJSb290IiwgIndlYmtpdGd0ay10ZXN0 LWZvbnRzIiwgTlVMTCk7Cit9CisKIHN0YXRpYyB2b2lkIGluaXRpYWxpemVGb250cyhjb25zdCBj aGFyKiB0ZXN0VVJMID0gMCkKIHsKICNpZiBQTEFURk9STShYMTEpCkBAIC0xOTAsOSArMjAxLDcg QEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKGNvbnN0IGNoYXIqIHRlc3RVUkwgPSAwKQog ICAgIGlmICghRmNDb25maWdQYXJzZUFuZExvYWQoY29uZmlnLCByZWludGVycHJldF9jYXN0PEZj Q2hhcjgqPihmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkpLCB0cnVlKSkKICAgICAgICAgZ19lcnJv cigiQ291bGRuJ3QgbG9hZCBmb250IGNvbmZpZ3VyYXRpb24gZmlsZSBmcm9tOiAlcyIsIGZvbnRD b25maWdGaWxlbmFtZS5nZXQoKSk7CiAKLSAgICBDU3RyaW5nIHRvcExldmVsUGF0aCA9IGdldFRv cExldmVsUGF0aCgpOwotICAgIEdPd25QdHI8Y2hhcj4gZm9udHNQYXRoKGdfYnVpbGRfZmlsZW5h bWUodG9wTGV2ZWxQYXRoLmRhdGEoKSwgIldlYktpdEJ1aWxkIiwgIkRlcGVuZGVuY2llcyIsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiUm9vdCIsICJ3ZWJr aXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKKyAgICBHT3duUHRyPGNoYXI+IGZvbnRzUGF0aChn ZXRGb250c1BhdGgoKSk7CiAgICAgaWYgKCFnX2ZpbGVfdGVzdChmb250c1BhdGguZ2V0KCksIHN0 YXRpY19jYXN0PEdGaWxlVGVzdD4oR19GSUxFX1RFU1RfRVhJU1RTIHwgR19GSUxFX1RFU1RfSVNf RElSKSkpCiAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2NhdGUgdGVzdCBmb250cyBhdCAl cy4gSXMgV0VCS0lUX1RPUF9MRVZFTCBzZXQ/IiwgZm9udHNQYXRoLmdldCgpKTsKIApkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQppbmRleCAyNmUx Yzg0Li5iMDg4NTliIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2d0ay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2d0ay5weQpAQCAtNjQsNiArNjQsOSBAQCBjbGFzcyBHdGtQb3J0KFdlYktpdFBvcnQs IFB1bHNlQXVkaW9TYW5pdGl6ZXIpOgogICAgICAgICBlbnZpcm9ubWVudFsnQVVESU9fUkVTT1VS Q0VTX1BBVEgnXSA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9jb25maWcud2Via2l0X2Jh c2VfZGlyKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICdTb3VyY2UnLCAnV2ViQ29yZScsICdwbGF0Zm9ybScsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdhdWRpbycsICdyZXNvdXJjZXMnKQorICAgICAgICBpZiBvcy5lbnZpcm9uLmdl dCgnV0VCS0lUX1RFU1RfRk9OVFNfUEFUSCcpOgorICAgICAgICAgICAgZW52aXJvbm1lbnRbJ1dF QktJVF9URVNUX0ZPTlRTX1BBVEgnXSA9IG9zLmVudmlyb25bJ1dFQktJVF9URVNUX0ZPTlRTX1BB VEgnXQorCiAgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6 CiAgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGEgd29ya2Fyb3VuZCB0byBlbnN1cmUgdGhh dCB0ZXN0aW5nIHdpdGggV2ViS2l0VGVzdFJ1bm5lciBpcyBzdGFydGVkIHdpdGgKICAgICAgICAg ICAgICMgYSBub24tZXhpc3RpbmcgY2FjaGUuIFRoaXMgc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiAo YW5kIGlmKSBpdCB3aWxsIGJlIHBvc3NpYmxlIHRvIHByb3Blcmx5Cg== 150391 2012-07-02 03:38:23 -0700 2012-07-02 08:49:51 -0700 Updated patch drt-alternative-fonts-dir.diff text/plain 4194 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlMmEz YzcyLi45ZmFiN2NmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlYWQgZm9udHMgcGF0aCBp biBEUlQgZnJvbSBhbHRlcm5hdGl2ZSBmb250cyBkaXIgd2hlbiBtYWluIGRpciBkb2Vzbid0IGV4 aXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTQz NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIG1h aW4gZm9udHMgZGlyZWN0b3J5IGRvZXNuJ3QgZXhpc3QsIHRyeSB3aXRoIGFuIGFsdGVybmF0aXZl CisgICAgICAgIGZvbnRzIGRpcmVjdG9yeSBhdCBidWlsZCBkaXJlY3RvcnkuCisKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAoZ2V0Rm9u dHNQYXRoKToKKyAgICAgICAgKGluaXRpYWxpemVGb250cyk6CisKIDIwMTItMDctMDEgIENocmlz dG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZM XSBBZGQgR2FtZXBhZCBzdXBwb3J0CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9n dGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5k ZXJUcmVlLmNwcAppbmRleCBmN2U5MDU3Li41NDQ0OGFkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTE2OSw2ICsxNjksMzUgQEAgQ1N0cmluZyBn ZXRUb3BMZXZlbFBhdGgoKQogICAgIHJldHVybiBUT1BfTEVWRUxfRElSOwogfQogCitzdGF0aWMg Q1N0cmluZyBnZXRGb250c1BhdGgoKQoreworICAgIEdPd25QdHI8Y2hhcj4gZm9udHNQYXRoOwor ICAgIEdGaWxlVGVzdCBkaXJUZXN0ID0gc3RhdGljX2Nhc3Q8R0ZpbGVUZXN0PihHX0ZJTEVfVEVT VF9FWElTVFMgfCBHX0ZJTEVfVEVTVF9JU19ESVIpOworICAgIGNvbnN0IGNoYXIqIHdlYmtpdE91 dHB1dERpciA9IGdfZ2V0ZW52KCJXRUJLSVRPVVRQVVRESVIiKTsKKyAgICBpZiAod2Via2l0T3V0 cHV0RGlyKSB7CisgICAgICAgIGZvbnRzUGF0aC5zZXQoZ19idWlsZF9maWxlbmFtZSh3ZWJraXRP dXRwdXREaXIsICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIs IE5VTEwpKTsKKyAgICAgICAgaWYgKGdfZmlsZV90ZXN0KGZvbnRzUGF0aC5nZXQoKSwgZGlyVGVz dCkpCisgICAgICAgICAgICByZXR1cm4gQ1N0cmluZyhmb250c1BhdGguZ2V0KCkpOworCisgICAg ICAgIC8vIFRyeSBhbHRlcm5hdGl2ZSBmb250cyBwYXRoLgorICAgICAgICBmb250c1BhdGguc2V0 KGdfYnVpbGRfZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLCAid2Via2l0Z3RrLXRlc3QtZm9udHMi LCBOVUxMKSk7CisgICAgICAgIGlmIChnX2ZpbGVfdGVzdChmb250c1BhdGguZ2V0KCksIGRpclRl c3QpKQorICAgICAgICAgICAgcmV0dXJuIENTdHJpbmcoZm9udHNQYXRoLmdldCgpKTsKKyAgICB9 IGVsc2UgeworICAgICAgICBDU3RyaW5nIHRvcExldmVsUGF0aCA9IGdldFRvcExldmVsUGF0aCgp OworICAgICAgICBmb250c1BhdGguc2V0KGdfYnVpbGRfZmlsZW5hbWUodG9wTGV2ZWxQYXRoLmRh dGEoKSwgIldlYktpdEJ1aWxkIiwgIkRlcGVuZGVuY2llcyIsICJSb290IiwgIndlYmtpdGd0ay10 ZXN0LWZvbnRzIiwgTlVMTCkpOworICAgICAgICBpZiAoZ19maWxlX3Rlc3QoZm9udHNQYXRoLmdl dCgpLCBkaXJUZXN0KSkKKyAgICAgICAgICAgIHJldHVybiBDU3RyaW5nKGZvbnRzUGF0aC5nZXQo KSk7CisKKyAgICAgICAgLy8gVHJ5IGFsdGVybmF0aXZlIGZvbnRzIHBhdGguCisgICAgICAgIGZv bnRzUGF0aC5zZXQoZ19idWlsZF9maWxlbmFtZSh0b3BMZXZlbFBhdGguZGF0YSgpLCAiV2ViS2l0 QnVpbGQiLCAid2Via2l0Z3RrLXRlc3QtZm9udHMiLCBOVUxMKSk7CisgICAgICAgIGlmIChnX2Zp bGVfdGVzdChmb250c1BhdGguZ2V0KCksIGRpclRlc3QpKQorICAgICAgICAgICAgcmV0dXJuIENT dHJpbmcoZm9udHNQYXRoLmdldCgpKTsKKyAgICB9CisKKyAgICByZXR1cm4gQ1N0cmluZygpOwor fQorCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplRm9udHMoY29uc3QgY2hhciogdGVzdFVSTCA9IDAp CiB7CiAjaWYgUExBVEZPUk0oWDExKQpAQCAtMTkwLDI0ICsyMTksMTYgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZUZvbnRzKGNvbnN0IGNoYXIqIHRlc3RVUkwgPSAwKQogICAgIGlmICghRmNDb25m aWdQYXJzZUFuZExvYWQoY29uZmlnLCByZWludGVycHJldF9jYXN0PEZjQ2hhcjgqPihmb250Q29u ZmlnRmlsZW5hbWUuZ2V0KCkpLCB0cnVlKSkKICAgICAgICAgZ19lcnJvcigiQ291bGRuJ3QgbG9h ZCBmb250IGNvbmZpZ3VyYXRpb24gZmlsZSBmcm9tOiAlcyIsIGZvbnRDb25maWdGaWxlbmFtZS5n ZXQoKSk7CiAKLSAgICBHT3duUHRyPGNoYXI+IGZvbnRzUGF0aDsKLSAgICBjb25zdCBjaGFyKiB3 ZWJraXRPdXRwdXREaXIgPSBnX2dldGVudigiV0VCS0lUT1VUUFVURElSIik7Ci0gICAgaWYgKHdl YmtpdE91dHB1dERpcikKLSAgICAgICAgZm9udHNQYXRoLnNldChnX2J1aWxkX2ZpbGVuYW1lKHdl YmtpdE91dHB1dERpciwgIkRlcGVuZGVuY2llcyIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZv bnRzIiwgTlVMTCkpOwotICAgIGVsc2UgewotICAgICAgICBDU3RyaW5nIHRvcExldmVsUGF0aCA9 IGdldFRvcExldmVsUGF0aCgpOwotICAgICAgICBmb250c1BhdGguc2V0KGdfYnVpbGRfZmlsZW5h bWUodG9wTGV2ZWxQYXRoLmRhdGEoKSwgIldlYktpdEJ1aWxkIiwgIkRlcGVuZGVuY2llcyIsICJS b290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgTlVMTCkpOwotICAgIH0KLQotICAgIGlmICgh Z19maWxlX3Rlc3QoZm9udHNQYXRoLmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklM RV9URVNUX0VYSVNUUyB8IEdfRklMRV9URVNUX0lTX0RJUikpKQotICAgICAgICBnX2Vycm9yKCJD b3VsZCBub3QgbG9jYXRlIHRlc3QgZm9udHMgYXQgJXMuIElzIFdFQktJVF9UT1BfTEVWRUwgc2V0 PyIsIGZvbnRzUGF0aC5nZXQoKSk7CisgICAgQ1N0cmluZyBmb250c1BhdGggPSBnZXRGb250c1Bh dGgoKTsKKyAgICBpZiAoZm9udHNQYXRoLmlzTnVsbCgpKQorICAgICAgICBnX2Vycm9yKCJDb3Vs ZCBub3QgbG9jYXRlIHRlc3QgZm9udHMgYXQgJXMuIElzIFdFQktJVF9UT1BfTEVWRUwgc2V0PyIs IGZvbnRzUGF0aC5kYXRhKCkpOwogCiAgICAgR093blB0cjxHRXJyb3I+IGVycm9yOwotICAgIEdP d25QdHI8R0Rpcj4gZm9udHNEaXJlY3RvcnkoZ19kaXJfb3Blbihmb250c1BhdGguZ2V0KCksIDAs ICZlcnJvci5vdXRQdHIoKSkpOworICAgIEdPd25QdHI8R0Rpcj4gZm9udHNEaXJlY3RvcnkoZ19k aXJfb3Blbihmb250c1BhdGguZGF0YSgpLCAwLCAmZXJyb3Iub3V0UHRyKCkpKTsKICAgICB3aGls ZSAoY29uc3QgY2hhciogZGlyZWN0b3J5RW50cnkgPSBnX2Rpcl9yZWFkX25hbWUoZm9udHNEaXJl Y3RvcnkuZ2V0KCkpKSB7CiAgICAgICAgIGlmICghZ19zdHJfaGFzX3N1ZmZpeChkaXJlY3RvcnlF bnRyeSwgIi50dGYiKSAmJiAhZ19zdHJfaGFzX3N1ZmZpeChkaXJlY3RvcnlFbnRyeSwgIi5vdGYi KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBHT3duUHRyPGdjaGFyPiBmb250UGF0 aChnX2J1aWxkX2ZpbGVuYW1lKGZvbnRzUGF0aC5nZXQoKSwgZGlyZWN0b3J5RW50cnksIE5VTEwp KTsKKyAgICAgICAgR093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250 c1BhdGguZGF0YSgpLCBkaXJlY3RvcnlFbnRyeSwgTlVMTCkpOwogICAgICAgICBpZiAoIUZjQ29u ZmlnQXBwRm9udEFkZEZpbGUoY29uZmlnLCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgq Pihmb250UGF0aC5nZXQoKSkpKQogICAgICAgICAgICAgZ19lcnJvcigiQ291bGQgbm90IGxvYWQg Zm9udCBhdCAlcyEiLCBmb250UGF0aC5nZXQoKSk7CiAK 150430 2012-07-02 08:49:51 -0700 2012-07-02 08:54:17 -0700 Updated patch tests-alternative-fonts-path.diff text/plain 7407 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhZDQ2 Y2YzLi4xYTJmNzIyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMDctMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlYWQgZm9udHMgcGF0aCB3 aGVuIHJ1bm5pbmcgbGF5b3V0IHRlc3RzIGZyb20gYWx0ZXJuYXRpdmUgZm9udHMgZGlyIHdoZW4g bWFpbiBkaXIgZG9lc24ndCBleGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODk0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJZiBtYWluIGZvbnRzIGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0cnkg d2l0aCBhbiBhbHRlcm5hdGl2ZQorICAgICAgICBmb250cyBkaXJlY3RvcnkgYXQgYnVpbGQgZGly ZWN0b3J5LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNw cDoKKyAgICAgICAgKGdldE91dHB1dERpcik6CisgICAgICAgIChnZXRGb250c1BhdGgpOgorICAg ICAgICAoaW5pdGlhbGl6ZUZvbnRzKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6Z2V0T3V0 cHV0RGlyKToKKyAgICAgICAgKFdUUik6CisgICAgICAgIChXVFI6OmdldEZvbnRzUGF0aCk6Cisg ICAgICAgIChXVFI6OmluaXRpdGlhbGl6ZUZvbnRDb25maWdTZXR0aW5nKToKKwogMjAxMi0wNi0y OSAgT3N3YWxkIEJ1ZGRlbmhhZ2VuICA8b3N3YWxkLmJ1ZGRlbmhhZ2VuQG5va2lhLmNvbT4KIAog ICAgICAgICBbUXRdIFNpbXBsaWZ5IGRldGVjdGlvbiBvZiBub24taW5zdGFsbGVkIG1vZHVsZSBm aWxlCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUu Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBm N2U5MDU3Li4wYmRlNjUyIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVt cFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVy VHJlZS5jcHAKQEAgLTE2OSw2ICsxNjksMzIgQEAgQ1N0cmluZyBnZXRUb3BMZXZlbFBhdGgoKQog ICAgIHJldHVybiBUT1BfTEVWRUxfRElSOwogfQogCitDU3RyaW5nIGdldE91dHB1dERpcigpCit7 CisgICAgY29uc3QgY2hhciogd2Via2l0T3V0cHV0RGlyID0gZ19nZXRlbnYoIldFQktJVE9VVFBV VERJUiIpOworICAgIGlmICh3ZWJraXRPdXRwdXREaXIpCisgICAgICAgIHJldHVybiB3ZWJraXRP dXRwdXREaXI7CisKKyAgICBDU3RyaW5nIHRvcExldmVsUGF0aCA9IGdldFRvcExldmVsUGF0aCgp OworICAgIEdPd25QdHI8Y2hhcj4gb3V0cHV0RGlyKGdfYnVpbGRfZmlsZW5hbWUodG9wTGV2ZWxQ YXRoLmRhdGEoKSwgIldlYktpdEJ1aWxkIiwgTlVMTCkpOworICAgIHJldHVybiBvdXRwdXREaXIu Z2V0KCk7Cit9CisKK3N0YXRpYyBDU3RyaW5nIGdldEZvbnRzUGF0aCgpCit7CisgICAgQ1N0cmlu ZyB3ZWJraXRPdXRwdXREaXIgPSBnZXRPdXRwdXREaXIoKTsKKyAgICBHT3duUHRyPGNoYXI+IGZv bnRzUGF0aChnX2J1aWxkX2ZpbGVuYW1lKHdlYmtpdE91dHB1dERpci5kYXRhKCksICJEZXBlbmRl bmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKKyAgICBpZiAo Z19maWxlX3Rlc3QoZm9udHNQYXRoLmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklM RV9URVNUX0VYSVNUUyB8IEdfRklMRV9URVNUX0lTX0RJUikpKQorICAgICAgICByZXR1cm4gZm9u dHNQYXRoLmdldCgpOworCisgICAgLy8gVHJ5IGFsdGVybmF0aXZlIGZvbnRzIHBhdGguCisgICAg Zm9udHNQYXRoLnNldChnX2J1aWxkX2ZpbGVuYW1lKHdlYmtpdE91dHB1dERpci5kYXRhKCksICJ3 ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKKyAgICBpZiAoZ19maWxlX3Rlc3QoZm9udHNQ YXRoLmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklMRV9URVNUX0VYSVNUUyB8IEdf RklMRV9URVNUX0lTX0RJUikpKQorICAgICAgICByZXR1cm4gZm9udHNQYXRoLmdldCgpOworCisg ICAgcmV0dXJuIENTdHJpbmcoKTsKK30KKwogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKGNv bnN0IGNoYXIqIHRlc3RVUkwgPSAwKQogewogI2lmIFBMQVRGT1JNKFgxMSkKQEAgLTE5MCwyNCAr MjE2LDE2IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVGb250cyhjb25zdCBjaGFyKiB0ZXN0VVJM ID0gMCkKICAgICBpZiAoIUZjQ29uZmlnUGFyc2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRf Y2FzdDxGY0NoYXI4Kj4oZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAg IGdfZXJyb3IoIkNvdWxkbid0IGxvYWQgZm9udCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMi LCBmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkpOwogCi0gICAgR093blB0cjxjaGFyPiBmb250c1Bh dGg7Ci0gICAgY29uc3QgY2hhciogd2Via2l0T3V0cHV0RGlyID0gZ19nZXRlbnYoIldFQktJVE9V VFBVVERJUiIpOwotICAgIGlmICh3ZWJraXRPdXRwdXREaXIpCi0gICAgICAgIGZvbnRzUGF0aC5z ZXQoZ19idWlsZF9maWxlbmFtZSh3ZWJraXRPdXRwdXREaXIsICJEZXBlbmRlbmNpZXMiLCAiUm9v dCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKLSAgICBlbHNlIHsKLSAgICAgICAg Q1N0cmluZyB0b3BMZXZlbFBhdGggPSBnZXRUb3BMZXZlbFBhdGgoKTsKLSAgICAgICAgZm9udHNQ YXRoLnNldChnX2J1aWxkX2ZpbGVuYW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWls ZCIsICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwp KTsKLSAgICB9Ci0KLSAgICBpZiAoIWdfZmlsZV90ZXN0KGZvbnRzUGF0aC5nZXQoKSwgc3RhdGlj X2Nhc3Q8R0ZpbGVUZXN0PihHX0ZJTEVfVEVTVF9FWElTVFMgfCBHX0ZJTEVfVEVTVF9JU19ESVIp KSkKLSAgICAgICAgZ19lcnJvcigiQ291bGQgbm90IGxvY2F0ZSB0ZXN0IGZvbnRzIGF0ICVzLiBJ cyBXRUJLSVRfVE9QX0xFVkVMIHNldD8iLCBmb250c1BhdGguZ2V0KCkpOworICAgIENTdHJpbmcg Zm9udHNQYXRoID0gZ2V0Rm9udHNQYXRoKCk7CisgICAgaWYgKGZvbnRzUGF0aC5pc051bGwoKSkK KyAgICAgICAgZ19lcnJvcigiQ291bGQgbm90IGxvY2F0ZSB0ZXN0IGZvbnRzIGF0ICVzLiBJcyBX RUJLSVRfVE9QX0xFVkVMIHNldD8iLCBmb250c1BhdGguZGF0YSgpKTsKIAogICAgIEdPd25QdHI8 R0Vycm9yPiBlcnJvcjsKLSAgICBHT3duUHRyPEdEaXI+IGZvbnRzRGlyZWN0b3J5KGdfZGlyX29w ZW4oZm9udHNQYXRoLmdldCgpLCAwLCAmZXJyb3Iub3V0UHRyKCkpKTsKKyAgICBHT3duUHRyPEdE aXI+IGZvbnRzRGlyZWN0b3J5KGdfZGlyX29wZW4oZm9udHNQYXRoLmRhdGEoKSwgMCwgJmVycm9y Lm91dFB0cigpKSk7CiAgICAgd2hpbGUgKGNvbnN0IGNoYXIqIGRpcmVjdG9yeUVudHJ5ID0gZ19k aXJfcmVhZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgpKSkgewogICAgICAgICBpZiAoIWdfc3Ry X2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRmIikgJiYgIWdfc3RyX2hhc19zdWZmaXgo ZGlyZWN0b3J5RW50cnksICIub3RmIikpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg R093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250c1BhdGguZ2V0KCks IGRpcmVjdG9yeUVudHJ5LCBOVUxMKSk7CisgICAgICAgIEdPd25QdHI8Z2NoYXI+IGZvbnRQYXRo KGdfYnVpbGRfZmlsZW5hbWUoZm9udHNQYXRoLmRhdGEoKSwgZGlyZWN0b3J5RW50cnksIE5VTEwp KTsKICAgICAgICAgaWYgKCFGY0NvbmZpZ0FwcEZvbnRBZGRGaWxlKGNvbmZpZywgcmVpbnRlcnBy ZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZm9udFBhdGguZ2V0KCkpKSkKICAgICAgICAgICAgIGdf ZXJyb3IoIkNvdWxkIG5vdCBsb2FkIGZvbnQgYXQgJXMhIiwgZm9udFBhdGguZ2V0KCkpOwogCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2d0ay9BY3Rp dmF0ZUZvbnRzR3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv Z3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCmluZGV4IDE5YWNmZDguLmM4NDM1OTEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9u dHNHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3Rr L0FjdGl2YXRlRm9udHNHdGsuY3BwCkBAIC02Niw2ICs2NiwzMiBAQCBzdGF0aWMgQ1N0cmluZyBn ZXRUb3BMZXZlbFBhdGgoKQogICAgIHJldHVybiBhYnNvbHV0ZVRvcExldmVsUGF0aC5nZXQoKTsK IH0KIAorQ1N0cmluZyBnZXRPdXRwdXREaXIoKQoreworICAgIGNvbnN0IGNoYXIqIHdlYmtpdE91 dHB1dERpciA9IGdfZ2V0ZW52KCJXRUJLSVRPVVRQVVRESVIiKTsKKyAgICBpZiAod2Via2l0T3V0 cHV0RGlyKQorICAgICAgICByZXR1cm4gd2Via2l0T3V0cHV0RGlyOworCisgICAgQ1N0cmluZyB0 b3BMZXZlbFBhdGggPSBnZXRUb3BMZXZlbFBhdGgoKTsKKyAgICBHT3duUHRyPGNoYXI+IG91dHB1 dERpcihnX2J1aWxkX2ZpbGVuYW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWlsZCIs IE5VTEwpKTsKKyAgICByZXR1cm4gb3V0cHV0RGlyLmdldCgpOworfQorCitzdGF0aWMgQ1N0cmlu ZyBnZXRGb250c1BhdGgoKQoreworICAgIENTdHJpbmcgd2Via2l0T3V0cHV0RGlyID0gZ2V0T3V0 cHV0RGlyKCk7CisgICAgR093blB0cjxjaGFyPiBmb250c1BhdGgoZ19idWlsZF9maWxlbmFtZSh3 ZWJraXRPdXRwdXREaXIuZGF0YSgpLCAiRGVwZW5kZW5jaWVzIiwgIlJvb3QiLCAid2Via2l0Z3Rr LXRlc3QtZm9udHMiLCBOVUxMKSk7CisgICAgaWYgKGdfZmlsZV90ZXN0KGZvbnRzUGF0aC5nZXQo KSwgc3RhdGljX2Nhc3Q8R0ZpbGVUZXN0PihHX0ZJTEVfVEVTVF9FWElTVFMgfCBHX0ZJTEVfVEVT VF9JU19ESVIpKSkKKyAgICAgICAgcmV0dXJuIGZvbnRzUGF0aC5nZXQoKTsKKworICAgIC8vIFRy eSBhbHRlcm5hdGl2ZSBmb250cyBwYXRoLgorICAgIGZvbnRzUGF0aC5zZXQoZ19idWlsZF9maWxl bmFtZSh3ZWJraXRPdXRwdXREaXIuZGF0YSgpLCAid2Via2l0Z3RrLXRlc3QtZm9udHMiLCBOVUxM KSk7CisgICAgaWYgKGdfZmlsZV90ZXN0KGZvbnRzUGF0aC5nZXQoKSwgc3RhdGljX2Nhc3Q8R0Zp bGVUZXN0PihHX0ZJTEVfVEVTVF9FWElTVFMgfCBHX0ZJTEVfVEVTVF9JU19ESVIpKSkKKyAgICAg ICAgcmV0dXJuIGZvbnRzUGF0aC5nZXQoKTsKKworICAgIHJldHVybiBDU3RyaW5nKCk7Cit9CisK IHZvaWQgaW5pdGl0aWFsaXplRm9udENvbmZpZ1NldHRpbmcoKQogewogICAgIEZjSW5pdCgpOwpA QCAtODYsMjQgKzExMiwxNiBAQCB2b2lkIGluaXRpdGlhbGl6ZUZvbnRDb25maWdTZXR0aW5nKCkK ICAgICBpZiAoIUZjQ29uZmlnUGFyc2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxG Y0NoYXI4Kj4oZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAgIGdfZXJy b3IoIkNvdWxkbid0IGxvYWQgZm9udCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMiLCBmb250 Q29uZmlnRmlsZW5hbWUuZ2V0KCkpOwogCi0gICAgR093blB0cjxjaGFyPiBmb250c1BhdGg7Ci0g ICAgY29uc3QgY2hhciogd2Via2l0T3V0cHV0RGlyID0gZ19nZXRlbnYoIldFQktJVE9VVFBVVERJ UiIpOwotICAgIGlmICh3ZWJraXRPdXRwdXREaXIpCi0gICAgICAgIGZvbnRzUGF0aC5zZXQoZ19i dWlsZF9maWxlbmFtZSh3ZWJraXRPdXRwdXREaXIsICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3 ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKLSAgICBlbHNlIHsKLSAgICAgICAgQ1N0cmlu ZyB0b3BMZXZlbFBhdGggPSBnZXRUb3BMZXZlbFBhdGgoKTsKLSAgICAgICAgZm9udHNQYXRoLnNl dChnX2J1aWxkX2ZpbGVuYW1lKHRvcExldmVsUGF0aC5kYXRhKCksICJXZWJLaXRCdWlsZCIsICJE ZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIE5VTEwpKTsKLSAg ICB9Ci0KLSAgICBpZiAoIWdfZmlsZV90ZXN0KGZvbnRzUGF0aC5nZXQoKSwgc3RhdGljX2Nhc3Q8 R0ZpbGVUZXN0PihHX0ZJTEVfVEVTVF9FWElTVFMgfCBHX0ZJTEVfVEVTVF9JU19ESVIpKSkKLSAg ICAgICAgZ19lcnJvcigiQ291bGQgbm90IGxvY2F0ZSB0ZXN0IGZvbnRzIGF0ICVzLiBJcyBXRUJL SVRfVE9QX0xFVkVMIHNldD8iLCBmb250c1BhdGguZ2V0KCkpOworICAgIENTdHJpbmcgZm9udHNQ YXRoID0gZ2V0Rm9udHNQYXRoKCk7CisgICAgaWYgKGZvbnRzUGF0aC5pc051bGwoKSkKKyAgICAg ICAgZ19lcnJvcigiQ291bGQgbm90IGxvY2F0ZSB0ZXN0IGZvbnRzIGF0ICVzLiBJcyBXRUJLSVRf VE9QX0xFVkVMIHNldD8iLCBmb250c1BhdGguZGF0YSgpKTsKIAogICAgIEdPd25QdHI8R0Vycm9y PiBlcnJvcjsKLSAgICBHT3duUHRyPEdEaXI+IGZvbnRzRGlyZWN0b3J5KGdfZGlyX29wZW4oZm9u dHNQYXRoLmdldCgpLCAwLCAmZXJyb3Iub3V0UHRyKCkpKTsKKyAgICBHT3duUHRyPEdEaXI+IGZv bnRzRGlyZWN0b3J5KGdfZGlyX29wZW4oZm9udHNQYXRoLmRhdGEoKSwgMCwgJmVycm9yLm91dFB0 cigpKSk7CiAgICAgd2hpbGUgKGNvbnN0IGNoYXIqIGRpcmVjdG9yeUVudHJ5ID0gZ19kaXJfcmVh ZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgpKSkgewogICAgICAgICBpZiAoIWdfc3RyX2hhc19z dWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRmIikgJiYgIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0 b3J5RW50cnksICIub3RmIikpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgR093blB0 cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250c1BhdGguZ2V0KCksIGRpcmVj dG9yeUVudHJ5LCBOVUxMKSk7CisgICAgICAgIEdPd25QdHI8Z2NoYXI+IGZvbnRQYXRoKGdfYnVp bGRfZmlsZW5hbWUoZm9udHNQYXRoLmRhdGEoKSwgZGlyZWN0b3J5RW50cnksIE5VTEwpKTsKICAg ICAgICAgaWYgKCFGY0NvbmZpZ0FwcEZvbnRBZGRGaWxlKGNvbmZpZywgcmVpbnRlcnByZXRfY2Fz dDxjb25zdCBGY0NoYXI4Kj4oZm9udFBhdGguZ2V0KCkpKSkKICAgICAgICAgICAgIGdfZXJyb3Io IkNvdWxkIG5vdCBsb2FkIGZvbnQgYXQgJXMhIiwgZm9udFBhdGguZ2V0KCkpOwogICAgIH0K