4672 2005-08-26 10:20:39 -0700 Incorrect highlight when selection begins with space and word-spacing>0 2005-09-01 09:45:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 mitz hyatt oldest_to_newest 17511 0 mitz 2005-08-26 10:20:39 -0700 Summary: when word-spacing is positive and the selection begins with a space, the highlight is not the right width (does not take into account the width of the initial space). To reproduce: open the testcase in Safari, click in the space next to the M and drag from there to the right. Expected: highlight to cover the entire space once the cursor crosses the middle of the space, and to extend over the letters one at a time as they are reached. Actual: once the cursor crosses the middle of the space, a thin highlight appears near the M. As the cursor is dragged over the letters, the highlight becomes wider. 17512 1 3586 mitz 2005-08-26 10:21:18 -0700 Created attachment 3586 testcase 17513 2 3587 mitz 2005-08-26 11:09:07 -0700 Created attachment 3587 suggested fix 17514 3 3587 mitz 2005-08-26 11:11:29 -0700 Comment on attachment 3587 suggested fix Give floatWidth the preceding character so that it can account for word spacing. (It is never given the entire string for performance reasons, see font.cpp r1.20). 17515 4 3587 mitz 2005-08-26 11:21:21 -0700 Comment on attachment 3587 suggested fix Oops. Breaks some layout tests. 17516 5 3587 darin 2005-08-26 11:24:44 -0700 Comment on attachment 3587 suggested fix Is one preceding character always good enough? 17517 6 mitz 2005-08-26 11:33:18 -0700 I think so. It's only used by widthForNextCharacter() in WebTextRenderer.m:2241 . 17654 7 mitz 2005-08-26 13:24:12 -0700 Sorry, that's line 2171 in WebTextRenderer.m. Looks like a lot of the code relies on the current behavior of not passing the preceding char (in a way that I don't know how to fix for negative word-spacing), so I'll try a different approach for the fix. 17709 8 3589 mitz 2005-08-26 14:19:02 -0700 Created attachment 3589 add leading word space to the selection rect 17710 9 3589 mitz 2005-08-26 14:22:42 -0700 Comment on attachment 3589 add leading word space to the selection rect This uses the same logic as WebTextRenderer's widthForNextCharacter to decide if word spacing should be added. 17722 10 3589 darin 2005-08-26 19:35:24 -0700 Comment on attachment 3589 add leading word space to the selection rect Looks OK, although I'd like to see a local variable to avoid the 4 calls to textObject(). In fact, maybe that function should be made inline. 17741 11 3606 mitz 2005-08-27 03:11:38 -0700 Created attachment 3606 revised patch Made textObject() inline AND added a local variable to avoid calling it repeatedly from selectionRect(). 17744 12 oliver 2005-08-27 04:30:19 -0700 I hate word-spacing :-/ Exists in ToT, as at 27/8/05 17749 13 3606 darin 2005-08-27 11:44:20 -0700 Comment on attachment 3606 revised patch Once textObject() is inlined, it needs to be in the header. 17802 14 3623 mitz 2005-08-28 07:23:23 -0700 Created attachment 3623 revised patch Moved textObject() to the header (couldn't define it inside the InlineTextBox definition since it needs RenderText to be defined). 17810 15 3623 darin 2005-08-28 11:08:41 -0700 Comment on attachment 3623 revised patch r=me 3586 2005-08-26 10:21:18 -0700 2005-08-26 10:21:18 -0700 testcase wordSpacingHighlight.html text/html 322 mitz PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIgCiJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgo8aHRtbD4NCjxo ZWFkPg0KPHRpdGxlPkhpZ2hsaWdodGluZyB3aXRoIHdvcmQgc3BhY2luZzwvdGl0bGU+DQo8L2hl YWQ+DQo8Ym9keT4KPHAgc3R5bGU9IndvcmQtc3BhY2luZzo1ZW07Ij4KTSB4eWxvcGhvbmUKPC9w Pgo8cCBzdHlsZT0ibWFyZ2luLWxlZnQ6MWVtOyI+CiYjeDIxOTE7IGNsaWNrIHRoZXJlIGFuZCBk cmFnIHRvIHRoZSByaWdodAo8L3A+CjwvYm9keT4KPC9odG1sPg== 3587 2005-08-26 11:09:07 -0700 2005-08-26 11:21:43 -0700 suggested fix 4672_patch_r2.txt text/plain 818 mitz SW5kZXg6IGZvbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2to dG1sL3JlbmRlcmluZy9mb250LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS40NApkaWZmIC11 IC1wIC1yMS40NCBmb250LmNwcAotLS0gZm9udC5jcHAJMjUgQXVnIDIwMDUgMTc6NDc6MTMgLTAw MDAJMS40NAorKysgZm9udC5jcHAJMjYgQXVnIDIwMDUgMTg6MDk6MTggLTAwMDAKQEAgLTEzOSw3 ICsxMzksOCBAQCBpbnQgRm9udDo6d2lkdGgoIFFDaGFyICpjaHMsIGludCBzbGVuLCBpCiAjaWZu ZGVmIFJPVU5EX1RPX0lOVAogI2RlZmluZSBST1VORF9UT19JTlQoeCkgKHVuc2lnbmVkIGludCko KHgpKy41KQogI2VuZGlmCi0gICAgcmV0dXJuIFJPVU5EX1RPX0lOVChmbS5mbG9hdFdpZHRoKGNo cytwb3MsIHNsZW4tcG9zLCAwLCBsZW4sIHRhYldpZHRoLCB4cG9zLCBsZXR0ZXJTcGFjaW5nLCB3 b3JkU3BhY2luZywgZm9udERlZi5zbWFsbENhcHMpKTsKKyAgICBpbnQgaSA9IChwb3MgPiAwID8g MSA6IDApOworICAgIHJldHVybiBST1VORF9UT19JTlQoZm0uZmxvYXRXaWR0aChjaHMrcG9zLWks IHNsZW4tcG9zK2ksIGksIGxlbiwgdGFiV2lkdGgsIHhwb3MsIGxldHRlclNwYWNpbmcsIHdvcmRT cGFjaW5nLCBmb250RGVmLnNtYWxsQ2FwcykpOwogLy8gICAgcmV0dXJuIGZtLndpZHRoKGNocyAr IHBvcywgbGVuKTsKICNlbHNlCiAgICAgUVN0cmluZyBxc3RyID0gUUNvbnN0U3RyaW5nKGNocytw b3MsIGxlbikucXN0cmluZygpOwo= 3589 2005-08-26 14:19:02 -0700 2005-08-27 03:11:38 -0700 add leading word space to the selection rect 4672_patch_r3.txt text/plain 817 mitz SW5kZXg6IHJlbmRlcl90ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2Vi Q29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX3RleHQuY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjE5MApkaWZmIC11IC1wIC1yMS4xOTAgcmVuZGVyX3RleHQuY3BwCi0tLSByZW5kZXJfdGV4 dC5jcHAJMjUgQXVnIDIwMDUgMTc6NDc6MTYgLTAwMDAJMS4xOTAKKysrIHJlbmRlcl90ZXh0LmNw cAkyNiBBdWcgMjAwNSAyMToxNzoxMCAtMDAwMApAQCAtMTY0LDYgKzE2NCw4IEBAIFFSZWN0IElu bGluZVRleHRCb3g6OnNlbGVjdGlvblJlY3QoaW50IHQKICAgICBlbHNlIHsKICAgICAgICAgLy8g T3VyIHJ1biBpcyBwYXJ0aWFsbHkgc2VsZWN0ZWQsIGFuZCBzbyB3ZSBuZWVkIHRvIG1lYXN1cmUu CiAgICAgICAgIGludCB3ID0gdGV4dE9iamVjdCgpLT53aWR0aChzUG9zICsgbV9zdGFydCwgZVBv cyAtIHNQb3MsIG1fZmlyc3RMaW5lKTsKKyAgICAgICAgaWYgKHNQb3MgKyBtX3N0YXJ0ID4gMCAm JiB0ZXh0T2JqZWN0KCktPnN0ci0+c1tzUG9zICsgbV9zdGFydF0uaXNTcGFjZSgpICYmICF0ZXh0 T2JqZWN0KCktPnN0ci0+c1tzUG9zICsgbV9zdGFydCAtIDFdLmlzU3BhY2UoKSkKKyAgICAgICAg ICAgIHcgKz0gdGV4dE9iamVjdCgpLT5zdHlsZShtX2ZpcnN0TGluZSktPndvcmRTcGFjaW5nKCk7 CiAgICAgICAgIGlmIChtX3JldmVyc2VkKQogICAgICAgICAgICAgc2VsRW5kID0gc2VsU3RhcnQg LSB3OwogICAgICAgICBlbHNlCg== 3606 2005-08-27 03:11:38 -0700 2005-08-28 07:23:23 -0700 revised patch 4672_patch_r4.txt text/plain 1841 mitz SW5kZXg6IHJlbmRlcl90ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2Vi Q29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX3RleHQuY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjE5MApkaWZmIC11IC1wIC1yMS4xOTAgcmVuZGVyX3RleHQuY3BwCi0tLSByZW5kZXJfdGV4 dC5jcHAJMjUgQXVnIDIwMDUgMTc6NDc6MTYgLTAwMDAJMS4xOTAKKysrIHJlbmRlcl90ZXh0LmNw cAkyNyBBdWcgMjAwNSAxMDowOTo1MiAtMDAwMApAQCAtODIsNyArODIsNyBAQCB2b2lkIElubGlu ZVRleHRCb3g6Om9wZXJhdG9yIGRlbGV0ZSh2b2lkCiAgICAgKihzaXplX3QgKilwdHIgPSBzejsK IH0KIAotUmVuZGVyVGV4dCogSW5saW5lVGV4dEJveDo6dGV4dE9iamVjdCgpCitpbmxpbmUgUmVu ZGVyVGV4dCogSW5saW5lVGV4dEJveDo6dGV4dE9iamVjdCgpCiB7CiAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PFJlbmRlclRleHQqPihtX29iamVjdCk7CiB9CkBAIC0xMzksNiArMTM5LDcgQEAgUVJl Y3QgSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjdChpbnQgdAogICAgICAgICByZXR1cm4gUVJl Y3QoKTsKIAogICAgIFJvb3RJbmxpbmVCb3gqIHJvb3RCb3ggPSByb290KCk7CisgICAgUmVuZGVy VGV4dCogdGV4dE9iaiA9IHRleHRPYmplY3QoKTsKICAgICBpbnQgc2VsU3RhcnQgPSBtX3JldmVy c2VkID8gbV94ICsgbV93aWR0aCA6IG1feDsKICAgICBpbnQgc2VsRW5kID0gc2VsU3RhcnQ7CiAg ICAgaW50IHNlbFRvcCA9IHJvb3RCb3gtPnNlbGVjdGlvblRvcCgpOwpAQCAtMTQ4LDcgKzE0OSw3 IEBAIFFSZWN0IElubGluZVRleHRCb3g6OnNlbGVjdGlvblJlY3QoaW50IHQKICAgICAvLyB3YXkg dG8gZ2V0IHRoZSB3aWR0aCBvZiBhIHJ1biBpbmNsdWRpbmcgdGhlIGp1c3RpZmljYXRpb24gcGFk ZGluZy4KICAgICBpZiAoc1BvcyA+IDAgJiYgIW1fdG9BZGQpIHsKICAgICAgICAgLy8gVGhlIHNl bGVjdGlvbiBiZWdpbnMgaW4gdGhlIG1pZGRsZSBvZiBvdXIgcnVuLgotICAgICAgICBpbnQgdyA9 IHRleHRPYmplY3QoKS0+d2lkdGgobV9zdGFydCwgc1BvcywgbV9maXJzdExpbmUsIG1feCk7Cisg ICAgICAgIGludCB3ID0gdGV4dE9iai0+d2lkdGgobV9zdGFydCwgc1BvcywgbV9maXJzdExpbmUs IG1feCk7CiAgICAgICAgIGlmIChtX3JldmVyc2VkKQogICAgICAgICAgICAgc2VsU3RhcnQgLT0g dzsKICAgICAgICAgZWxzZQpAQCAtMTYzLDcgKzE2NCw5IEBAIFFSZWN0IElubGluZVRleHRCb3g6 OnNlbGVjdGlvblJlY3QoaW50IHQKICAgICB9CiAgICAgZWxzZSB7CiAgICAgICAgIC8vIE91ciBy dW4gaXMgcGFydGlhbGx5IHNlbGVjdGVkLCBhbmQgc28gd2UgbmVlZCB0byBtZWFzdXJlLgotICAg ICAgICBpbnQgdyA9IHRleHRPYmplY3QoKS0+d2lkdGgoc1BvcyArIG1fc3RhcnQsIGVQb3MgLSBz UG9zLCBtX2ZpcnN0TGluZSk7CisgICAgICAgIGludCB3ID0gdGV4dE9iai0+d2lkdGgoc1BvcyAr IG1fc3RhcnQsIGVQb3MgLSBzUG9zLCBtX2ZpcnN0TGluZSk7CisgICAgICAgIGlmIChzUG9zICsg bV9zdGFydCA+IDAgJiYgdGV4dE9iai0+c3RyLT5zW3NQb3MgKyBtX3N0YXJ0XS5pc1NwYWNlKCkg JiYgIXRleHRPYmotPnN0ci0+c1tzUG9zICsgbV9zdGFydCAtIDFdLmlzU3BhY2UoKSkKKyAgICAg ICAgICAgIHcgKz0gdGV4dE9iai0+c3R5bGUobV9maXJzdExpbmUpLT53b3JkU3BhY2luZygpOwog ICAgICAgICBpZiAobV9yZXZlcnNlZCkKICAgICAgICAgICAgIHNlbEVuZCA9IHNlbFN0YXJ0IC0g dzsKICAgICAgICAgZWxzZQo= 3623 2005-08-28 07:23:23 -0700 2005-08-28 11:08:41 -0700 revised patch 4672_patch_r5.txt text/plain 2985 mitz SW5kZXg6IHJlbmRlcl90ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2Vi Q29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX3RleHQuY3BwLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjE5MApkaWZmIC11IC1wIC1yMS4xOTAgcmVuZGVyX3RleHQuY3BwCi0tLSByZW5kZXJfdGV4 dC5jcHAJMjUgQXVnIDIwMDUgMTc6NDc6MTYgLTAwMDAJMS4xOTAKKysrIHJlbmRlcl90ZXh0LmNw cAkyOCBBdWcgMjAwNSAxNDoyMTo0MyAtMDAwMApAQCAtODIsMTEgKzgyLDYgQEAgdm9pZCBJbmxp bmVUZXh0Qm94OjpvcGVyYXRvciBkZWxldGUodm9pZAogICAgICooc2l6ZV90ICopcHRyID0gc3o7 CiB9CiAKLVJlbmRlclRleHQqIElubGluZVRleHRCb3g6OnRleHRPYmplY3QoKQotewotICAgIHJl dHVybiBzdGF0aWNfY2FzdDxSZW5kZXJUZXh0Kj4obV9vYmplY3QpOwotfQotCiBib29sIElubGlu ZVRleHRCb3g6OmNoZWNrVmVydGljYWxQb2ludChpbnQgX3ksIGludCBfdHksIGludCBfaCkKIHsK ICAgICBpbnQgdG9wWSA9IG1feTsKQEAgLTEzOSw2ICsxMzQsNyBAQCBRUmVjdCBJbmxpbmVUZXh0 Qm94OjpzZWxlY3Rpb25SZWN0KGludCB0CiAgICAgICAgIHJldHVybiBRUmVjdCgpOwogCiAgICAg Um9vdElubGluZUJveCogcm9vdEJveCA9IHJvb3QoKTsKKyAgICBSZW5kZXJUZXh0KiB0ZXh0T2Jq ID0gdGV4dE9iamVjdCgpOwogICAgIGludCBzZWxTdGFydCA9IG1fcmV2ZXJzZWQgPyBtX3ggKyBt X3dpZHRoIDogbV94OwogICAgIGludCBzZWxFbmQgPSBzZWxTdGFydDsKICAgICBpbnQgc2VsVG9w ID0gcm9vdEJveC0+c2VsZWN0aW9uVG9wKCk7CkBAIC0xNDgsNyArMTQ0LDcgQEAgUVJlY3QgSW5s aW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjdChpbnQgdAogICAgIC8vIHdheSB0byBnZXQgdGhlIHdp ZHRoIG9mIGEgcnVuIGluY2x1ZGluZyB0aGUganVzdGlmaWNhdGlvbiBwYWRkaW5nLgogICAgIGlm IChzUG9zID4gMCAmJiAhbV90b0FkZCkgewogICAgICAgICAvLyBUaGUgc2VsZWN0aW9uIGJlZ2lu cyBpbiB0aGUgbWlkZGxlIG9mIG91ciBydW4uCi0gICAgICAgIGludCB3ID0gdGV4dE9iamVjdCgp LT53aWR0aChtX3N0YXJ0LCBzUG9zLCBtX2ZpcnN0TGluZSwgbV94KTsKKyAgICAgICAgaW50IHcg PSB0ZXh0T2JqLT53aWR0aChtX3N0YXJ0LCBzUG9zLCBtX2ZpcnN0TGluZSwgbV94KTsKICAgICAg ICAgaWYgKG1fcmV2ZXJzZWQpCiAgICAgICAgICAgICBzZWxTdGFydCAtPSB3OwogICAgICAgICBl bHNlCkBAIC0xNjMsNyArMTU5LDkgQEAgUVJlY3QgSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVj dChpbnQgdAogICAgIH0KICAgICBlbHNlIHsKICAgICAgICAgLy8gT3VyIHJ1biBpcyBwYXJ0aWFs bHkgc2VsZWN0ZWQsIGFuZCBzbyB3ZSBuZWVkIHRvIG1lYXN1cmUuCi0gICAgICAgIGludCB3ID0g dGV4dE9iamVjdCgpLT53aWR0aChzUG9zICsgbV9zdGFydCwgZVBvcyAtIHNQb3MsIG1fZmlyc3RM aW5lKTsKKyAgICAgICAgaW50IHcgPSB0ZXh0T2JqLT53aWR0aChzUG9zICsgbV9zdGFydCwgZVBv cyAtIHNQb3MsIG1fZmlyc3RMaW5lKTsKKyAgICAgICAgaWYgKHNQb3MgKyBtX3N0YXJ0ID4gMCAm JiB0ZXh0T2JqLT5zdHItPnNbc1BvcyArIG1fc3RhcnRdLmlzU3BhY2UoKSAmJiAhdGV4dE9iai0+ c3RyLT5zW3NQb3MgKyBtX3N0YXJ0IC0gMV0uaXNTcGFjZSgpKQorICAgICAgICAgICAgdyArPSB0 ZXh0T2JqLT5zdHlsZShtX2ZpcnN0TGluZSktPndvcmRTcGFjaW5nKCk7CiAgICAgICAgIGlmICht X3JldmVyc2VkKQogICAgICAgICAgICAgc2VsRW5kID0gc2VsU3RhcnQgLSB3OwogICAgICAgICBl bHNlCkluZGV4OiByZW5kZXJfdGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9X ZWJDb3JlL2todG1sL3JlbmRlcmluZy9yZW5kZXJfdGV4dC5oLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjg0CmRpZmYgLXUgLXAgLXIxLjg0IHJlbmRlcl90ZXh0LmgKLS0tIHJlbmRlcl90ZXh0LmgJ MjUgQXVnIDIwMDUgMTc6NDc6MTYgLTAwMDAJMS44NAorKysgcmVuZGVyX3RleHQuaAkyOCBBdWcg MjAwNSAxNDoyMTo0NCAtMDAwMApAQCAtODgsNyArODgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIHBhaW50KFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBpbnQgdHgsIGludCB0eSk7 CiAgICAgdmlydHVhbCBib29sIG5vZGVBdFBvaW50KFJlbmRlck9iamVjdDo6Tm9kZUluZm8mIGks IGludCB4LCBpbnQgeSwgaW50IHR4LCBpbnQgdHkpOwogCi0gICAgUmVuZGVyVGV4dCogdGV4dE9i amVjdCgpOworICAgIFJlbmRlclRleHQqIHRleHRPYmplY3QoKSBjb25zdDsKICAgICAKICAgICB2 aXJ0dWFsIHZvaWQgZGVsZXRlTGluZShSZW5kZXJBcmVuYSogYXJlbmEpOwogICAgIHZpcnR1YWwg dm9pZCBleHRyYWN0TGluZSgpOwpAQCAtMzEyLDYgKzMxMiw4IEBAIHByb3RlY3RlZDogLy8gbWVt YmVycwogI2VuZGlmCiB9OwogCitpbmxpbmUgUmVuZGVyVGV4dCogSW5saW5lVGV4dEJveDo6dGV4 dE9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlclRleHQqPihtX29iamVj dCk7IH0KKwogLy8gVXNlZCB0byByZXByZXNlbnQgYSB0ZXh0IHN1YnN0cmluZyBvZiBhbiBlbGVt ZW50LCBlLmcuLCBmb3IgdGV4dCBydW5zIHRoYXQgYXJlIHNwbGl0IGJlY2F1c2Ugb2YKIC8vIGZp cnN0IGxldHRlciBhbmQgdGhhdCBtdXN0IHRoZXJlZm9yZSBoYXZlIGRpZmZlcmVudCBzdHlsZXMg KGFuZCBwb3NpdGlvbnMgaW4gdGhlIHJlbmRlciB0cmVlKS4KIC8vIFdlIGNhY2hlIG9mZnNldHMg c28gdGhhdCB0ZXh0IHRyYW5zZm9ybWF0aW9ucyBjYW4gYmUgYXBwbGllZCBpbiBzdWNoIGEgd2F5 IHRoYXQgd2UgY2FuIHJlY292ZXIK