133684 2014-06-10 10:39:06 -0700 Send more context about text selection to telephone number scanner 2014-06-10 10:53:00 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson oldest_to_newest 1014431 0 beidson 2014-06-10 10:39:06 -0700 Send more context about text selection to telephone number scanner By sending a few characters before and after the selection we can detect phone numbers before they are completely selected. In radar <rdar://problem/16874385> 1014433 1 232795 beidson 2014-06-10 10:42:53 -0700 Created attachment 232795 Patch v1 1014434 2 232795 enrica 2014-06-10 10:48:20 -0700 Comment on attachment 232795 Patch v1 Looks good to me. 1014436 3 beidson 2014-06-10 10:53:00 -0700 http://trac.webkit.org/changeset/169750 232795 2014-06-10 10:42:53 -0700 2014-06-10 10:48:20 -0700 Patch v1 patch text/plain 5470 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMGZjZWZlLi4xNmRkMDQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMDYtMTAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFNlbmQgbW9yZSBjb250ZXh0IGFib3V0IHRleHQgc2VsZWN0aW9uIHRvIHRlbGVwaG9uZSBu dW1iZXIgc2Nhbm5lcgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY4NzQzODU+IGFuZCBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjg0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vUmFuZ2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cmFuZ2VzT3ZlcmxhcCk6QWRkIGEgdXRpbGl0eSB0byBjaGVjayBpZiB0 d28gcmFuZ2VzIG92ZXJsYXAuCisgICAgICAgICogZG9tL1JhbmdlLmg6CisgICAgICAgIAorICAg ICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6c2Nh blNlbGVjdGlvbkZvclRlbGVwaG9uZU51bWJlcnMpOiBDcmVhdGUgYSByYW5nZSB0aGF0IGlzIHdp ZGVyIHRoYW4gdGhlIAorICAgICAgICAgIGFjdHVhbCBzZWxlY3Rpb24gdG8gc2VhcmNoIGZvciBw aG9uZSBudW1iZXJzIHRoYXQgYXJlIG5vdCBjb21wbGV0ZWx5IHNlbGVjdGVkIHlldC4KKwogMjAx NC0wNi0wOSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMTY5NjgxKTogVGhyZWUgdGVzdHMgYXJlIGJyb2tlbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5j cHAKaW5kZXggYjBlZTBlYS4uNjRhNzJhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L1JhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCkBAIC0xOTc2LDYg KzE5NzYsMzUgQEAgYm9vbCBhcmVSYW5nZXNFcXVhbChjb25zdCBSYW5nZSogYSwgY29uc3QgUmFu Z2UqIGIpCiAgICAgcmV0dXJuIGEtPnN0YXJ0UG9zaXRpb24oKSA9PSBiLT5zdGFydFBvc2l0aW9u KCkgJiYgYS0+ZW5kUG9zaXRpb24oKSA9PSBiLT5lbmRQb3NpdGlvbigpOwogfQogCitib29sIHJh bmdlc092ZXJsYXAoY29uc3QgUmFuZ2UqIGEsIGNvbnN0IFJhbmdlKiBiKQoreworICAgIGlmICgh YSB8fCAhYikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKGEgPT0gYikKKyAgICAg ICAgcmV0dXJuIHRydWU7CisKKyAgICBpZiAoYS0+Y29tbW9uQW5jZXN0b3JDb250YWluZXIoQVNT RVJUX05PX0VYQ0VQVElPTiktPm93bmVyRG9jdW1lbnQoKSAhPSBiLT5jb21tb25BbmNlc3RvckNv bnRhaW5lcihBU1NFUlRfTk9fRVhDRVBUSU9OKS0+b3duZXJEb2N1bWVudCgpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBzaG9ydCBzdGFydFRvU3RhcnQgPSBhLT5jb21wYXJlQm91bmRh cnlQb2ludHMoUmFuZ2U6OlNUQVJUX1RPX1NUQVJULCBiLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsK KyAgICBzaG9ydCBlbmRUb0VuZCA9IGEtPmNvbXBhcmVCb3VuZGFyeVBvaW50cyhSYW5nZTo6RU5E X1RPX0VORCwgYiwgQVNTRVJUX05PX0VYQ0VQVElPTik7CisKKyAgICAvLyBGaXJzdCByYW5nZSBj b250YWlucyB0aGUgc2Vjb25kIHJhbmdlLgorICAgIGlmIChzdGFydFRvU3RhcnQgPD0gMCAmJiBl bmRUb0VuZCA+PSAwKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIEVuZCBvZiBmaXJz dCByYW5nZSBpcyBpbnNpZGUgc2Vjb25kIHJhbmdlLgorICAgIGlmIChhLT5jb21wYXJlQm91bmRh cnlQb2ludHMoUmFuZ2U6OkVORF9UT19TVEFSVCwgYiwgQVNTRVJUX05PX0VYQ0VQVElPTikgPj0g MCAmJiBlbmRUb0VuZCA8PSAwKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIFN0YXJ0 IG9mIGZpcnN0IHJhbmdlIGlzIGluc2lkZSBzZWNvbmQgcmFuZ2UuCisgICAgaWYgKHN0YXJ0VG9T dGFydCA+PSAwICYmIGEtPmNvbXBhcmVCb3VuZGFyeVBvaW50cyhSYW5nZTo6U1RBUlRfVE9fRU5E LCBiLCBBU1NFUlRfTk9fRVhDRVBUSU9OKSA8PSAwKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwor ICAgIHJldHVybiBmYWxzZTsKK30KKwogUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2VPZkNvbnRlbnRz KE5vZGUmIG5vZGUpCiB7CiAgICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IFJhbmdlOjpjcmVhdGUo bm9kZS5kb2N1bWVudCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5o IGIvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgKaW5kZXggODc3Yjg2MC4uYzQwZWRlMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL1JhbmdlLmgKQEAgLTE4OSw2ICsxODksNyBAQCBwcml2YXRlOgogUGFzc1JlZlB0cjxSYW5n ZT4gcmFuZ2VPZkNvbnRlbnRzKE5vZGUmKTsKIAogYm9vbCBhcmVSYW5nZXNFcXVhbChjb25zdCBS YW5nZSosIGNvbnN0IFJhbmdlKik7Citib29sIHJhbmdlc092ZXJsYXAoY29uc3QgUmFuZ2UqLCBj b25zdCBSYW5nZSopOwogCiB9IC8vIG5hbWVzcGFjZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5j cHAKaW5kZXggZjhiMTM3ZC4uODU2YjgxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRp dGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApA QCAtMzM2NCwyMyArMzM2NCw0NSBAQCB2b2lkIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVw aG9uZU51bWJlcnMoKQogCiAgICAgVmVjdG9yPFJlZlB0cjxSYW5nZT4+IG1hcmtlZFJhbmdlczsK IAotICAgIFJlZlB0cjxSYW5nZT4gc2VsZWN0ZWRSYW5nZSA9IG1fZnJhbWUuc2VsZWN0aW9uKCku dG9Ob3JtYWxpemVkUmFuZ2UoKTsKLSAgICBpZiAoIXNlbGVjdGVkUmFuZ2UgfHwgKHNlbGVjdGVk UmFuZ2UtPnN0YXJ0Q29udGFpbmVyKCkgPT0gc2VsZWN0ZWRSYW5nZS0+ZW5kQ29udGFpbmVyKCkg JiYgc2VsZWN0ZWRSYW5nZS0+c3RhcnRPZmZzZXQoKSA9PSBzZWxlY3RlZFJhbmdlLT5lbmRPZmZz ZXQoKSkpIHsKKyAgICBGcmFtZVNlbGVjdGlvbiYgZnJhbWVTZWxlY3Rpb24gPSBtX2ZyYW1lLnNl bGVjdGlvbigpOworICAgIGlmICghZnJhbWVTZWxlY3Rpb24uaXNSYW5nZSgpKSB7CiAgICAgICAg IGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQobWFya2VkUmFu Z2VzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIC8vIEV4dGVuZCB0aGUgcmFuZ2Ug YSBmZXcgY2hhcmFjdGVycyBpbiBlYWNoIGRpcmVjdGlvbiB0byBkZXRlY3QgaW5jb21wbGV0ZWx5 IHNlbGVjdGVkIHBob25lIG51bWJlcnMuCisgICAgc3RhdGljIGNvbnN0IGludCBjaGFyYWN0ZXJz VG9FeHRlbmQgPSAxNTsKKyAgICBQb3NpdGlvbiBiYXNlID0gZnJhbWVTZWxlY3Rpb24uc2VsZWN0 aW9uKCkuYmFzZSgpOworICAgIFBvc2l0aW9uIGV4dGVudCA9IGZyYW1lU2VsZWN0aW9uLnNlbGVj dGlvbigpLmV4dGVudCgpOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY2hhcmFjdGVyc1RvRXh0 ZW5kOyArK2kpIHsKKyAgICAgICAgYmFzZSA9IGJhc2UucHJldmlvdXMoQ2hhcmFjdGVyKTsKKyAg ICAgICAgZXh0ZW50ID0gZXh0ZW50Lm5leHQoQ2hhcmFjdGVyKTsKKyAgICB9CisKKyAgICBGcmFt ZVNlbGVjdGlvbiBleHRlbmRlZFNlbGVjdGlvbjsKKyAgICBleHRlbmRlZFNlbGVjdGlvbi5zZXRC YXNlKGJhc2UpOworICAgIGV4dGVuZGVkU2VsZWN0aW9uLnNldEV4dGVudChleHRlbnQpOworICAg IFJlZlB0cjxSYW5nZT4gZXh0ZW5kZWRSYW5nZSA9IGV4dGVuZGVkU2VsZWN0aW9uLnRvTm9ybWFs aXplZFJhbmdlKCk7CisKICAgICAvLyBGSVhNRTogVGhpcyB3b24ndCB3b3JrIGlmIGEgcGhvbmUg bnVtYmVyIHNwYW5zIG11bHRpcGxlIGNodW5rcyBvZiB0ZXh0IGZyb20gdGhlIHBlcnNwZWN0aXZl IG9mIHRoZSBUZXh0SXRlcmF0b3IKICAgICAvLyAoQnkgYSBzdHlsZSBjaGFuZ2UsIGltYWdlLCBs aW5lIGJyZWFrLCBldGMuKQogICAgIC8vIE9uZSBpZGVhIHRvIGhhbmRsZSB0aGlzIHdvdWxkIGJl IGEgbW9kZWwgbGlrZSB0ZXh0IHNlYXJjaCB0aGF0IHVzZXMgYSByb3RhdGluZyB3aW5kb3cuCi0g ICAgZm9yIChUZXh0SXRlcmF0b3IgdGV4dENodW5rKHNlbGVjdGVkUmFuZ2UuZ2V0KCkpOyAhdGV4 dENodW5rLmF0RW5kKCk7IHRleHRDaHVuay5hZHZhbmNlKCkpIHsKKyAgICBmb3IgKFRleHRJdGVy YXRvciB0ZXh0Q2h1bmsoZXh0ZW5kZWRSYW5nZS5nZXQoKSk7ICF0ZXh0Q2h1bmsuYXRFbmQoKTsg dGV4dENodW5rLmFkdmFuY2UoKSkgewogICAgICAgICAvLyBUZXh0SXRlcmF0b3IgaXMgc3VwcG9z ZWQgdG8gbmV2ZXIgcmV0dXJucyBhIFJhbmdlIHRoYXQgc3BhbnMgbXVsdGlwbGUgTm9kZXMuCiAg ICAgICAgIEFTU0VSVCh0ZXh0Q2h1bmsucmFuZ2UoKS0+c3RhcnRDb250YWluZXIoKSA9PSB0ZXh0 Q2h1bmsucmFuZ2UoKS0+ZW5kQ29udGFpbmVyKCkpOwogCiAgICAgICAgIHNjYW5SYW5nZUZvclRl bGVwaG9uZU51bWJlcnMoKnRleHRDaHVuay5yYW5nZSgpLCB0ZXh0Q2h1bmsudGV4dCgpLCBtYXJr ZWRSYW5nZXMpOwogICAgIH0KIAotICAgIGNsaWVudCgpLT5zZWxlY3RlZFRlbGVwaG9uZU51bWJl clJhbmdlc0NoYW5nZWQobWFya2VkUmFuZ2VzKTsKKyAgICAvLyBPbmx5IGNvbnNpZGVyIHJhbmdl cyB3aXRoIGEgZGV0ZWN0ZWQgdGVsZXBob25lIG51bWJlciBpZiB0aGV5IG92ZXJsYXAgd2l0aCB0 aGUgYWN0dWFsIHNlbGVjdGlvbiByYW5nZS4KKyAgICBWZWN0b3I8UmVmUHRyPFJhbmdlPj4gZXh0 ZW5kZWRNYXJrZWRSYW5nZXM7CisgICAgUmVmUHRyPFJhbmdlPiBzZWxlY3RlZFJhbmdlID0gZnJh bWVTZWxlY3Rpb24udG9Ob3JtYWxpemVkUmFuZ2UoKTsKKyAgICBmb3IgKGF1dG8mIHJhbmdlIDog bWFya2VkUmFuZ2VzKSB7CisgICAgICAgIGlmIChyYW5nZXNPdmVybGFwKHJhbmdlLmdldCgpLCBz ZWxlY3RlZFJhbmdlLmdldCgpKSkKKyAgICAgICAgICAgIGV4dGVuZGVkTWFya2VkUmFuZ2VzLmFw cGVuZChyYW5nZSk7CisgICAgfQorCisgICAgY2xpZW50KCktPnNlbGVjdGVkVGVsZXBob25lTnVt YmVyUmFuZ2VzQ2hhbmdlZChleHRlbmRlZE1hcmtlZFJhbmdlcyk7CiB9CiAKIHZvaWQgRWRpdG9y OjpzY2FuUmFuZ2VGb3JUZWxlcGhvbmVOdW1iZXJzKFJhbmdlJiByYW5nZSwgY29uc3QgU3RyaW5n VmlldyYgc3RyaW5nVmlldywgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JiBtYXJrZWRSYW5nZXMpCg==