Reset word iterators when changing the spellchecker language.

chrome/renderer/spellchecker/spellcheck.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.
 
 #include "chrome/renderer/spellchecker/spellcheck.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop_proxy.h"
@@ skipping 111 matching lines @@
                       const std::vector<std::string>& custom_words,
                       const std::string& language) {
   initialized_ = true;
   hunspell_.reset();
   bdict_file_.reset();
   file_ = file;
   is_using_platform_spelling_engine_ =
       file == base::kInvalidPlatformFileValue && !language.empty();
 
   character_attributes_.SetDefaultLanguage(language);
+  text_iterator_.Close();
+  contraction_iterator_.Close();

[Hajime Morrita, 2012/08/28 07:00:34]

Nit* It's confusing to call Close() during Init().
It would be nice to have some better alias like Reset().

[Hironori Bono, 2012/08/29 08:41:45]

Done. I have renamed Close() to Reset().

 
   custom_words_.insert(custom_words_.end(),
                        custom_words.begin(), custom_words.end());
 
   // We delay the actual initialization of hunspell until it is needed.
 }
 
 bool SpellCheck::SpellCheckWord(
     const char16* in_word,
     int in_word_len,
@@ skipping 372 matching lines @@
       }
     }
     list[i] = WebKit::WebTextCheckingResult(type,
                                             word_location + line_offset,
                                             word_length,
                                             spellcheck_results[i].replacement);
   }
   textcheck_results->swap(list);
 }
 #endif