45796 2010-09-14 17:49:50 -0700 Remaining discrepancies in piecewise text measurement 2010-09-23 09:18:52 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All OS X 10.6 RESOLVED FIXED P2 Normal --- 1 bradm webkit-unassigned mitz webkit.review.bot oldest_to_newest 279283 0 bradm 2010-09-14 17:49:50 -0700 As illustrated in: https://bugs.webkit.org/show_bug.cgi?id=42279 We have to be careful about summing floating point widths. There's still a remaining case in which width(" string") may not equal width(" ") + width("string"). 282989 1 68383 bradm 2010-09-22 09:50:34 -0700 Created attachment 68383 patch to width iterator 283000 2 webkit.review.bot 2010-09-22 09:59:52 -0700 Attachment 68383 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/graphics/WidthIterator.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: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 283543 3 68383 mitz 2010-09-23 00:38:32 -0700 Comment on attachment 68383 patch to width iterator View in context: https://bugs.webkit.org/attachment.cgi?id=68383&action=review > WebCore/platform/graphics/WidthIterator.cpp:224 > + ASSERT(widthSinceLastRounding == 0); Like the style checker mentioned, WebKit style is to write this as ASSERT(!widthSinceLastRounding); 283685 4 mitz 2010-09-23 09:18:52 -0700 Fixed in <http://trac.webkit.org/projects/webkit/changeset/68148>. 68383 2010-09-22 09:50:34 -0700 2010-09-23 00:38:32 -0700 patch to width iterator patch.txt text/plain 3544 bradm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODA1MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMjIgIEJyYWQgTW9vcmUgIDxicmFkbUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcmVz cyBhIHJlbWFpbmluZyBkaXNjcmVwYW5jeSBpbiBwaWVjZXdpc2UgdGV4dCBtZWFzdXJlbWVudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU3OTYKKwor ICAgICAgICBEb24ndCBpbmNsdWRlIGFsd2F5cy1pbnRlZ3JhbCBzcGFjZSB3aWR0aHMgaW4gdGhl IGZsb2F0aW5nIHBvaW50IGFjY3VtdWxhdG9yIGRlc2lnbmVkCisgICAgICAgIHRvIG1pbmltaXpl IHByZWNpc2lvbiBsb3NzLiAgVGhpcyBicmluZ3Mgd2hvbGUtc3RyaW5nIG1lYXN1cmVtZW50IGlu IGxpbmUgd2l0aCBwaWVjZXdpc2UKKyAgICAgICAgdGV4dCBtZWFzdXJlbWVudCB3aGVuIGRlYWxp bmcgd2l0aCBmb250cyB3aXRoIGZyYWN0aW9uYWwgYWR2YW5jZXMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldpZHRo SXRlcmF0b3I6OmFkdmFuY2UpOiBDaGFuZ2UgdGhlIGFzc29jaWF0aXZpdHkgb2Ygd2lkdGggYWRk aXRpb24gdG8gbWluaW1pemUgcHJlY2lzaW9uIGxvc3MuCisKIDIwMTAtMDktMjIgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhh biBMb3Blei4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y LmNwcAkocmV2aXNpb24gNjc1NTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRo SXRlcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTIsMjEgKzIxMiwzMCBAQAogCiAgICAg ICAgIC8vIEZvcmNlIGNoYXJhY3RlcnMgdGhhdCBhcmUgdXNlZCB0byBkZXRlcm1pbmUgd29yZCBi b3VuZGFyaWVzIGZvciB0aGUgcm91bmRpbmcgaGFjawogICAgICAgICAvLyB0byBiZSBpbnRlZ2Vy IHdpZHRoLCBzbyBmb2xsb3dpbmcgd29yZHMgd2lsbCBzdGFydCBvbiBhbiBpbnRlZ2VyIGJvdW5k YXJ5LgotICAgICAgICBpZiAobV9ydW4uYXBwbHlXb3JkUm91bmRpbmcoKSAmJiBGb250Ojppc1Jv dW5kaW5nSGFja0NoYXJhY3RlcihjKSkKKyAgICAgICAgaWYgKG1fcnVuLmFwcGx5V29yZFJvdW5k aW5nKCkgJiYgRm9udDo6aXNSb3VuZGluZ0hhY2tDaGFyYWN0ZXIoYykpIHsKICAgICAgICAgICAg IHdpZHRoID0gY2VpbGYod2lkdGgpOwogCi0gICAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGUg bmV4dCBjaGFyYWN0ZXIgaXMgYSAicm91bmRpbmcgaGFjayBjaGFyYWN0ZXIiLCBpZiBzbywgYWRq dXN0Ci0gICAgICAgIC8vIHdpZHRoIHNvIHRoYXQgdGhlIHRvdGFsIHJ1biB3aWR0aCB3aWxsIGJl IG9uIGFuIGludGVnZXIgYm91bmRhcnkuCi0gICAgICAgIGlmICgobV9ydW4uYXBwbHlXb3JkUm91 bmRpbmcoKSAmJiBjdXJyZW50Q2hhcmFjdGVyIDwgbV9ydW4ubGVuZ3RoKCkgJiYgRm9udDo6aXNS b3VuZGluZ0hhY2tDaGFyYWN0ZXIoKmNwKSkKLSAgICAgICAgICAgICAgICB8fCAobV9ydW4uYXBw bHlSdW5Sb3VuZGluZygpICYmIGN1cnJlbnRDaGFyYWN0ZXIgPj0gbV9lbmQpKSB7Ci0gICAgICAg ICAgICBmbG9hdCB0b3RhbFdpZHRoID0gd2lkdGhTaW5jZUxhc3RSb3VuZGluZyArIHdpZHRoOwot ICAgICAgICAgICAgd2lkdGhTaW5jZUxhc3RSb3VuZGluZyA9IGNlaWxmKHRvdGFsV2lkdGgpOwot ICAgICAgICAgICAgd2lkdGggKz0gd2lkdGhTaW5jZUxhc3RSb3VuZGluZyAtIHRvdGFsV2lkdGg7 Ci0gICAgICAgICAgICBtX3J1bldpZHRoU29GYXIgKz0gd2lkdGhTaW5jZUxhc3RSb3VuZGluZzsK LSAgICAgICAgICAgIHdpZHRoU2luY2VMYXN0Um91bmRpbmcgPSAwOwotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIHdpZHRoU2luY2VMYXN0Um91bmRpbmcgKz0gd2lkdGg7CisgICAgICAgICAg ICAvLyBTaW5jZSB3aWR0aFNpbmNlTGFzdFJvdW5kaW5nIGNhbiBsb3NlIHByZWNpc2lvbiBpZiB3 ZSBpbmNsdWRlIG1lYXN1cmVtZW50cyBmb3IKKyAgICAgICAgICAgIC8vIHByZWNlZGluZyB3aGl0 ZXNwYWNlLCB3ZSBieXBhc3MgaXQgaGVyZS4KKyAgICAgICAgICAgIG1fcnVuV2lkdGhTb0ZhciAr PSB3aWR0aDsKIAorICAgICAgICAgICAgLy8gU2luY2UgdGhpcyBpcyBhIHJvdW5kaW5nIGhhY2sg Y2hhcmFjdGVyLCB3ZSBzaG91bGQgaGF2ZSByZXNldCB0aGlzIHN1bSBvbiB0aGUgcHJldmlvdXMK KyAgICAgICAgICAgIC8vIGl0ZXJhdGlvbi4KKyAgICAgICAgICAgIEFTU0VSVCh3aWR0aFNpbmNl TGFzdFJvdW5kaW5nID09IDApOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gQ2hl Y2sgdG8gc2VlIGlmIHRoZSBuZXh0IGNoYXJhY3RlciBpcyBhICJyb3VuZGluZyBoYWNrIGNoYXJh Y3RlciIsIGlmIHNvLCBhZGp1c3QKKyAgICAgICAgICAgIC8vIHdpZHRoIHNvIHRoYXQgdGhlIHRv dGFsIHJ1biB3aWR0aCB3aWxsIGJlIG9uIGFuIGludGVnZXIgYm91bmRhcnkuCisgICAgICAgICAg ICBpZiAoKG1fcnVuLmFwcGx5V29yZFJvdW5kaW5nKCkgJiYgY3VycmVudENoYXJhY3RlciA8IG1f cnVuLmxlbmd0aCgpICYmIEZvbnQ6OmlzUm91bmRpbmdIYWNrQ2hhcmFjdGVyKCpjcCkpCisgICAg ICAgICAgICAgICAgICAgIHx8IChtX3J1bi5hcHBseVJ1blJvdW5kaW5nKCkgJiYgY3VycmVudENo YXJhY3RlciA+PSBtX2VuZCkpIHsKKyAgICAgICAgICAgICAgICBmbG9hdCB0b3RhbFdpZHRoID0g d2lkdGhTaW5jZUxhc3RSb3VuZGluZyArIHdpZHRoOworICAgICAgICAgICAgICAgIHdpZHRoU2lu Y2VMYXN0Um91bmRpbmcgPSBjZWlsZih0b3RhbFdpZHRoKTsKKyAgICAgICAgICAgICAgICB3aWR0 aCArPSB3aWR0aFNpbmNlTGFzdFJvdW5kaW5nIC0gdG90YWxXaWR0aDsKKyAgICAgICAgICAgICAg ICBtX3J1bldpZHRoU29GYXIgKz0gd2lkdGhTaW5jZUxhc3RSb3VuZGluZzsKKyAgICAgICAgICAg ICAgICB3aWR0aFNpbmNlTGFzdFJvdW5kaW5nID0gMDsKKyAgICAgICAgICAgIH0gZWxzZQorICAg ICAgICAgICAgICAgIHdpZHRoU2luY2VMYXN0Um91bmRpbmcgKz0gd2lkdGg7CisgICAgICAgIH0K KwogICAgICAgICBpZiAoZ2x5cGhCdWZmZXIpCiAgICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRk KGdseXBoLCBmb250RGF0YSwgKHJ0bCA/IG9sZFdpZHRoICsgbGFzdFJvdW5kaW5nV2lkdGggOiB3 aWR0aCkpOwogCg==