Reset word iterators when changing the spellchecker language.

chrome/renderer/spellchecker/spellcheck_worditerator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implements a custom word iterator used for our spellchecker.
 
 #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
 
 #include <map>
 #include <string>
@@ skipping 275 matching lines @@
 
 SpellcheckWordIterator::SpellcheckWordIterator()
     : text_(NULL),
       length_(0),
       position_(UBRK_DONE),
       attribute_(NULL),
       iterator_(NULL) {
 }
 
 SpellcheckWordIterator::~SpellcheckWordIterator() {
-  Close();
+  Reset();
 }
 
 bool SpellcheckWordIterator::Initialize(
     const SpellcheckCharAttribute* attribute,
     bool allow_contraction) {
   // Create a custom ICU break iterator with empty text used in this object. (We
   // allow setting text later so we can re-use this iterator.)
   DCHECK(attribute);
   UErrorCode open_status = U_ZERO_ERROR;
   UParseError parse_status;
@@ skipping 66 matching lines @@
     next = ubrk_next(iterator_);
   }
 
   // There aren't any more words in the given text. Set the position to
   // UBRK_DONE to prevent from calling ubrk_next() next time when this function
   // is called.
   position_ = UBRK_DONE;
   return false;
 }
 
-void SpellcheckWordIterator::Close() {
+void SpellcheckWordIterator::Reset() {
   if (iterator_) {
     ubrk_close(iterator_);
     iterator_ = NULL;
   }
 }
 
 bool SpellcheckWordIterator::Normalize(int input_start,
                                        int input_length,
                                        string16* output_string) const {
   // We use NFKC (Normalization Form, Compatible decomposition, followed by
@@ skipping 10 matching lines @@
   if (status != U_ZERO_ERROR && status != U_STRING_NOT_TERMINATED_WARNING)
     return false;
 
   // Copy the normalized text to the output.
   icu::StringCharacterIterator it(output);
   for (UChar c = it.first(); c != icu::CharacterIterator::DONE; c = it.next())
     attribute_->OutputChar(c, output_string);
 
   return !output_string->empty();
 }