135573 2014-08-04 13:50:47 -0700 AX: isWordEndMatch should allow for multiple word selections 2014-08-04 14:56:36 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach mario webkit-bug-importer oldest_to_newest 1026683 0 cfleizach 2014-08-04 13:50:47 -0700 The recently added isWordEndMatch method only works when the checked match has one word in it. But if you have a multiple word match, it will find the first word break and then return that. So the fix should be to search from the end of the string to find if we're at the end. We already matched everything up to the end as part of the finding process before that. 1026684 1 webkit-bug-importer 2014-08-04 13:51:02 -0700 <rdar://problem/17906689> 1026691 2 235985 cfleizach 2014-08-04 14:37:29 -0700 Created attachment 235985 patch 1026693 3 cfleizach 2014-08-04 14:56:36 -0700 http://trac.webkit.org/changeset/172005 235985 2014-08-04 14:37:29 -0700 2014-08-04 14:41:46 -0700 patch patch text/plain 6057 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTA4LTA0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKKyAgICAgICAgQVg6IGlzV29yZEVuZE1h dGNoIHNob3VsZCBhbGxvdyBmb3IgbXVsdGlwbGUgd29yZCBzZWxlY3Rpb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1NzMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBpc1dvcmRFbmRNYXRjaCB3YXMg c2VhcmNoaW5nIGZyb20gdGhlIGJlZ2lubmluZyBvZiB0aGUgc2VsZWN0ZWQgcmFuZ2UsIHdoaWNo IG1lYW50CisgICAgICAgIHRoYXQgaWYgdGhlIHJlc3VsdCB3YXMgbXVsdGlwbGUgd29yZHMsIHdl J2QgcmVqZWN0IHRoZSByZXN1bHQuIAorICAgICAgICBJbnN0ZWFkLCB3ZSBzaG91bGQgc2VhcmNo IGZyb20gdGhlIGVuZCBvZiB0aGUgcmFuZ2UsIHNvIHRoYXQgd2UgZW5jb21wYXNzIGFsbCB3b3Jk cy4KKworICAgICAgICBNb2RpZmllZCBleGlzdGluZyB0ZXN0OiBwbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9zZWxlY3QtdGV4dC1zaG91bGQtbWF0Y2gtd2hvbGUtd29yZHMuaHRtbAorCisgICAg ICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VhcmNo QnVmZmVyOjppc1dvcmRFbmRNYXRjaCk6CisKKzIwMTQtMDgtMDQgIENocmlzIEZsZWl6YWNoICA8 Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwogICAgICAgICBBWDogU2VjdXJlIHRleHQgZmllbGRzIG5l ZWQgdG8gc3VwcG9ydCBTZWFyY2ggcGFyYW1ldGVyaXplZCBhdHRyaWJ1dGVzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1NjgKIApJbmRleDogU291 cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAkocmV2aXNpb24gMTcxOTk3KQorKysg U291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMTIxLDEwICsyMTIxLDEyIEBACiAgICAgCiBpbmxpbmUgYm9vbCBTZWFyY2hCdWZmZXI6Omlz V29yZEVuZE1hdGNoKHNpemVfdCBzdGFydCwgc2l6ZV90IGxlbmd0aCkgY29uc3QKIHsKKyAgICBB U1NFUlQobGVuZ3RoKTsKICAgICBBU1NFUlQobV9vcHRpb25zICYgQXRXb3JkRW5kcyk7CiAKICAg ICBpbnQgZW5kV29yZDsKLSAgICBmaW5kRW5kV29yZEJvdW5kYXJ5KFN0cmluZ1ZpZXcobV9idWZm ZXIuZGF0YSgpLCBtX2J1ZmZlci5zaXplKCkpLCBzdGFydCwgJmVuZFdvcmQpOworICAgIC8vIFN0 YXJ0IHNlYXJjaGluZyBhdCB0aGUgZW5kIG9mIG1hdGNoZWQgc2VhcmNoLCBzbyB0aGF0IG11bHRp cGxlIHdvcmQgbWF0Y2hlcyBzdWNjZWVkLgorICAgIGZpbmRFbmRXb3JkQm91bmRhcnkoU3RyaW5n VmlldyhtX2J1ZmZlci5kYXRhKCksIG1fYnVmZmVyLnNpemUoKSksIHN0YXJ0ICsgbGVuZ3RoIC0g MSwgJmVuZFdvcmQpOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxzaXplX3Q+KGVuZFdvcmQpID09 IChzdGFydCArIGxlbmd0aCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjAwNCkKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDE1IEBACiAyMDE0 LTA4LTA0ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKKyAgICAgICAg QVg6IGlzV29yZEVuZE1hdGNoIHNob3VsZCBhbGxvdyBmb3IgbXVsdGlwbGUgd29yZCBzZWxlY3Rp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1 NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdC10ZXh0LXNob3VsZC1tYXRjaC13aG9sZS13 b3Jkcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv c2VsZWN0LXRleHQtc2hvdWxkLW1hdGNoLXdob2xlLXdvcmRzLmh0bWw6CisKKzIwMTQtMDgtMDQg IENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwogICAgICAgICBBWDogU2Vj dXJlIHRleHQgZmllbGRzIG5lZWQgdG8gc3VwcG9ydCBTZWFyY2ggcGFyYW1ldGVyaXplZCBhdHRy aWJ1dGVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzU1NjgKIApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Vs ZWN0LXRleHQtc2hvdWxkLW1hdGNoLXdob2xlLXdvcmRzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC1z aG91bGQtbWF0Y2gtd2hvbGUtd29yZHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxNzE5OTcpCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC1zaG91 bGQtbWF0Y2gtd2hvbGUtd29yZHMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQg KzEsNCBAQAotVGhlIG1hbiBqdW1wZWQgaGlnaC4KK1RoZSBtYW4ganVtcGVkIGhpZ2hlci4KIAog VGhpcyB0ZXN0cyB0aGF0IHNlbGVjdGlvbiBtYXRjaGVzIHdob2xlIHdvcmRzLCByYXRoZXIgdGhh biBwYXJ0aWFsIG1hdGNoZXMuCiAKQEAgLTExLDYgKzExLDEyIEBACiBQQVNTIHJlc3VsdCBpcyAn anVtcGVkJwogUEFTUyB3aW5kb3dTZWxlY3Rpb24uZ2V0UmFuZ2VBdCgwKS5zdGFydE9mZnNldCBp cyA4CiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCBpcyAxNAor UEFTUyByZXN1bHQgaXMgJ2p1bXBlZCBoaWdoZXInCitQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRS YW5nZUF0KDApLnN0YXJ0T2Zmc2V0IGlzIDgKK1BBU1Mgd2luZG93U2VsZWN0aW9uLmdldFJhbmdl QXQoMCkuZW5kT2Zmc2V0IGlzIDIxCitQQVNTIHJlc3VsdCBpcyAnJworUEFTUyB3aW5kb3dTZWxl Y3Rpb24uZ2V0UmFuZ2VBdCgwKS5zdGFydE9mZnNldCBpcyAwCitQQVNTIHdpbmRvd1NlbGVjdGlv bi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCBpcyAwCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9h Y2Nlc3NpYmlsaXR5L3NlbGVjdC10ZXh0LXNob3VsZC1tYXRjaC13aG9sZS13b3Jkcy5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVj dC10ZXh0LXNob3VsZC1tYXRjaC13aG9sZS13b3Jkcy5odG1sCShyZXZpc2lvbiAxNzE5OTcpCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC1zaG91 bGQtbWF0Y2gtd2hvbGUtd29yZHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNiw3ICs2LDcgQEAK IDwvaGVhZD4KIDxib2R5PgogCi08cCBjb250ZW50ZWRpdGFibGU9InRydWUiIGlkPSJ0ZXh0Ij5U aGUgbWFuIGp1bXBlZCBoaWdoLjwvcD4KKzxwIGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSIgaWQ9InRl eHQiPlRoZSBtYW4ganVtcGVkIGhpZ2hlci48L3A+CiAKIDxwIGlkPSJkZXNjcmlwdGlvbiI+PC9w PgogPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CkBAIC0xNyw3ICsxNyw2IEBACiAgICAgaWYgKHdp bmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewogICAgICAgICB2YXIgdGV4dCA9IGFjY2Vz c2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidGV4dCIpOwogICAgICAg ICB2YXIgd2luZG93U2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwotICAgICAgICB3 aW5kb3dTZWxlY3Rpb24ucmVtb3ZlQWxsUmFuZ2VzKCk7CiAKICAgICAgICAgLy8gQSBtYXRjaGlu ZyByYW5nZSBiZWZvcmUgdGhlIHNlbGVjdGlvbiBzaG91bGQgYmUgc2VsZWN0ZWQgd2hlbiBzZWFy Y2hpbmcgZm9yIGNsb3Nlc3QgbWF0Y2guCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJ0ZXh0IikuZm9jdXMoKTsKQEAgLTI2LDYgKzI1LDcgQEAKICAgICAgICAgdmFyIHJhbmdlID0g ZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKICAgICAgICAgcmFuZ2Uuc2V0U3RhcnQoZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInRleHQiKS5maXJzdENoaWxkLCAwKTsKICAgICAgICAgcmFuZ2Uuc2V0 RW5kKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXh0IikuZmlyc3RDaGlsZCwgMCk7CisgICAg ICAgIHdpbmRvd1NlbGVjdGlvbi5yZW1vdmVBbGxSYW5nZXMoKTsKICAgICAgICAgd2luZG93U2Vs ZWN0aW9uLmFkZFJhbmdlKHJhbmdlKTsKICAgICAgIAogICAgICAgICAvLyBUcnkgdG8gc2VsZWN0 IGEgcGFydGlhbCB3b3JkLCBpdCBzaG91bGQgZmFpbC4KQEAgLTM5LDcgKzM5LDIyIEBACiAgICAg ICAgIHNob3VsZEJlKCJyZXN1bHQiLCAiJ2p1bXBlZCciKTsKICAgICAgICAgc2hvdWxkQmUoIndp bmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLnN0YXJ0T2Zmc2V0IiwgIjgiKTsKICAgICAgICAg c2hvdWxkQmUoIndpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCIsICIxNCIp OworICAgICAgICB3aW5kb3dTZWxlY3Rpb24ucmVtb3ZlQWxsUmFuZ2VzKCk7CisgICAgICAgIHdp bmRvd1NlbGVjdGlvbi5hZGRSYW5nZShyYW5nZSk7CiAKKyAgICAgICAgLy8gU2VsZWN0IG11bHRp cGxlIHdob2xlIHdvcmQsIGl0IHNob3VsZCBzdWNjZWVkLgorICAgICAgICByZXN1bHQgPSB0ZXh0 LnNlbGVjdFRleHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0eVJlc29sdXRpb25D bG9zZXN0VG9TZWxlY3Rpb24iLCAianVtcGVkIGhpZ2hlciIpOworICAgICAgICBzaG91bGRCZSgi cmVzdWx0IiwgIidqdW1wZWQgaGlnaGVyJyIpOworICAgICAgICBzaG91bGRCZSgid2luZG93U2Vs ZWN0aW9uLmdldFJhbmdlQXQoMCkuc3RhcnRPZmZzZXQiLCAiOCIpOworICAgICAgICBzaG91bGRC ZSgid2luZG93U2VsZWN0aW9uLmdldFJhbmdlQXQoMCkuZW5kT2Zmc2V0IiwgIjIxIik7CisgICAg ICAgIHdpbmRvd1NlbGVjdGlvbi5yZW1vdmVBbGxSYW5nZXMoKTsKKyAgICAgICAgd2luZG93U2Vs ZWN0aW9uLmFkZFJhbmdlKHJhbmdlKTsKKworICAgICAgICAvLyBTZWxlY3QgbXVsdGlwbGUgd29y ZHMsIHdoZXJlIG9uZSBpcyBub3QgYSB3aG9sZSB3b3JkLCBpdCBzaG91bGQgZmFpbC4KKyAgICAg ICAgcmVzdWx0ID0gdGV4dC5zZWxlY3RUZXh0V2l0aENyaXRlcmlhKCJBWFNlbGVjdFRleHRBbWJp Z3VpdHlSZXNvbHV0aW9uQ2xvc2VzdFRvU2VsZWN0aW9uIiwgImp1bXBlZCBoaWdoIik7CisgICAg ICAgIHNob3VsZEJlKCJyZXN1bHQiLCAiJyciKTsKKyAgICAgICAgc2hvdWxkQmUoIndpbmRvd1Nl bGVjdGlvbi5nZXRSYW5nZUF0KDApLnN0YXJ0T2Zmc2V0IiwgIjAiKTsKKyAgICAgICAgc2hvdWxk QmUoIndpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCIsICIwIik7CiAgICAg fQogPC9zY3JpcHQ+CiAK