35569 2010-03-02 02:32:28 -0800 [Qt] Avoid calling QFont::detach too often from FontQt 2010-03-04 04:30:10 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zecke webkit-unassigned webkit.review.bot oldest_to_newest 194992 0 zecke 2010-03-02 02:32:28 -0800 Currently the QFont Font::font() method tries to apply the wordspacing and letterspacing set on the font. This value is not stored in the FontPlatformData and must be set on the QFont each time, also we try to have the actual font data not in WebCore::Font. This creates at least one issue: We have to apply the word and letter spacing each time which will always certainly end up in a call to QFont::detach. One solution would be to put a QFont into the WebCore::Font but this is a against the separation we try to achieve with the FontPlatformData. Another one is to not call these functions if we have the default letter and wordspacing. This is giving us a small improvement on the text classes. 194993 1 49791 zecke 2010-03-02 02:37:32 -0800 Created attachment 49791 First version. Add two if's. I'm sleepy right now so be extra careful when reviewing. 194994 2 webkit.review.bot 2010-03-02 02:41:59 -0800 Attachment 49791 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/graphics/qt/FontQt.cpp:222: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebCore/platform/graphics/qt/FontQt.cpp:224: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 195714 3 49791 hausmann 2010-03-03 12:45:45 -0800 Comment on attachment 49791 First version. Nice catch :) 196002 4 zecke 2010-03-04 04:30:10 -0800 Landed in r55518. 49791 2010-03-02 02:37:32 -0800 2010-03-03 12:45:45 -0800 First version. 0001-Qt-Avoid-calling-QFont-detach-too-often-from-FontQt.patch text/plain 2762 zecke RnJvbSA5YjZmYzhlMjYwNTc5OGM2NDcxYmY2MjUyZWZkZTQ1ZThmZTcwNjY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFR1ZSwgMiBNYXIgMjAxMCAxMTozNTo1MSArMDEwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gQXZvaWQgY2FsbGluZyBRRm9udDo6ZGV0YWNoIHRvbyBvZnRlbiBmcm9tIEZv bnRRdAoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NTY5CgpUaGUg bGV0dGVyLSBhbmQgd29yZHNwYWNpbmcgaXMgaW5zaWRlIHRoZSBXZWJDb3JlOjpGb250IGNsYXNz LApvdXIgUUZvbnQgaXMgbG9jYXRlZCBpbiB0aGUgV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YS4g RXZlcnl0aW1lCndlIG5lZWQgdG8gdXNlIGEgUUZvbnQgaW5zaWRlIFdlYkNvcmU6OkZvbnQgd2Ug YXJlIGNhbGxpbmcgdGhlCmZvbnQgbWV0aG9kIHdoaWNoIGdldHMgdGhlIFFGb250IGZyb20gdGhl IFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGEKYW5kIGlzIGFwcGx5aW5nIHRoZSBsZXR0ZXItIGFu ZCB3b3Jkc3BhY2luZy4gSW50ZXJuYWxseSB0aGlzCndpbGwgYXR0ZW1wdCB0byBkZXRhY2ggdGhl IFFGb250Li4uCgpBdm9pZCBjYWxsaW5nIHNldExldHRlclNwYWNpbmcgYW5kIHNldFdvcmRTcGFj aW5nIG9uIFFGb250IGlmCnRoZSBXZWJDb3JlOjpGb250IGhhcyB0aGUgZGVmYXVsdCBhcHBsaWVk LgoKKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwOgooV2ViQ29yZTo6Rm9udDo6Zm9u dCk6Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMCAr KysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQu Y3BwIHwgICAgNiArKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGQ3NGI0ZjQuLjRiYjM3YmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMtMDIg IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBBdm9pZCBjYWxs aW5nIFFGb250OjpkZXRhY2ggdG9vIG9mdGVuIGZyb20gRm9udFF0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTU2OQorCisgICAgICAgIFRoZSBsZXR0 ZXItIGFuZCB3b3Jkc3BhY2luZyBpcyBpbnNpZGUgdGhlIFdlYkNvcmU6OkZvbnQgY2xhc3MsCisg ICAgICAgIG91ciBRRm9udCBpcyBsb2NhdGVkIGluIHRoZSBXZWJDb3JlOjpGb250UGxhdGZvcm1E YXRhLiBFdmVyeXRpbWUKKyAgICAgICAgd2UgbmVlZCB0byB1c2UgYSBRRm9udCBpbnNpZGUgV2Vi Q29yZTo6Rm9udCB3ZSBhcmUgY2FsbGluZyB0aGUKKyAgICAgICAgZm9udCBtZXRob2Qgd2hpY2gg Z2V0cyB0aGUgUUZvbnQgZnJvbSB0aGUgV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YQorICAgICAg ICBhbmQgaXMgYXBwbHlpbmcgdGhlIGxldHRlci0gYW5kIHdvcmRzcGFjaW5nLiBJbnRlcm5hbGx5 IHRoaXMKKyAgICAgICAgd2lsbCBhdHRlbXB0IHRvIGRldGFjaCB0aGUgUUZvbnQuLi4KKworICAg ICAgICBBdm9pZCBjYWxsaW5nIHNldExldHRlclNwYWNpbmcgYW5kIHNldFdvcmRTcGFjaW5nIG9u IFFGb250IGlmCisgICAgICAgIHRoZSBXZWJDb3JlOjpGb250IGhhcyB0aGUgZGVmYXVsdCBhcHBs aWVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnQ6OmZvbnQpOgorCiAyMDEwLTAxLTI4ICBIb2xnZXIgSGFucyBQZXRl ciBGcmV5dGhlciAgPHplY2tlQHNlbGZpc2gub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFy aXlhIEhpZGF5YXQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0Zv bnRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKaW5kZXgg M2IxNjM4Yy4uNjVlOGE2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9Gb250UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNw cApAQCAtMjE5LDggKzIxOSwxMCBAQCBGbG9hdFJlY3QgRm9udDo6c2VsZWN0aW9uUmVjdEZvckNv bXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgY29uc3QgSW50UG9pbnQmCiBRRm9udCBGb250 Ojpmb250KCkgY29uc3QKIHsKICAgICBRRm9udCBmID0gcHJpbWFyeUZvbnQoKS0+Z2V0UXRGb250 KCk7Ci0gICAgZi5zZXRMZXR0ZXJTcGFjaW5nKFFGb250OjpBYnNvbHV0ZVNwYWNpbmcsIG1fbGV0 dGVyU3BhY2luZyk7Ci0gICAgZi5zZXRXb3JkU3BhY2luZyhtX3dvcmRTcGFjaW5nKTsKKyAgICBp ZiAobV9sZXR0ZXJTcGFjaW5nICE9IDApCisgICAgICAgIGYuc2V0TGV0dGVyU3BhY2luZyhRRm9u dDo6QWJzb2x1dGVTcGFjaW5nLCBtX2xldHRlclNwYWNpbmcpOworICAgIGlmIChtX3dvcmRTcGFj aW5nICE9IDApCisgICAgICAgIGYuc2V0V29yZFNwYWNpbmcobV93b3JkU3BhY2luZyk7CiAgICAg cmV0dXJuIGY7CiB9CiAKLS0gCjEuNy4wCgo=