diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 22:12:24 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 22:12:24 +0000 |
| commit | 7f6563c018b4b432831d953a5846de5e9a139718 (patch) | |
| tree | 6b9c4220ac75267247ceeec07888999dfcc80f67 | |
| parent | 56c90aa5178180a6e74279133a99160889da17e3 (diff) | |
| download | chromium_src-7f6563c018b4b432831d953a5846de5e9a139718.zip chromium_src-7f6563c018b4b432831d953a5846de5e9a139718.tar.gz chromium_src-7f6563c018b4b432831d953a5846de5e9a139718.tar.bz2 | |
Fixed assertions in SearchString.
BUG=None
TEST=Test searching for text in PDF. Shoud not DCHECK in debug builds.
Review URL: http://codereview.chromium.org/3573010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61572 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/pepper_private.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/glue/plugins/pepper_private.cc b/webkit/glue/plugins/pepper_private.cc index 58cd261..48469d8 100644 --- a/webkit/glue/plugins/pepper_private.cc +++ b/webkit/glue/plugins/pepper_private.cc @@ -173,6 +173,8 @@ void SearchString(PP_Module module, UStringSearch* searcher = usearch_open( term, -1, string, -1, webkit_glue::GetWebKitLocale().c_str(), 0, &status); + DCHECK(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING || + status == U_USING_DEFAULT_WARNING); UCollationStrength strength = case_sensitive ? UCOL_TERTIARY : UCOL_PRIMARY; UCollator* collator = usearch_getCollator(searcher); @@ -181,6 +183,7 @@ void SearchString(PP_Module module, usearch_reset(searcher); } + status = U_ZERO_ERROR; int match_start = usearch_first(searcher, &status); DCHECK(status == U_ZERO_ERROR); @@ -192,6 +195,7 @@ void SearchString(PP_Module module, result.length = matched_length; pp_results.push_back(result); match_start = usearch_next(searcher, &status); + DCHECK(status == U_ZERO_ERROR); } *count = pp_results.size(); |