[Editing][CodeHealth] Refactor SpellChecker::respondToChangedSelection

third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 776 matching lines @@
     oldSelection.start().document()->updateStyleAndLayoutIgnorePendingStylesheets();
     return oldSelection.isContentEditable();
 }
 
 void SpellChecker::respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
     TRACE_EVENT0("blink", "SpellChecker::respondToChangedSelection");
     if (!isSpellCheckingEnabledFor(oldSelection))
         return;
 
-    bool closeTyping = options & FrameSelection::CloseTyping;
-    bool isContinuousSpellCheckingEnabled = this->isContinuousSpellCheckingEnabled();
-    bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled;
+    const bool closeTyping = options & FrameSelection::CloseTyping;
+    const bool isContinuousSpellCheckingEnabled = this->isContinuousSpellCheckingEnabled();
     if (isContinuousSpellCheckingEnabled && closeTyping && shouldCheckOldSelection(oldSelection)) {
         VisibleSelection newAdjacentWords;
         bool caretBrowsing = frame().settings() && frame().settings()->caretBrowsingEnabled();
         const VisibleSelection newSelection = frame().selection().selection();
         if (isSelectionInTextFormControl(newSelection)) {
             Position newStart = newSelection.start();
             newAdjacentWords.setWithoutValidation(HTMLTextFormControlElement::startOfWord(newStart), HTMLTextFormControlElement::endOfWord(newStart));
         } else {
             frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
             if (newSelection.isContentEditable() || caretBrowsing) {
                 VisiblePosition newStart(newSelection.visibleStart());
                 newAdjacentWords = VisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
             }
         }
 
         // When typing we check spelling elsewhere, so don't redo it here.
         // If this is a change in selection resulting from a delete operation,
         // oldSelection may no longer be in the document.
         // FIXME(http://crbug.com/382809): if oldSelection is on a textarea
         // element, we cause synchronous layout.
         spellCheckOldSelection(oldSelection, newAdjacentWords);
     }
 
     // When continuous spell checking is off, existing markers disappear after the selection changes.
-    if (!isContinuousSpellCheckingEnabled)
+    if (!isContinuousSpellCheckingEnabled) {

[yosin_UTC9, 2016/06/30 03:49:44]

We prefer early return.

When |isContinuousSpellCheckingEnabled| is false, this function does nothing.
So, we can have following if-statement at L796

if (!isContinuousSpellCheckingEnabled)
  return;

and reduce indentation.

[yoichio, 2016/06/30 05:51:47]

Done.

         frame().document()->markers().removeMarkers(DocumentMarker::Spelling);
-    if (!isContinuousGrammarCheckingEnabled)
         frame().document()->markers().removeMarkers(DocumentMarker::Grammar);
+    }
 }
 
 void SpellChecker::removeSpellingMarkers()
 {
     frame().document()->markers().removeMarkers(DocumentMarker::MisspellingMarkers());
 }
 
 void SpellChecker::removeSpellingMarkersUnderWords(const Vector<String>& words)
 {
     MarkerRemoverPredicate removerPredicate(words);
@@ skipping 117 matching lines @@
     visitor->trace(m_frame);
     visitor->trace(m_spellCheckRequester);
 }
 
 void SpellChecker::prepareForLeakDetection()
 {
     m_spellCheckRequester->prepareForLeakDetection();
 }
 
 } // namespace blink