Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: Source/core/editing/iterators/CharacterIterator.cpp

Issue 1119663002: Making Unicode character names consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code changes to correct Test Expectation Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/iterators/CharacterIterator.cpp
diff --git a/Source/core/editing/iterators/CharacterIterator.cpp b/Source/core/editing/iterators/CharacterIterator.cpp
index 2d8eef111804315f6910d47608d0f642f5e06454..81b2c4f4e97397c3a1398b7494884c7cc29651cd 100644
--- a/Source/core/editing/iterators/CharacterIterator.cpp
+++ b/Source/core/editing/iterators/CharacterIterator.cpp
@@ -249,7 +249,7 @@ static UStringSearch* createSearcher()
// without setting both the pattern and the text.
UErrorCode status = U_ZERO_ERROR;
String searchCollatorName = currentSearchLocaleID() + String("@collation=search");
- UStringSearch* searcher = usearch_open(&newlineCharacter, 1, &newlineCharacter, 1, searchCollatorName.utf8().data(), 0, &status);
+ UStringSearch* searcher = usearch_open(&characterNewline, 1, &characterNewline, 1, searchCollatorName.utf8().data(), 0, &status);
ASSERT(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING || status == U_USING_DEFAULT_WARNING);
return searcher;
}
@@ -336,8 +336,8 @@ inline SearchBuffer::~SearchBuffer()
// text=buffer). Otheriwse, usearch_reset() will results in 'use-after-free'
// error.
UErrorCode status = U_ZERO_ERROR;
- usearch_setPattern(blink::searcher(), &newlineCharacter, 1, &status);
- usearch_setText(blink::searcher(), &newlineCharacter, 1, &status);
+ usearch_setPattern(blink::searcher(), &characterNewline, 1, &status);
+ usearch_setText(blink::searcher(), &characterNewline, 1, &status);
ASSERT(status == U_ZERO_ERROR);
unlockSearcher();

Powered by Google App Engine
This is Rietveld 408576698