mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-24 23:22:50 +00:00
41 lines
2 KiB
Diff
41 lines
2 KiB
Diff
diff -up chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc.breakiterator chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc
|
|
--- chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc.breakiterator 2016-08-10 20:21:12.391496917 +0200
|
|
+++ chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc 2016-08-10 20:21:36.684191516 +0200
|
|
@@ -332,8 +332,8 @@ bool SpellcheckWordIterator::Initialize(
|
|
if (rule.empty())
|
|
return false;
|
|
|
|
- std::unique_ptr<BreakIterator> iterator(
|
|
- new BreakIterator(base::string16(), rule));
|
|
+ std::unique_ptr<base::i18n::BreakIterator> iterator(
|
|
+ new base::i18n::BreakIterator(base::string16(), rule));
|
|
if (!iterator->Init()) {
|
|
// Since we're not passing in any text, the only reason this could fail
|
|
// is if we fail to parse the rules. Since the rules are hardcoded,
|
|
@@ -388,7 +388,7 @@ SpellcheckWordIterator::WordIteratorStat
|
|
const size_t start = iterator_->prev();
|
|
const size_t length = iterator_->pos() - start;
|
|
switch (iterator_->GetWordBreakStatus()) {
|
|
- case BreakIterator::IS_WORD_BREAK: {
|
|
+ case base::i18n::BreakIterator::IS_WORD_BREAK: {
|
|
if (Normalize(start, length, word_string)) {
|
|
*word_start = start;
|
|
*word_length = length;
|
|
@@ -396,7 +396,7 @@ SpellcheckWordIterator::WordIteratorStat
|
|
}
|
|
break;
|
|
}
|
|
- case BreakIterator::IS_SKIPPABLE_WORD: {
|
|
+ case base::i18n::BreakIterator::IS_SKIPPABLE_WORD: {
|
|
*word_string = iterator_->GetString();
|
|
*word_start = start;
|
|
*word_length = length;
|
|
@@ -404,7 +404,7 @@ SpellcheckWordIterator::WordIteratorStat
|
|
}
|
|
// |iterator_| is RULE_BASED so the break status should never be
|
|
// IS_LINE_OR_CHAR_BREAK.
|
|
- case BreakIterator::IS_LINE_OR_CHAR_BREAK: {
|
|
+ case base::i18n::BreakIterator::IS_LINE_OR_CHAR_BREAK: {
|
|
NOTREACHED();
|
|
break;
|
|
}
|