diff options
| author | Patrick Scott <phanna@android.com> | 2010-11-08 11:07:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-08 11:07:07 -0800 |
| commit | 31ee2547d67e901b5e9af790f1f4903ecf0faffa (patch) | |
| tree | eb198951513b363fbc8508ec20b660ca8337a511 /WebKit/android/nav | |
| parent | f05ca1bf833d1ea7eb958ab68c97d1c97b369655 (diff) | |
| parent | c66ad0770a778012c9a4dd154234a4e553f03b96 (diff) | |
| download | external_webkit-31ee2547d67e901b5e9af790f1f4903ecf0faffa.zip external_webkit-31ee2547d67e901b5e9af790f1f4903ecf0faffa.tar.gz external_webkit-31ee2547d67e901b5e9af790f1f4903ecf0faffa.tar.bz2 | |
Merge "Encode email addresses that are not mailto: links."
Diffstat (limited to 'WebKit/android/nav')
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index a7015e7..1643a0d 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -2835,9 +2835,11 @@ tryNextCheckType: while ((index = exported->find(',', index)) >= 0) exported->replace(index, 1, escapedComma); } break; - case EMAIL_CACHEDNODETYPE: + case EMAIL_CACHEDNODETYPE: { + String encoded = WebCore::encodeWithURLEscapeSequences(*exported); + exported->swap(encoded); exported->insert(WTF::String("mailto:"), 0); - break; + } break; case PHONE_CACHEDNODETYPE: exported->insert(WTF::String("tel:"), 0); break; @@ -2853,9 +2855,13 @@ noTextMatch: bool CacheBuilder::IsMailboxChar(UChar ch) { - static const unsigned body[] = {0x03ff6000, 0x87fffffe, 0x07fffffe}; // 0-9 . - A-Z _ a-z + // According to http://en.wikipedia.org/wiki/Email_address + // ! # $ % & ' * + - . / 0-9 = ? + // A-Z ^ _ + // ` a-z { | } ~ + static const unsigned body[] = {0xa3ffecfa, 0xc7fffffe, 0x7fffffff}; ch -= 0x20; - if (ch > 'z' - 0x20) + if (ch > '~' - 0x20) return false; return (body[ch >> 5] & 1 << (ch & 0x1f)) != 0; } |