86565 2012-05-15 20:27:58 -0700 [chromium] run-webkit-tests can't work on ubuntu 12.04 2012-05-17 07:08:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 li.yin webkit-unassigned abarth peter tkent webkit.review.bot oldest_to_newest 624916 0 li.yin 2012-05-15 20:27:58 -0700 In ubuntu 12.04, the run-webkit-tests in chromium can't work normally. The error message: You are missing /usr/share/fonts/truetype/thai/Garuda.ttf But in ubuntu12.04, the package ttf-thai-tlwg install the Garuda.ttf into /usr/share/fonts/truetype/tlwg/Garuda.ttf 624918 1 142136 li.yin 2012-05-15 20:36:56 -0700 Created attachment 142136 Patch 624922 2 142136 tkent 2012-05-15 20:49:21 -0700 Comment on attachment 142136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142136&action=review > Tools/DumpRenderTree/chromium/TestShellLinux.cpp:174 > + if (!strcmp(fonts[i], "/usr/share/fonts/truetype/thai/Garuda.ttf")) { > + // ttf-thai-tlwg package uses different path in Ubuntu 12.04. > + static const char* tlwg = "/usr/share/fonts/truetype/tlwg/Garuda.ttf"; > + if (access(tlwg, R_OK)) { > + fprintf(stderr, "You are missing %s or %s. Try re-running build/install-build-deps.sh. Also see " > + "http://code.google.com/p/chromium/wiki/LayoutTestsLinux", > + fonts[i], tlwg); > + exit(1); > + } > + } else { > + fprintf(stderr, "You are missing %s. Try re-running build/install-build-deps.sh. Also see " > "http://code.google.com/p/chromium/wiki/LayoutTestsLinux", > fonts[i]); > - exit(1); > + exit(1); > + } > } I'd like: - removing Garuda.ttf from 'fonts' array - introduce new function to take two arguments for paths (tahi/Garuda.ttf and tlwg/Garuda.ttf). The function checks their existence and calls FcConfigAppFontAddFile(). The following check for lohit_pa.ttf might use the function too. 625053 3 li.yin 2012-05-16 00:17:54 -0700 (In reply to comment #2) > I'd like: > - removing Garuda.ttf from 'fonts' array > - introduce new function to take two arguments for paths (tahi/Garuda.ttf and tlwg/Garuda.ttf). The function checks their existence and calls FcConfigAppFontAddFile(). > > The following check for lohit_pa.ttf might use the function too. Thanks for your review. Yeah, I should add the "Garuda.tff" into optionalFonts. And the "Garuda.tff" is not required for all the test, some tests don't need it, such as fast/worker etc. I think it should be optional. Add the "Garuda.tff" into optionalFonts, optionFounts array should be the interface for handling the exception. It is very convenient to fix this issue. So I don't introduce a new function. 625064 4 142175 li.yin 2012-05-16 00:23:20 -0700 Created attachment 142175 Patch 626375 5 142175 tkent 2012-05-17 01:32:32 -0700 Comment on attachment 142175 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142175&action=review > Tools/DumpRenderTree/chromium/TestShellLinux.cpp:173 > static const char* const optionalFonts[] = { > "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf", > + "/usr/share/fonts/truetype/thai/Garuda.ttf", I don't want to make Garuda.ttf optional. 626493 6 li.yin 2012-05-17 05:52:46 -0700 (In reply to comment #5) > (From update of attachment 142175 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=142175&action=review > > > Tools/DumpRenderTree/chromium/TestShellLinux.cpp:173 > > static const char* const optionalFonts[] = { > > "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf", > > + "/usr/share/fonts/truetype/thai/Garuda.ttf", > > I don't want to make Garuda.ttf optional. Okay, I have updated the patch already, please have a review again. Thanks. 626497 7 142460 li.yin 2012-05-17 06:02:19 -0700 Created attachment 142460 Patch 626501 8 webkit.review.bot 2012-05-17 06:05:51 -0700 Attachment 142460 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/DumpRenderTree/c..." exit_code: 1 Tools/DumpRenderTree/chromium/TestShellLinux.cpp:86: Missing space before ( in if( [whitespace/parens] [5] Tools/DumpRenderTree/chromium/TestShellLinux.cpp:88: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 626508 9 142461 li.yin 2012-05-17 06:11:52 -0700 Created attachment 142461 Patch 626510 10 142461 tkent 2012-05-17 06:16:10 -0700 Comment on attachment 142461 Patch Looks good. 626544 11 142461 webkit.review.bot 2012-05-17 07:08:14 -0700 Comment on attachment 142461 Patch Clearing flags on attachment: 142461 Committed r117446: <http://trac.webkit.org/changeset/117446> 626545 12 webkit.review.bot 2012-05-17 07:08:19 -0700 All reviewed patches have been landed. Closing bug. 142136 2012-05-15 20:36:56 -0700 2012-05-16 00:23:10 -0700 Patch bug-86565-20120517114009.patch text/plain 2474 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGMyODVhM2Q5NDQ4ZTgzODVmNTEwOTgzNmRiOTc2M2I0 OTY2YmVkZi4uNzIxYzllNTNkZGIzMWRiYzJmYjZiYTE2Y2QyODJjNzE2ZDRkOGQ2ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA1LTE2ICBMaSBZaW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtj aHJvbWl1bV0gcnVuLXdlYmtpdC10ZXN0cyBjYW4ndCBiZSB3b3JrIGluIHVidW50dSAxMi4wNAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY1NjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB1YnVudHUg MTIuMDQsIHRoZSBwYWNrYWdlIHR0Zi10aGFpLXRsd2cgaW5zdGFsbCB0aGUgR2FydWRhLnR0ZiAK KyAgICAgICAgaW50byAvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3Rsd2cvR2FydWRhLnR0Ziwg bm90IC91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGhhaS9HYXJ1ZGEudHRmCisKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHA6CisgICAgICAgIChz ZXR1cEZvbnRjb25maWcpOgorCiAyMDEyLTA1LTE0ICBMdWtlIE1hY3BoZXJzb24gIDxtYWNwaGVy c29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbnRyb2R1Y2UgRU5BQkxFX0NTU19WQVJJQUJM RVMgY29tcGlsZSBmbGFnLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFNoZWxsTGludXguY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVz dFNoZWxsTGludXguY3BwCmluZGV4IDgyZGI2OWEyZmY5YWQ4ZGMzMTQxZDc3ZTBlMDA2Y2FmZDEw YzZjZmMuLjBkYTU1Zjc0M2JiMTU3Njk1MDU2YmI1ZDhhNDFiMjVjOGY5YWM3OTMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbExpbnV4LmNwcAorKysg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAKQEAgLTE1 NiwxMCArMTU2LDIxIEBAIHN0YXRpYyB2b2lkIHNldHVwRm9udGNvbmZpZygpCiAgICAgfTsKICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFycmF5c2l6ZShmb250cyk7ICsraSkgewogICAgICAg ICBpZiAoYWNjZXNzKGZvbnRzW2ldLCBSX09LKSkgewotICAgICAgICAgICAgZnByaW50ZihzdGRl cnIsICJZb3UgYXJlIG1pc3NpbmcgJXMuIFRyeSByZS1ydW5uaW5nIGJ1aWxkL2luc3RhbGwtYnVp bGQtZGVwcy5zaC4gQWxzbyBzZWUgIgorICAgICAgICAgICAgaWYgKCFzdHJjbXAoZm9udHNbaV0s ICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3RoYWkvR2FydWRhLnR0ZiIpKSB7CisgICAgICAg ICAgICAgICAgLy8gdHRmLXRoYWktdGx3ZyBwYWNrYWdlIHVzZXMgZGlmZmVyZW50IHBhdGggaW4g VWJ1bnR1IDEyLjA0LgorICAgICAgICAgICAgICAgIHN0YXRpYyBjb25zdCBjaGFyKiB0bHdnID0g Ii91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGx3Zy9HYXJ1ZGEudHRmIjsKKyAgICAgICAgICAg ICAgICBpZiAoYWNjZXNzKHRsd2csIFJfT0spKSB7CisgICAgICAgICAgICAgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiWW91IGFyZSBtaXNzaW5nICVzIG9yICVzLiBUcnkgcmUtcnVubmluZyBidWls ZC9pbnN0YWxsLWJ1aWxkLWRlcHMuc2guIEFsc28gc2VlICIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hyb21pdW0vd2lraS9M YXlvdXRUZXN0c0xpbnV4IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZv bnRzW2ldLCB0bHdnKTsKKyAgICAgICAgICAgICAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGZwcmludGYoc3Rk ZXJyLCAiWW91IGFyZSBtaXNzaW5nICVzLiBUcnkgcmUtcnVubmluZyBidWlsZC9pbnN0YWxsLWJ1 aWxkLWRlcHMuc2guIEFsc28gc2VlICIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaHR0 cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL3dpa2kvTGF5b3V0VGVzdHNMaW51eCIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9udHNbaV0pOwotICAgICAgICAgICAgZXhpdCgx KTsKKyAgICAgICAgICAgICAgICBleGl0KDEpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgICAgIGlmICghRmNDb25maWdBcHBGb250QWRkRmlsZShmb250Y2ZnLCAoRmNDaGFyOCAqKSBm b250c1tpXSkpIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGxvYWQg Zm9udCAlc1xuIiwgZm9udHNbaV0pOwo= 142175 2012-05-16 00:23:20 -0700 2012-05-17 06:02:01 -0700 Patch bug-86565-20120517152634.patch text/plain 2595 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGMyODVhM2Q5NDQ4ZTgzODVmNTEwOTgzNmRiOTc2M2I0 OTY2YmVkZi4uNzIxYzllNTNkZGIzMWRiYzJmYjZiYTE2Y2QyODJjNzE2ZDRkOGQ2ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA1LTE2ICBMaSBZaW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtj aHJvbWl1bV0gcnVuLXdlYmtpdC10ZXN0cyBjYW4ndCBiZSB3b3JrIGluIHVidW50dSAxMi4wNAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY1NjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB1YnVudHUg MTIuMDQsIHRoZSBwYWNrYWdlIHR0Zi10aGFpLXRsd2cgaW5zdGFsbCB0aGUgR2FydWRhLnR0ZiAK KyAgICAgICAgaW50byAvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3Rsd2cvR2FydWRhLnR0Ziwg bm90IC91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGhhaS9HYXJ1ZGEudHRmCisKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHA6CisgICAgICAgIChz ZXR1cEZvbnRjb25maWcpOgorCiAyMDEyLTA1LTE0ICBMdWtlIE1hY3BoZXJzb24gIDxtYWNwaGVy c29uQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbnRyb2R1Y2UgRU5BQkxFX0NTU19WQVJJQUJM RVMgY29tcGlsZSBmbGFnLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFNoZWxsTGludXguY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVz dFNoZWxsTGludXguY3BwCmluZGV4IDgyZGI2OWEyZmY5YWQ4ZGMzMTQxZDc3ZTBlMDA2Y2FmZDEw YzZjZmMuLjJjM2I3MDU2MzA5MWU4MDA4NWYxYjczNTJjMjE0OWU0YmViMGZmOTggMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbExpbnV4LmNwcAorKysg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAKQEAgLTE0 Nyw3ICsxNDcsNiBAQCBzdGF0aWMgdm9pZCBzZXR1cEZvbnRjb25maWcoKQogICAgICAgICAiL3Vz ci9zaGFyZS9mb250cy90cnVldHlwZS9tc3R0Y29yZWZvbnRzL1ZlcmRhbmFfQm9sZC50dGYiLAog ICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS9tc3R0Y29yZWZvbnRzL1ZlcmRhbmFf Qm9sZF9JdGFsaWMudHRmIiwKICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvbXN0 dGNvcmVmb250cy9WZXJkYW5hX0l0YWxpYy50dGYiLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250 cy90cnVldHlwZS90aGFpL0dhcnVkYS50dGYiLAogICAgICAgICAvLyBUaGUgRGVqYVZ1U2FucyBm b250IGlzIHVzZWQgYnkgdGhlIGNzczIuMSB0ZXN0cy4KICAgICAgICAgIi91c3Ivc2hhcmUvZm9u dHMvdHJ1ZXR5cGUvdHRmLWRlamF2dS9EZWphVnVTYW5zLnR0ZiIsCiAgICAgICAgICIvdXNyL3No YXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1pbmRpYy1mb250cy1jb3JlL2xvaGl0X2hpLnR0ZiIsCkBA IC0xNzEsNiArMTcwLDcgQEAgc3RhdGljIHZvaWQgc2V0dXBGb250Y29uZmlnKCkKICAgICAvLyBm ZXcgbGF5b3V0IHRlc3RzLgogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBvcHRpb25hbEZv bnRzW10gPSB7CiAgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1pbmRpYy1m b250cy1jb3JlL2xvaGl0X3BhLnR0ZiIsCisgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0 eXBlL3RoYWkvR2FydWRhLnR0ZiIsCiAgICAgfTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGFycmF5c2l6ZShvcHRpb25hbEZvbnRzKTsgKytpKSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIGZv bnQgPSBvcHRpb25hbEZvbnRzW2ldOwpAQCAtMTgwLDYgKzE4MCwxMCBAQCBzdGF0aWMgdm9pZCBz ZXR1cEZvbnRjb25maWcoKQogICAgICAgICAgICAgJiYgYWNjZXNzKGZvbnQsIFJfT0spIDwgMCkK ICAgICAgICAgICAgIGZvbnQgPSAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtcHVuamFi aS1mb250cy9sb2hpdF9wYS50dGYiOwogCisgICAgICAgIGlmICghc3RyY21wKGZvbnQsICIvdXNy L3NoYXJlL2ZvbnRzL3RydWV0eXBlL3RoYWkvR2FydWRhLnR0ZiIpCisgICAgICAgICAgICAmJiBh Y2Nlc3MoZm9udCwgUl9PSykgPCAwKQorICAgICAgICAgICAgZm9udCA9ICIvdXNyL3NoYXJlL2Zv bnRzL3RydWV0eXBlL3Rsd2cvR2FydWRhLnR0ZiI7CisKICAgICAgICAgaWYgKGFjY2Vzcyhmb250 LCBSX09LKSA8IDApIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiWW91IGFyZSBtaXNz aW5nICVzLiBXaXRob3V0IHRoaXMsIHNvbWUgbGF5b3V0IHRlc3RzIG1heSBmYWlsLiAiCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIlNlZSBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvY2hy b21pdW0vd2lraS9MYXlvdXRUZXN0c0xpbnV4ICIK 142460 2012-05-17 06:02:19 -0700 2012-05-17 06:11:41 -0700 Patch bug-86565-20120518210535.patch text/plain 4215 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGMyODVhM2Q5NDQ4ZTgzODVmNTEwOTgzNmRiOTc2M2I0 OTY2YmVkZi4uZTU0OTI5NTQ1NDM4ZmQyZGE2Yzc5NDBkY2IwYWMxMjA1OWMzOTBmNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTA1LTE4ICBMaSBZaW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtj aHJvbWl1bV0gcnVuLXdlYmtpdC10ZXN0cyBjYW4ndCB3b3JrIG9uIHVidW50dSAxMi4wNAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY1NjUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiB1YnVudHUgMTIu MDQsIHRoZSBwYWNrYWdlIHR0Zi10aGFpLXRsd2cgaW5zdGFsbCB0aGUgR2FydWRhLnR0ZgorICAg ICAgICBpbnRvIC91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGx3Zy9HYXJ1ZGEudHRmLCBub3Qg L3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90aGFpL0dhcnVkYS50dGYKKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbExpbnV4LmNwcDoKKyAgICAgICAgKGNoZWNr QW5kTG9hZEZvbnRGaWxlKToKKyAgICAgICAgKHNldHVwRm9udGNvbmZpZyk6CisKIDIwMTItMDUt MTQgIEx1a2UgTWFjcGhlcnNvbiAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEludHJvZHVjZSBFTkFCTEVfQ1NTX1ZBUklBQkxFUyBjb21waWxlIGZsYWcuCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAKaW5kZXggODJkYjY5 YTJmZjlhZDhkYzMxNDFkNzdlMGUwMDZjYWZkMTBjNmNmYy4uYTE5NDc2NzgxMGNhOGRlZGI2NGVl MDNhMjhkZWU5ZGNlOTFkNjIzOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFNoZWxsTGludXguY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbExpbnV4LmNwcApAQCAtODAsNiArODAsMjUgQEAgdm9pZCBUZXN0U2hlbGw6 OndhaXRUZXN0RmluaXNoZWQoKQogfQogCiAjaWYgIU9TKEFORFJPSUQpCitzdGF0aWMgYm9vbCBj aGVja0FuZExvYWRGb250RmlsZShGY0NvbmZpZyogZm9udGNmZywgY29uc3QgY2hhciogcGF0aDEs IGNvbnN0IGNoYXIqIHBhdGgyKQoreworICAgIGNvbnN0IGNoYXIqIGZvbnQgPSBwYXRoMTsKKyAg ICBpZihhY2Nlc3MoZm9udCwgUl9PSykgPCAwKSB7CisgICAgICAgIGZvbnQgPSBwYXRoMjsKKyAg ICAgICAgaWYoYWNjZXNzKGZvbnQsIFJfT0spIDwgMCkgeworICAgICAgICAgICAgZnByaW50Zihz dGRlcnIsICJZb3UgYXJlIG1pc3NpbmcgJXMgb3IgJXMuIFdpdGhvdXQgdGhpcywgc29tZSBsYXlv dXQgdGVzdHMgbWF5IGZhaWwuICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiU2VlIGh0 dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9jaHJvbWl1bS93aWtpL0xheW91dFRlc3RzTGludXggIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJmb3IgbW9yZS5cbiIsIHBhdGgxLCBwYXRoMik7 CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgaWYgKCFG Y0NvbmZpZ0FwcEZvbnRBZGRGaWxlKGZvbnRjZmcsIChGY0NoYXI4ICopIGZvbnQpKSB7CisgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGxvYWQgZm9udCAlc1xuIiwgZm9udCk7Cisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHN0YXRp YyB2b2lkIHNldHVwRm9udGNvbmZpZygpCiB7CiAgICAgLy8gV2Ugd2lzaCB0byBtYWtlIHRoZSBs YXlvdXQgdGVzdHMgcmVwcm9kdWNhYmxlIHdpdGggcmVzcGVjdCB0byBmb250cy4gU2tpYQpAQCAt MTQ3LDcgKzE2Niw2IEBAIHN0YXRpYyB2b2lkIHNldHVwRm9udGNvbmZpZygpCiAgICAgICAgICIv dXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL21zdHRjb3JlZm9udHMvVmVyZGFuYV9Cb2xkLnR0ZiIs CiAgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL21zdHRjb3JlZm9udHMvVmVyZGFu YV9Cb2xkX0l0YWxpYy50dGYiLAogICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS9t c3R0Y29yZWZvbnRzL1ZlcmRhbmFfSXRhbGljLnR0ZiIsCi0gICAgICAgICIvdXNyL3NoYXJlL2Zv bnRzL3RydWV0eXBlL3RoYWkvR2FydWRhLnR0ZiIsCiAgICAgICAgIC8vIFRoZSBEZWphVnVTYW5z IGZvbnQgaXMgdXNlZCBieSB0aGUgY3NzMi4xIHRlc3RzLgogICAgICAgICAiL3Vzci9zaGFyZS9m b250cy90cnVldHlwZS90dGYtZGVqYXZ1L0RlamFWdVNhbnMudHRmIiwKICAgICAgICAgIi91c3Iv c2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWluZGljLWZvbnRzLWNvcmUvbG9oaXRfaGkudHRmIiwK QEAgLTE2NywyOCArMTg1LDE0IEBAIHN0YXRpYyB2b2lkIHNldHVwRm9udGNvbmZpZygpCiAgICAg ICAgIH0KICAgICB9CiAKKyAgICBpZiAoIWNoZWNrQW5kTG9hZEZvbnRGaWxlKGZvbnRjZmcsICIv dXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3RoYWkvR2FydWRhLnR0ZiIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90bHdnL0dhcnVkYS50 dGYiKSkKKyAgICAgICAgZXhpdCgxKTsKKwogICAgIC8vIFdlIHNwZWNpYWwgY2FzZSB0aGVzZSBm b250cyBiZWNhdXNlIHRoZXkncmUgb25seSBuZWVkZWQgaW4gYQogICAgIC8vIGZldyBsYXlvdXQg dGVzdHMuCi0gICAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IG9wdGlvbmFsRm9udHNbXSA9IHsK LSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWluZGljLWZvbnRzLWNvcmUv bG9oaXRfcGEudHRmIiwKLSAgICB9OwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXJyYXlz aXplKG9wdGlvbmFsRm9udHMpOyArK2kpIHsKLSAgICAgICAgY29uc3QgY2hhciogZm9udCA9IG9w dGlvbmFsRm9udHNbaV07Ci0KLSAgICAgICAgLy8gVGhpcyBmb250IGNoYW5nZWQgcGF0aHMgYWNy b3NzIFVidW50dSByZWxlYXNlcywgc28gdHJ5IGNoZWNraW5nIGluIGJvdGggbG9jYXRpb25zLgot ICAgICAgICBpZiAoIXN0cmNtcChmb250LCAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYt aW5kaWMtZm9udHMtY29yZS9sb2hpdF9wYS50dGYiKQotICAgICAgICAgICAgJiYgYWNjZXNzKGZv bnQsIFJfT0spIDwgMCkKLSAgICAgICAgICAgIGZvbnQgPSAiL3Vzci9zaGFyZS9mb250cy90cnVl dHlwZS90dGYtcHVuamFiaS1mb250cy9sb2hpdF9wYS50dGYiOwotCi0gICAgICAgIGlmIChhY2Nl c3MoZm9udCwgUl9PSykgPCAwKSB7Ci0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIllvdSBh cmUgbWlzc2luZyAlcy4gV2l0aG91dCB0aGlzLCBzb21lIGxheW91dCB0ZXN0cyBtYXkgZmFpbC4g IgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTZWUgaHR0cDovL2NvZGUuZ29vZ2xlLmNv bS9wL2Nocm9taXVtL3dpa2kvTGF5b3V0VGVzdHNMaW51eCAiCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgImZvciBtb3JlLlxuIiwgZm9udCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoIUZjQ29u ZmlnQXBwRm9udEFkZEZpbGUoZm9udGNmZywgKEZjQ2hhcjggKikgZm9udCkpIHsKLSAgICAgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGxvYWQgZm9udCAlc1xuIiwgZm9udCk7Ci0g ICAgICAgICAgICBleGl0KDEpOwotICAgICAgICB9Ci0gICAgfQorICAgIGNoZWNrQW5kTG9hZEZv bnRGaWxlKGZvbnRjZmcsICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1pbmRpYy1mb250 cy1jb3JlL2xvaGl0X3BhLnR0ZiIsIAorICAgICAgICAgICAgICAgICAgICAgICAgICIvdXNyL3No YXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1wdW5qYWJpLWZvbnRzL2xvaGl0X3BhLnR0ZiIpOwogCiAg ICAgLy8gQWxzbyBsb2FkIHRoZSBsYXlvdXQtdGVzdC1zcGVjaWZpYyAiQWhlbSIgZm9udC4KICAg ICBzdGQ6OnN0cmluZyBhaGVtUGF0aCA9IGRydERpclBhdGggKyAiQUhFTV9fX18uVFRGIjsK 142461 2012-05-17 06:11:52 -0700 2012-05-17 07:08:14 -0700 Patch bug-86565-20120518211507.patch text/plain 4217 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGMyODVhM2Q5NDQ4ZTgzODVmNTEwOTgzNmRiOTc2M2I0 OTY2YmVkZi4uZTU0OTI5NTQ1NDM4ZmQyZGE2Yzc5NDBkY2IwYWMxMjA1OWMzOTBmNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTA1LTE4ICBMaSBZaW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtj aHJvbWl1bV0gcnVuLXdlYmtpdC10ZXN0cyBjYW4ndCB3b3JrIG9uIHVidW50dSAxMi4wNAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY1NjUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiB1YnVudHUgMTIu MDQsIHRoZSBwYWNrYWdlIHR0Zi10aGFpLXRsd2cgaW5zdGFsbCB0aGUgR2FydWRhLnR0ZgorICAg ICAgICBpbnRvIC91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGx3Zy9HYXJ1ZGEudHRmLCBub3Qg L3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90aGFpL0dhcnVkYS50dGYKKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbExpbnV4LmNwcDoKKyAgICAgICAgKGNoZWNr QW5kTG9hZEZvbnRGaWxlKToKKyAgICAgICAgKHNldHVwRm9udGNvbmZpZyk6CisKIDIwMTItMDUt MTQgIEx1a2UgTWFjcGhlcnNvbiAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEludHJvZHVjZSBFTkFCTEVfQ1NTX1ZBUklBQkxFUyBjb21waWxlIGZsYWcuCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxMaW51eC5jcHAKaW5kZXggODJkYjY5 YTJmZjlhZDhkYzMxNDFkNzdlMGUwMDZjYWZkMTBjNmNmYy4uYjgyNTliNmU3ODA1YTMxYjlmNzRk YTA1ZTc3M2FlZDg4YmMzM2VkMiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFNoZWxsTGludXguY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbExpbnV4LmNwcApAQCAtODAsNiArODAsMjUgQEAgdm9pZCBUZXN0U2hlbGw6 OndhaXRUZXN0RmluaXNoZWQoKQogfQogCiAjaWYgIU9TKEFORFJPSUQpCitzdGF0aWMgYm9vbCBj aGVja0FuZExvYWRGb250RmlsZShGY0NvbmZpZyogZm9udGNmZywgY29uc3QgY2hhciogcGF0aDEs IGNvbnN0IGNoYXIqIHBhdGgyKQoreworICAgIGNvbnN0IGNoYXIqIGZvbnQgPSBwYXRoMTsKKyAg ICBpZiAoYWNjZXNzKGZvbnQsIFJfT0spIDwgMCkgeworICAgICAgICBmb250ID0gcGF0aDI7Cisg ICAgICAgIGlmIChhY2Nlc3MoZm9udCwgUl9PSykgPCAwKSB7CisgICAgICAgICAgICBmcHJpbnRm KHN0ZGVyciwgIllvdSBhcmUgbWlzc2luZyAlcyBvciAlcy4gV2l0aG91dCB0aGlzLCBzb21lIGxh eW91dCB0ZXN0cyBtYXkgZmFpbC4gIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTZWUg aHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL3dpa2kvTGF5b3V0VGVzdHNMaW51eCAi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgImZvciBtb3JlLlxuIiwgcGF0aDEsIHBhdGgy KTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKyAgICBpZiAo IUZjQ29uZmlnQXBwRm9udEFkZEZpbGUoZm9udGNmZywgKEZjQ2hhcjggKikgZm9udCkpIHsKKyAg ICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gbG9hZCBmb250ICVzXG4iLCBmb250KTsK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogc3Rh dGljIHZvaWQgc2V0dXBGb250Y29uZmlnKCkKIHsKICAgICAvLyBXZSB3aXNoIHRvIG1ha2UgdGhl IGxheW91dCB0ZXN0cyByZXByb2R1Y2FibGUgd2l0aCByZXNwZWN0IHRvIGZvbnRzLiBTa2lhCkBA IC0xNDcsNyArMTY2LDYgQEAgc3RhdGljIHZvaWQgc2V0dXBGb250Y29uZmlnKCkKICAgICAgICAg Ii91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvbXN0dGNvcmVmb250cy9WZXJkYW5hX0JvbGQudHRm IiwKICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvbXN0dGNvcmVmb250cy9WZXJk YW5hX0JvbGRfSXRhbGljLnR0ZiIsCiAgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBl L21zdHRjb3JlZm9udHMvVmVyZGFuYV9JdGFsaWMudHRmIiwKLSAgICAgICAgIi91c3Ivc2hhcmUv Zm9udHMvdHJ1ZXR5cGUvdGhhaS9HYXJ1ZGEudHRmIiwKICAgICAgICAgLy8gVGhlIERlamFWdVNh bnMgZm9udCBpcyB1c2VkIGJ5IHRoZSBjc3MyLjEgdGVzdHMuCiAgICAgICAgICIvdXNyL3NoYXJl L2ZvbnRzL3RydWV0eXBlL3R0Zi1kZWphdnUvRGVqYVZ1U2Fucy50dGYiLAogICAgICAgICAiL3Vz ci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtaW5kaWMtZm9udHMtY29yZS9sb2hpdF9oaS50dGYi LApAQCAtMTY3LDI4ICsxODUsMTQgQEAgc3RhdGljIHZvaWQgc2V0dXBGb250Y29uZmlnKCkKICAg ICAgICAgfQogICAgIH0KIAorICAgIGlmICghY2hlY2tBbmRMb2FkRm9udEZpbGUoZm9udGNmZywg Ii91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdGhhaS9HYXJ1ZGEudHRmIiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3Rsd2cvR2FydWRh LnR0ZiIpKQorICAgICAgICBleGl0KDEpOworCiAgICAgLy8gV2Ugc3BlY2lhbCBjYXNlIHRoZXNl IGZvbnRzIGJlY2F1c2UgdGhleSdyZSBvbmx5IG5lZWRlZCBpbiBhCiAgICAgLy8gZmV3IGxheW91 dCB0ZXN0cy4KLSAgICBzdGF0aWMgY29uc3QgY2hhciogY29uc3Qgb3B0aW9uYWxGb250c1tdID0g ewotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtaW5kaWMtZm9udHMtY29y ZS9sb2hpdF9wYS50dGYiLAotICAgIH07Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhcnJh eXNpemUob3B0aW9uYWxGb250cyk7ICsraSkgewotICAgICAgICBjb25zdCBjaGFyKiBmb250ID0g b3B0aW9uYWxGb250c1tpXTsKLQotICAgICAgICAvLyBUaGlzIGZvbnQgY2hhbmdlZCBwYXRocyBh Y3Jvc3MgVWJ1bnR1IHJlbGVhc2VzLCBzbyB0cnkgY2hlY2tpbmcgaW4gYm90aCBsb2NhdGlvbnMu Ci0gICAgICAgIGlmICghc3RyY21wKGZvbnQsICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0 Zi1pbmRpYy1mb250cy1jb3JlL2xvaGl0X3BhLnR0ZiIpCi0gICAgICAgICAgICAmJiBhY2Nlc3Mo Zm9udCwgUl9PSykgPCAwKQotICAgICAgICAgICAgZm9udCA9ICIvdXNyL3NoYXJlL2ZvbnRzL3Ry dWV0eXBlL3R0Zi1wdW5qYWJpLWZvbnRzL2xvaGl0X3BhLnR0ZiI7Ci0KLSAgICAgICAgaWYgKGFj Y2Vzcyhmb250LCBSX09LKSA8IDApIHsKLSAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiWW91 IGFyZSBtaXNzaW5nICVzLiBXaXRob3V0IHRoaXMsIHNvbWUgbGF5b3V0IHRlc3RzIG1heSBmYWls LiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIlNlZSBodHRwOi8vY29kZS5nb29nbGUu Y29tL3AvY2hyb21pdW0vd2lraS9MYXlvdXRUZXN0c0xpbnV4ICIKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiZm9yIG1vcmUuXG4iLCBmb250KTsKLSAgICAgICAgfSBlbHNlIGlmICghRmND b25maWdBcHBGb250QWRkRmlsZShmb250Y2ZnLCAoRmNDaGFyOCAqKSBmb250KSkgewotICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gbG9hZCBmb250ICVzXG4iLCBmb250KTsK LSAgICAgICAgICAgIGV4aXQoMSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgY2hlY2tBbmRMb2Fk Rm9udEZpbGUoZm9udGNmZywgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWluZGljLWZv bnRzLWNvcmUvbG9oaXRfcGEudHRmIiwgCisgICAgICAgICAgICAgICAgICAgICAgICAgIi91c3Iv c2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLXB1bmphYmktZm9udHMvbG9oaXRfcGEudHRmIik7CiAK ICAgICAvLyBBbHNvIGxvYWQgdGhlIGxheW91dC10ZXN0LXNwZWNpZmljICJBaGVtIiBmb250Lgog ICAgIHN0ZDo6c3RyaW5nIGFoZW1QYXRoID0gZHJ0RGlyUGF0aCArICJBSEVNX19fXy5UVEYiOwo=