Updates SpellcheckWordIterator::GetNextWord to return an enum.

chrome/renderer/spellchecker/spellcheck_language.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_language.h"
 
 #include "base/logging.h"
 #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
 #include "chrome/renderer/spellchecker/spelling_engine.h"
 
@@ skipping 49 matching lines @@
   int word_length;
   if (!text_iterator_.IsInitialized() &&
       !text_iterator_.Initialize(&character_attributes_, true)) {
       // We failed to initialize text_iterator_, return as spelled correctly.
       VLOG(1) << "Failed to initialize SpellcheckWordIterator";
       return true;
   }
 
   text_iterator_.SetText(in_word, in_word_len);
   DCHECK(platform_spelling_engine_.get());
-  while (text_iterator_.GetNextWord(&word, &word_start, &word_length)) {
+  SpellcheckWordIterator::WordIteratorStatus status =
+      text_iterator_.GetNextWord(&word, &word_start, &word_length);
+  while (status != SpellcheckWordIterator::IS_END_OF_TEXT) {

[please use gerrit instead, 2015/08/11 22:54:10]

Is this loop easier to understand? Should be less typing, fewer calls to
GetNextWord(), hence smaller chance of making a mistake.

// clang-format me
for (SpellcheckWordIterator::WordIteratorStatus status =
         text_iterator_.GetNextWord(&word, &word_start, &word_length);
     status != SpellcheckWordIterator::IS_END_OF_TEXT;
     status = text_iterator_.GetNextWord(
         &word, &word_start, &word_length)) {
  // Preserve the existing comments.
  if (status ==  SpellcheckWordIterator::IS_SKIPPABLE_CHAR)
    continue;
  
   if (platform_spelling_engine_->CheckSpelling(word, tag))
     continue;

   if (IsValidContraction(word, tag))
     continue;

  ...
}

[Julius, 2015/08/12 20:25:59]

Done.

+    // Found a character that is not able to be spellchecked so skip it.
+    if (status == SpellcheckWordIterator::IS_SKIPPABLE_CHAR) {
+      status = text_iterator_.GetNextWord(&word, &word_start, &word_length);
+      continue;
+    }
+
     // Found a word (or a contraction) that the spellchecker can check the
     // spelling of.
-    if (platform_spelling_engine_->CheckSpelling(word, tag))
+    if (platform_spelling_engine_->CheckSpelling(word, tag)) {
+      status = text_iterator_.GetNextWord(&word, &word_start, &word_length);
       continue;
+    }
 
     // If the given word is a concatenated word of two or more valid words
     // (e.g. "hello:hello"), we should treat it as a valid word.
-    if (IsValidContraction(word, tag))
+    if (IsValidContraction(word, tag)) {
+      status = text_iterator_.GetNextWord(&word, &word_start, &word_length);
       continue;
+    }
 
     *misspelling_start = word_start;
     *misspelling_len = word_length;
 
     // Get the list of suggested words.
     if (optional_suggestions) {
       platform_spelling_engine_->FillSuggestionList(word,
                                                     optional_suggestions);
     }
     return false;
@@ skipping 15 matching lines @@
     return true;
   }
 
   contraction_iterator_.SetText(contraction.c_str(), contraction.length());
 
   base::string16 word;
   int word_start;
   int word_length;
 
   DCHECK(platform_spelling_engine_.get());
-  while (contraction_iterator_.GetNextWord(&word, &word_start, &word_length)) {
+  SpellcheckWordIterator::WordIteratorStatus status =
+      contraction_iterator_.GetNextWord(&word, &word_start, &word_length);
+  while (status != SpellcheckWordIterator::IS_END_OF_TEXT) {

[please use gerrit instead, 2015/08/11 22:54:10]

for loop again.

[Julius, 2015/08/12 20:25:59]

Done.

     if (!platform_spelling_engine_->CheckSpelling(word, tag))
       return false;
+    status =
+        contraction_iterator_.GetNextWord(&word, &word_start, &word_length);
   }
   return true;
 }
 
 bool SpellcheckLanguage::IsEnabled() {
   DCHECK(platform_spelling_engine_.get());
   return platform_spelling_engine_->IsEnabled();
 }