diff options
| author | John Reck <jreck@google.com> | 2012-02-23 19:28:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-23 19:28:34 -0800 |
| commit | 9f30b61e2c62ca17fb816bff1fc612c3ebc8c4b3 (patch) | |
| tree | 76bfebe26001ae82ed56c2b51975001334cc91b6 /Source/WebKit/android/jni | |
| parent | f9d87a966c18062f6338b3997533ef48b82d8d0a (diff) | |
| parent | b91bac35c4fbd25546c7e06d233f332f45dd0649 (diff) | |
| download | external_webkit-9f30b61e2c62ca17fb816bff1fc612c3ebc8c4b3.zip external_webkit-9f30b61e2c62ca17fb816bff1fc612c3ebc8c4b3.tar.gz external_webkit-9f30b61e2c62ca17fb816bff1fc612c3ebc8c4b3.tar.bz2 | |
Merge "Support phone & email address detection"
Diffstat (limited to 'Source/WebKit/android/jni')
| -rw-r--r-- | Source/WebKit/android/jni/AndroidHitTestResult.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/AndroidHitTestResult.cpp b/Source/WebKit/android/jni/AndroidHitTestResult.cpp index bd3f458..f5dcc48 100644 --- a/Source/WebKit/android/jni/AndroidHitTestResult.cpp +++ b/Source/WebKit/android/jni/AndroidHitTestResult.cpp @@ -29,6 +29,7 @@ #include "AndroidHitTestResult.h" #include "content/address_detector.h" +#include "content/PhoneEmailDetector.h" #include "android/WebHitTestInfo.h" #include "Document.h" #include "Element.h" @@ -149,8 +150,12 @@ void AndroidHitTestResult::buildHighlightRects() void AndroidHitTestResult::searchContentDetectors() { AddressDetector address; + PhoneEmailDetector phoneEmail; WebKit::WebHitTestInfo webHitTest(m_hitTestResult); m_searchResult = address.FindTappedContent(webHitTest); + if (!m_searchResult.valid) { + m_searchResult = phoneEmail.FindTappedContent(webHitTest); + } if (m_searchResult.valid) { m_highlightRects.clear(); RefPtr<Range> range = (PassRefPtr<Range>) m_searchResult.range; |