summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-01-25 10:29:42 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-25 10:29:42 -0800
commitf194ee8ea5e8e00930a6caddc3ef6f5031493c2b (patch)
tree62771917242b6b908db2abe37f9df9bc737ccddb /WebKit/android
parentfc4f8486a2f2be92cdd4811c86aa9ee0a49ee576 (diff)
parent3b3752c8d25150e6cf8d31c0fc5d9f8953a5c4f7 (diff)
downloadexternal_webkit-f194ee8ea5e8e00930a6caddc3ef6f5031493c2b.zip
external_webkit-f194ee8ea5e8e00930a6caddc3ef6f5031493c2b.tar.gz
external_webkit-f194ee8ea5e8e00930a6caddc3ef6f5031493c2b.tar.bz2
Merge "allow text node boundaries to delimit addresses"
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/nav/CacheBuilder.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 784c3aa..c665887 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1889,7 +1889,9 @@ CacheBuilder::FoundState CacheBuilder::FindPartialAddress(const UChar* baseChars
s->mProgress = ZIP_CODE;
// a couple of delimiters is an indication that the state name is good
// or, a non-space / non-alpha-digit is also good
- s->mZipDelimiter = s->mLineCount > 2 || isUnicodeSpace(ch) == false;
+ s->mZipDelimiter = s->mLineCount > 2
+ || isUnicodeSpace(ch) == false
+ || chars == s->mEnd;
if (WTF::isASCIIDigit(ch))
s->mZipStart = chars;
goto resetState;