55036 2011-02-23 04:26:51 -0800 [Qt] FontCache::createFontPlatformData() is broken, a default font is returned even if the family does not match 2011-11-12 04:58:25 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Major --- 36351 67131 1 pierre.rossi pierre.rossi ademar b.brachaczek benjamin cshu jesus kling laszlo.gombos loic.yhuel ossy pierre.rossi rectalogic robert oldest_to_newest 356021 0 pierre.rossi 2011-02-23 04:26:51 -0800 Since QFont always falls back to something, QtWebKit currently only tries the first font family from a given CSS. Depending on the fonts installed, this is something that can be reproduced (for me at least) on websites such as: http://whatthecommit.com/ http://code.google.com/more/table/ 356022 1 benjamin 2011-02-23 04:30:20 -0800 Assigning to Pierre since he is already working on a fix. 356024 2 83471 pierre.rossi 2011-02-23 04:38:00 -0800 Created attachment 83471 proposed fix (depends on another patch yet to land in Qt master) 356819 3 83471 eric 2011-02-24 02:57:24 -0800 Comment on attachment 83471 proposed fix (depends on another patch yet to land in Qt master) I don't understand what this is doing. How do we test this? 357319 4 pierre.rossi 2011-02-24 13:10:11 -0800 (In reply to comment #3) > (From update of attachment 83471 [details]) > I don't understand what this is doing. How do we test this? The issue in QtWebKit (and subsequently Rekonq) is that QFont always falls back to something, and eventually it might be the default font, and not what we want at all. In the examples I cited, take whatthecommit.com for instance: on my system, the request for "Lucida Console" defaults to "DejaVu Sans", so it never even tries "Courier New" and the rendering looks very different from what I get in Chromium or Firefox. As for the testing part, well I believe there are tests already, and I suspect a bunch of them might break because of this, but that would be because the "expected" results were not quite correct in the first place IMHO. 357322 5 pierre.rossi 2011-02-24 13:11:58 -0800 (In reply to comment #3) > (From update of attachment 83471 [details]) > I don't understand what this is doing. How do we test this? Oh, I forgot to point there: http://bugreports.qt.nokia.com/browse/QTBUG-15575 to find the patches required on top of Qt for this to work. 384821 6 benjamin 2011-04-13 06:13:12 -0700 Adding as nice to have for QtWebKit 2.2 release. If the API is in Qt, it would be stupid not to fix the bug. 415804 7 pierre.rossi 2011-06-06 06:32:19 -0700 Unfortunately that's not something that can be fixed easily for 2.2 at least since 4.8 is feature frozen and I didn't push to add the required function because of the new raw font approach that should have made that useless. 440906 8 101713 pierre.rossi 2011-07-22 04:58:38 -0700 Created attachment 101713 patch v2 This might require synchronizing for the the bots since the #ifdef will break the build until Qt is bumped to have QFontDatabase::hasFamily(). And an obscene number of layout tests results are going to need to be updated as a result, not sure how to do that properly. 447737 9 101713 benjamin 2011-08-07 05:15:45 -0700 Comment on attachment 101713 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=101713&action=review > Source/WebCore/ChangeLog:16 > + No new tests. (OOPS!) Remove this line. Instead, you should write this is covered by existing tests. 447738 10 benjamin 2011-08-07 05:23:41 -0700 Andreas, Robert, any comment? 447741 11 robert 2011-08-07 05:50:19 -0700 Hi Pierre, This is the same as 36351, I think you should add the test from there or some other suitable test. Otherwise looks fine to me! 447742 12 101713 robert 2011-08-07 05:52:26 -0700 Comment on attachment 101713 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=101713&action=review > Source/WebCore/ChangeLog:9 > + the requestfor a given font family can be s/requestfor/request for 447750 13 pierre.rossi 2011-08-07 08:28:53 -0700 (In reply to comment #11) > Hi Pierre, > This is the same as 36351, I think you should add the test from there or some other suitable test. Otherwise looks fine to me! I'm afraid that test won't work with just the font fallback getting fixed, but is going to with another patch I have in store (essentially it just requires loading the data we get with QRawFont). Can I steal it for that other change then ? 447773 14 robert 2011-08-07 14:11:05 -0700 (In reply to comment #13) > (In reply to comment #11) > > Hi Pierre, > > This is the same as 36351, I think you should add the test from there or some other suitable test. Otherwise looks fine to me! > > I'm afraid that test won't work with just the font fallback getting fixed, but is going to with another patch I have in store (essentially it just requires loading the data we get with QRawFont). Can I steal it for that other change then ? Oh OK. The test I'm referring to is fast/css/font-face-invalid-local-source.html in the patch, btw. I would have expected this change to make it pass, but it's been a while. 447965 15 103235 pierre.rossi 2011-08-08 05:46:10 -0700 Created attachment 103235 Patch Ok then, just changed the ChangeLog about tests. 448553 16 103235 kling 2011-08-09 06:33:31 -0700 Comment on attachment 103235 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103235&action=review r- to get some more polish up in here. :) > Source/WebCore/ChangeLog:3 > + Fix the QFont fallback issue. That could mean a lot of things. The bug title would fit very nicely here instead. > Source/WebCore/ChangeLog:12 > + This is a showstopper to get webfonts working > + properly in QtWebKit. This is bug tracker talk, and can be excluded from the ChangeLog. > Source/WebCore/ChangeLog:18 > + This change should be covered by existing tests, > + but there's a good chance some of these tests > + will in turn need to be fixed. We should strive to be more certain in ChangeLog entries. Run the tests with your change and find out what breaks, then (if applicable) include the updated qt-4.8 baselines in the patch. > Source/WebCore/platform/graphics/qt/FontCacheQt.cpp:114 > +#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) > + QFontDatabase db; > + if (!db.hasFamily(familyName)) > + return 0; > +#endif This looks good to me. Is the API available on the Qt-4.8 used by our bots though? 450864 17 103862 rectalogic 2011-08-13 11:15:27 -0700 Created attachment 103862 fix using QFont::exactMatch I think my bug 66186 is a duplicate of this, I really need a fix that works with Qt 4.7 for that. Attached patch uses QFont::exactMatch() on the FontPlatformData::font() to check if it is the font we asked for, and return 0 if not. 450867 18 rectalogic 2011-08-13 11:16:26 -0700 *** Bug 66186 has been marked as a duplicate of this bug. *** 450896 19 103862 rectalogic 2011-08-13 14:57:55 -0700 Comment on attachment 103862 fix using QFont::exactMatch Never mind, just read the discussion in bug 36351 on why exactMatch() won't work. 451248 20 pierre.rossi 2011-08-15 13:33:31 -0700 (In reply to comment #16) > > Source/WebCore/ChangeLog:18 > > + This change should be covered by existing tests, > > + but there's a good chance some of these tests > > + will in turn need to be fixed. > > We should strive to be more certain in ChangeLog entries. > Run the tests with your change and find out what breaks, then (if applicable) include the updated qt-4.8 baselines in the patch. Agreed, I just remembered it made the layout tests unhappy. Now I re-ran the tests and it breaks more than four thousand of them. Is there a nice way to update all of that ? 451293 21 benjamin 2011-08-15 14:29:01 -0700 (In reply to comment #20) > (In reply to comment #16) > > > > Source/WebCore/ChangeLog:18 > > > + This change should be covered by existing tests, > > > + but there's a good chance some of these tests > > > + will in turn need to be fixed. > > > > We should strive to be more certain in ChangeLog entries. > > Run the tests with your change and find out what breaks, then (if applicable) include the updated qt-4.8 baselines in the patch. > > Agreed, I just remembered it made the layout tests unhappy. Now I re-ran the tests and it breaks more than four thousand of them. Is there a nice way to update all of that ? You can ask Ossy for help, he has a talent at keeping bots happy ;) But I think the comment here is more that the Changelog is not good enough. It is your job to make sure a patch is tested correctly. Then you detail it in the Changelog. Here the Changelog reads like you have no clue if the patch is tested properly. 451307 22 robert 2011-08-15 14:49:21 -0700 4000 sounds like too many to be right - the tests must be rendering with a different (possibly more accurate) font now. The best approach may be to patch DumpRenderTree to ensure the same fonts as before are used (for now). Normally you would use the QBat-VM in a case like this: http://webkit.sed.hu/blog/20101028/qtwebkit-builder-and-tester-virtual-machine But it doesn't have a 4.8 environment. You should post a link to some of the failures maybe, in case there's something else wrong. 451611 23 104041 pierre.rossi 2011-08-16 07:58:21 -0700 Created attachment 104041 Patch From looking at the results, I think there are so many tests effected by a change in font matching and hence font metrics, 4000 might not be that shocking after all. 451625 24 104041 pierre.rossi 2011-08-16 08:16:16 -0700 Comment on attachment 104041 Patch The 4.8 version on the bot is too old for now, so I guess this will have to wait a little longer. 453743 25 benjamin 2011-08-19 04:45:47 -0700 (In reply to comment #24) > (From update of attachment 104041 [details]) > The 4.8 version on the bot is too old for now, so I guess this will have to wait a little longer. You can land something now and update the results when the bots get updated. 454528 26 104041 kling 2011-08-22 04:12:26 -0700 Comment on attachment 104041 Patch r=me Do exercise caution (with regard to the bots) when landing this. 463334 27 ossy 2011-09-07 07:12:52 -0700 Unfortunately it is more complex problem that I thought previously. :(( I sent a mail to webkit-qt mailing list about it: https://lists.webkit.org/pipermail/webkit-qt/2011-September/001864.html 464007 28 ademar 2011-09-08 06:03:55 -0700 Check also this upstream Qt bug: https://bugreports.qt.nokia.com/browse/QTBUG-21036 488241 29 ossy 2011-10-21 00:21:06 -0700 Patch landed in: http://trac.webkit.org/changeset/97990 ~6000 rebased expected files landed in: http://trac.webkit.org/changeset/97994 http://trac.webkit.org/changeset/97995 http://trac.webkit.org/changeset/98015 http://trac.webkit.org/changeset/98018 http://trac.webkit.org/changeset/98072 http://trac.webkit.org/changeset/98078 83471 2011-02-23 04:38:00 -0800 2011-07-22 04:58:38 -0700 proposed fix (depends on another patch yet to land in Qt master) webkit-font-fallback.patch text/plain 1654 pierre.rossi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjUxOWZiZi4uYTU2ZDBhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wMi0yMyAgUGllcnJlIFJvc3Np ICA8cGllcnJlLnJvc3NpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIEZvbnQgZmFsbGJhY2sgaXMgYnJva2VuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTAzNgorCisgICAgICAg IEZyb20gUXQgNC44IG9uLCB0aGVyZSdzIGFuIEFQSSB0byBjaGVjayBpZiB0aGUgZm9udCBtYXRj aGVzCisgICAgICAgIHRoZSByZXF1ZXN0ZWQgZmFtaWx5LCB0aGF0IHNob3VsZCBtYWtlIHRoaW5n cyBhIGJpdCBiZXR0ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2Fj aGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9y bURhdGEpOgorCiAyMDEwLTExLTI2ICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcAppbmRleCBjNTljNTIzLi4zOWVlNzk5 IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcApAQCAt MzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSA8dXRp bGl0eT4KICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0 cmluZ0hhc2guaD4KIApAQCAtNjYsNyArNjcsMTIgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0 c0luRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3Rvcjx1bnNpZ25lZD4mKQogCiBGb250 UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5 TmFtZSkKIHsKLSAgICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9u LCBmYW1pbHlOYW1lKTsKKyAgICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcmVzdWx0ID0gYWRv cHRQdHIobmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBmYW1pbHlOYW1lKSk7 CisjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCisgICAgaWYgKCFy ZXN1bHQtPmZvbnQoKS5mYW1pbHlNYXRjaCgpKQorICAgICAgICByZXR1cm4gMDsKKyNlbmRpZgor ICAgIHJldHVybiByZXN1bHQubGVha1B0cigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl Cg== 101713 2011-07-22 04:58:38 -0700 2011-08-08 05:46:00 -0700 patch v2 0001-Fix-the-QFont-fallback-issue.patch text/plain 2374 pierre.rossi RnJvbSA0NmFkZmJhNmQ5NjQ0YTMwYzA3NzQ1ZTdjMDg3MTRhNmRiMWZmMzJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaWVycmUgUm9zc2kgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+ CkRhdGU6IFR1ZSwgMTkgSnVsIDIwMTEgMjE6MjE6MjAgKzAyMDAKU3ViamVjdDogRml4IHRoZSBR Rm9udCBmYWxsYmFjayBpc3N1ZS4KCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrCiAuLi4vV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAgICB8ICAgIDYgKysrKysK IDIgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggNDVkYTc2Mi4uOTU1MWFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisy MDExLTA3LTIyICBQaWVycmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAg ICAgIEZpeCB0aGUgUUZvbnQgZmFsbGJhY2sgaXNzdWUuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MDM2CisKKyAgICAgICAgVGhlIHByb2JsZW0g aGVyZSB3YXMgdGhhdCBhIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAgICAgb2JqZWN0IGlzIGFsd2F5 cyBjcmVhdGVkLCByZWdhcmRsZXNzIG9mIHdoZXRoZXIKKyAgICAgICAgdGhlIHJlcXVlc3Rmb3Ig YSBnaXZlbiBmb250IGZhbWlseSBjYW4gYmUKKyAgICAgICAgc2F0aXNmaWVkIG9yIG5vdC4KKyAg ICAgICAgVGhpcyBpcyBhIHNob3dzdG9wcGVyIHRvIGdldCB3ZWJmb250cyB3b3JraW5nCisgICAg ICAgIHByb3Blcmx5IGluIFF0V2ViS2l0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorICAgICAgICBNb3JlIGlt cG9ydGFudGx5LCB3aXRoIHRoYXQgc29ydCBvZiBhIHNjb3BlLAorICAgICAgICBhIGxvdCBvZiB0 aGUgZXhpc3Rpbmcgb25lcyBhcmUgbW9zdCBsaWtlbHkgZ29pbmcKKyAgICAgICAgdG8gbmVlZCB0 d2Vha2luZy4gSSBzdXNwZWN0IGl0IGNvdWxkIGRlcGVuZCBvbgorICAgICAgICB0aGUgZm9udHMg YXZhaWxhYmxlIG9uIHRoZSBib3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQv Rm9udENhY2hlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250 UGxhdGZvcm1EYXRhKToKKwogMjAxMS0wNy0xOSAgTHVrZSBNYWNwaGVyc29uICAgPG1hY3BoZXJz b25AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEltcGxlbWVudCBDU1NQcm9wZXJ0eVdlYmtpdFBl cnNwZWN0aXZlT3JpZ2luIGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcAppbmRleCA3MWNm M2VhLi42YzRkZDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9Gb250Q2FjaGVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udENhY2hlUXQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSA8d3RmL3Rl eHQvU3RyaW5nSGFzaC5oPgogCiAjaW5jbHVkZSA8UUZvbnQ+CisjaW5jbHVkZSA8UUZvbnREYXRh YmFzZT4KICNpZiBIQVZFKFFSQVdGT05UKQogI2luY2x1ZGUgPFFUZXh0TGF5b3V0PgogI2VuZGlm CkBAIC0xMDYsNiArMTA3LDExIEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWlseShj b25zdCBBdG9taWNTdHJpbmcmLCBWZWN0b3I8dW5zaWduZWQ+JikKIAogRm9udFBsYXRmb3JtRGF0 YSogRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlv biYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUpCiB7Cisj aWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCisgICAgUUZvbnREYXRh YmFzZSBkYjsKKyAgICBpZiAoIWRiLmhhc0ZhbWlseShmYW1pbHlOYW1lKSkKKyAgICAgICAgcmV0 dXJuIDA7CisjZW5kaWYKICAgICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2Ny aXB0aW9uLCBmYW1pbHlOYW1lKTsKIH0KIAotLSAKMS43LjYKCg== 103235 2011-08-08 05:46:10 -0700 2011-08-16 07:58:09 -0700 Patch bug-55036-20110808144608.patch text/plain 2009 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZDM0N2JlM2FjNGVjNTZh Nzk0M2E1ZTQxNjkyNmYzMGJiMjQ1MGM2Li5jNGY1NDljMmY4NGEwZmU1YWQ1MGY5MGJlMjBlOWE0 MWQzMjJhZmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDgtMDcgIFBpZXJy ZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgRml4IHRoZSBRRm9u dCBmYWxsYmFjayBpc3N1ZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTUwMzYKKworICAgICAgICBUaGUgcHJvYmxlbSBoZXJlIHdhcyB0aGF0IGEg Rm9udFBsYXRmb3JtRGF0YQorICAgICAgICBvYmplY3QgaXMgYWx3YXlzIGNyZWF0ZWQsIHJlZ2Fy ZGxlc3Mgb2Ygd2hldGhlcgorICAgICAgICB0aGUgcmVxdWVzdCBmb3IgYSBnaXZlbiBmb250IGZh bWlseSBjYW4gYmUKKyAgICAgICAgc2F0aXNmaWVkIG9yIG5vdC4KKyAgICAgICAgVGhpcyBpcyBh IHNob3dzdG9wcGVyIHRvIGdldCB3ZWJmb250cyB3b3JraW5nCisgICAgICAgIHByb3Blcmx5IGlu IFF0V2ViS2l0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgY2hhbmdlIHNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLAorICAg ICAgICBidXQgdGhlcmUncyBhIGdvb2QgY2hhbmNlIHNvbWUgb2YgdGhlc2UgdGVzdHMKKyAgICAg ICAgd2lsbCBpbiB0dXJuIG5lZWQgdG8gYmUgZml4ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6 OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDExLTA4LTA2ICBLZW5pY2hpIElzaGliYXNo aSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTaG91bGQgdXNlIEMrKy1zdHlsZSBj YXN0IGluIENTU1BhcnNlci5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcAppbmRleCA3MWNmM2VhZTI0YWJiZmYxNjY0MjIwYmZh ZjlhMWE3MTVmOWMwZWU2Li42YzRkZDdmNTRhNjdiMTlhMGEwYTYyYjg1NGUyMWFmN2MyZjAzYTE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2Fj aGVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENh Y2hlUXQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFz aC5oPgogCiAjaW5jbHVkZSA8UUZvbnQ+CisjaW5jbHVkZSA8UUZvbnREYXRhYmFzZT4KICNpZiBI QVZFKFFSQVdGT05UKQogI2luY2x1ZGUgPFFUZXh0TGF5b3V0PgogI2VuZGlmCkBAIC0xMDYsNiAr MTA3LDExIEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWlseShjb25zdCBBdG9taWNT dHJpbmcmLCBWZWN0b3I8dW5zaWduZWQ+JikKIAogRm9udFBsYXRmb3JtRGF0YSogRm9udENhY2hl OjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny aXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUpCiB7CisjaWYgUVRfVkVSU0lP TiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCisgICAgUUZvbnREYXRhYmFzZSBkYjsKKyAg ICBpZiAoIWRiLmhhc0ZhbWlseShmYW1pbHlOYW1lKSkKKyAgICAgICAgcmV0dXJuIDA7CisjZW5k aWYKICAgICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBmYW1p bHlOYW1lKTsKIH0KIAo= 103862 2011-08-13 11:15:27 -0700 2011-08-16 07:58:14 -0700 fix using QFont::exactMatch fallback.diff text/plain 1653 rectalogic ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZTJhNjVlLi4yYzgxNGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDgtMTMgIEFuZHJldyBXYXNvbiAgPHJlY3RhbG9naWNAcmVjdGFsb2dpYy5jb20+ CisKKyAgICAgICAgW1F0XSBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoKSBpcyBi cm9rZW4sIGEgZGVmYXVsdCBmb250IGlzIHJldHVybmVkIGV2ZW4gaWYgdGhlIGZhbWlseSBkb2Vz IG5vdCBtYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTUwMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTaG91bGQgYmUgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICBDaGVjayBR Rm9udDo6ZXhhY3RNYXRjaCgpIG9uIGZvbnQgdXNlZCBieSBGb250UGxhdGZvcm1EYXRhCisgICAg ICAgIHRvIG1ha2Ugc3VyZSBpdCBpcyB0aGUgZm9udCByZXF1ZXN0ZWQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG b250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorCiAyMDExLTA4LTEyICBObydhbSBS b3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XVtSRUdS RVNTSU9OXSBjb21wb3NpdGVkIGNvbnRlbnQgZG9lc24ndCByZW5kZXIgc2luY2UgcjkyNjUxCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVR dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5j cHAKaW5kZXggNzFjZjNlYS4uMDQzZGNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcApAQCAtMTA2LDcgKzEwNiwxMiBAQCB2 b2lkIEZvbnRDYWNoZTo6Z2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiwgVmVj dG9yPHVuc2lnbmVkPiYpCiAKIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9u dFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29u c3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1lKQogewotICAgIHJldHVybiBuZXcgRm9udFBsYXRm b3JtRGF0YShmb250RGVzY3JpcHRpb24sIGZhbWlseU5hbWUpOworICAgIEZvbnRQbGF0Zm9ybURh dGEqIHBsYXRmb3JtRGF0YSA9IG5ldyBGb250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbiwg ZmFtaWx5TmFtZSk7CisgICAgaWYgKCFwbGF0Zm9ybURhdGEtPmZvbnQoKS5leGFjdE1hdGNoKCkp IHsKKyAgICAgICAgZGVsZXRlIHBsYXRmb3JtRGF0YTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAg fQorICAgIHJldHVybiBwbGF0Zm9ybURhdGE7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 104041 2011-08-16 07:58:21 -0700 2011-10-21 00:21:26 -0700 Patch bug-55036-20110816165836.patch text/plain 1909 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogOTMwNDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ZGI3ODJmZmFjZGQ3Njk4 OTg2ZDBhNmM5MDNlNjQ4NzdkNDRjYzM4Li4zZDNlYjE0NmZmZGNhYWUyZWNhMDgzYzhjZGQ5Yjcy ZDU4YzYzMTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDgtMTUgIFBpZXJy ZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0XSBGb250Q2Fj aGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoKSBpcyBicm9rZW4sIGEgZGVmYXVsdCBmb250IGlz IHJldHVybmVkCisgICAgICAgIGV2ZW4gaWYgdGhlIGZhbWlseSBkb2VzIG5vdCBtYXRjaC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MDM2CisKKyAg ICAgICAgVGhlIHByb2JsZW0gaGVyZSB3YXMgdGhhdCBhIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAg ICAgb2JqZWN0IGlzIGFsd2F5cyBjcmVhdGVkLCByZWdhcmRsZXNzIG9mIHdoZXRoZXIKKyAgICAg ICAgdGhlIHJlcXVlc3QgZm9yIGEgZ2l2ZW4gZm9udCBmYW1pbHkgY2FuIGJlCisgICAgICAgIHNh dGlzZmllZCBvciBub3QuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6CisKIDIwMTEtMDgtMTUgIEFkYW0gUm9iZW4gIDxh cm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBhbiBpbnN0YW5jZSBvZiBwYWdlU2Nh bGVGYWN0b3JDaGFuZ2VkIEkgbWlzc2VkIGluIHI5MzA0MApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3BwCmluZGV4IDcxY2YzZWFlMjRh YmJmZjE2NjQyMjBiZmFmOWExYTcxNWY5YzBlZTYuLjZjNGRkN2Y1NGE2N2IxOWEwYTBhNjJiODU0 ZTIxYWY3YzJmMDNhMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0ZvbnRDYWNoZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9xdC9Gb250Q2FjaGVRdC5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlIDx3dGYv dGV4dC9TdHJpbmdIYXNoLmg+CiAKICNpbmNsdWRlIDxRRm9udD4KKyNpbmNsdWRlIDxRRm9udERh dGFiYXNlPgogI2lmIEhBVkUoUVJBV0ZPTlQpCiAjaW5jbHVkZSA8UVRleHRMYXlvdXQ+CiAjZW5k aWYKQEAgLTEwNiw2ICsxMDcsMTEgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5 KGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3Rvcjx1bnNpZ25lZD4mKQogCiBGb250UGxhdGZvcm1E YXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkKIHsK KyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgOCwgMCkKKyAgICBRRm9udERh dGFiYXNlIGRiOworICAgIGlmICghZGIuaGFzRmFtaWx5KGZhbWlseU5hbWUpKQorICAgICAgICBy ZXR1cm4gMDsKKyNlbmRpZgogICAgIHJldHVybiBuZXcgRm9udFBsYXRmb3JtRGF0YShmb250RGVz Y3JpcHRpb24sIGZhbWlseU5hbWUpOwogfQogCg==