Fix usage of DocumentLifecycle::DisallowTransitionScope

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 159 matching lines @@
 {
     if (!isSpellCheckingEnabled())
         return;
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     // In the long term we should use idle time spell checker to prevent
     // synchronous layout caused by spell checking (see crbug.com/517298).
     frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
     bool isTextField = false;
     HTMLTextFormControlElement* enclosingHTMLTextFormControlElement = 0;
     if (!isHTMLTextFormControlElement(*element))
         enclosingHTMLTextFormControlElement = enclosingTextFormControl(Position::firstPositionInNode(element));
     element = enclosingHTMLTextFormControlElement ? enclosingHTMLTextFormControlElement : element;
     Element* parent = element;
     if (isHTMLTextFormControlElement(*element)) {
         HTMLTextFormControlElement* textControl = toHTMLTextFormControlElement(element);
         parent = textControl;
@@ skipping 14 matching lines @@
     }
 }
 
 void SpellChecker::ignoreSpelling()
 {
     removeMarkers(frame().selection().selection(), DocumentMarker::Spelling);
 }
 
 void SpellChecker::advanceToNextMisspelling(bool startBeforeSelection)
 {
-    DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
     // The basic approach is to search in two phases - from the selection end to the end of the doc, and
     // then we wrap and search from the doc start to (approximately) where we started.
 
     // Start at the end of the selection, search to edge of document. Starting at the selection end makes
     // repeated "check spelling" commands work.
     VisibleSelection selection(frame().selection().selection());
     Position spellingSearchStart, spellingSearchEnd;
     Range::selectNodeContents(frame().document(), spellingSearchStart, spellingSearchEnd);
 
@@ skipping 96 matching lines @@
 }
 
 void SpellChecker::markMisspellingsAndBadGrammarForMovingParagraphs(const VisibleSelection& movingSelection)
 {
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     // In the long term we should use idle time spell checker to prevent
     // synchronous layout caused by spell checking (see crbug.com/517298).
     frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
     markMisspellingsAndBadGrammar(movingSelection);
 }
 
 void SpellChecker::markMisspellingsAndBadGrammar(const VisibleSelection& selection)
 {
     if (!isSpellCheckingEnabled() || !isSpellCheckingEnabledFor(selection))
         return;
 
     const EphemeralRange& range = selection.toNormalizedEphemeralRange();
@@ skipping 167 matching lines @@
     TextCheckingParagraph paragraph(request->checkingRange(), request->checkingRange());
 
     // Expand the range to encompass entire paragraphs, since text checking needs that much context.
     int selectionOffset = 0;
     int ambiguousBoundaryOffset = -1;
     bool selectionChanged = false;
     bool restoreSelectionAfterChange = false;
     bool adjustSelectionForParagraphBoundaries = false;
 
     {
-        DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+        DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
         if (frame().selection().isCaret()) {
             // Attempt to save the caret position so we can restore it later if needed
             Position caretPosition = frame().selection().end();
             selectionOffset = paragraph.offsetTo(caretPosition);
             restoreSelectionAfterChange = true;
             if (selectionOffset > 0 && (static_cast<unsigned>(selectionOffset) > paragraph.text().length() || paragraph.textCharAt(selectionOffset - 1) == newlineCharacter))
                 adjustSelectionForParagraphBoundaries = true;
             if (selectionOffset > 0 && static_cast<unsigned>(selectionOffset) <= paragraph.text().length() && isAmbiguousBoundaryCharacter(paragraph.textCharAt(selectionOffset - 1)))
                 ambiguousBoundaryOffset = selectionOffset - 1;
@@ skipping 195 matching lines @@
         frame().document()->markers().removeMarkers(DocumentMarker::Spelling);
         frame().document()->markers().removeMarkers(DocumentMarker::Grammar);
         return;
     }
 
     if (!(options & FrameSelection::CloseTyping))
         return;
     if (!shouldCheckOldSelection(oldSelection))
         return;
 
-    DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    // In the long term we should use idle time spell checker to prevent
+    // synchronous layout caused by spell checking (see crbug.com/517298).
+    frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
     VisibleSelection newAdjacentWords;
     const VisibleSelection newSelection = frame().selection().selection();
     if (isSelectionInTextFormControl(newSelection)) {
         const Position newStart = newSelection.start();
         newAdjacentWords.setWithoutValidation(HTMLTextFormControlElement::startOfWord(newStart), HTMLTextFormControlElement::endOfWord(newStart));
     } else {
-        frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
         const bool caretBrowsing = frame().settings() && frame().settings()->caretBrowsingEnabled();
         if (newSelection.isContentEditable() || caretBrowsing) {
             const 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.
@@ skipping 25 matching lines @@
         // textFieldDidEndEditing() and textFieldDidBeginEditing() handle this.
         return;
     }
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     // In the long term we should use idle time spell checker to prevent
     // synchronous layout caused by spell checking (see crbug.com/517298).
     frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    DocumentLifecycle::DisallowTransitionScope(frame().document()->lifecycle());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
 
     VisibleSelection empty;
     spellCheckOldSelection(frame().selection().selection(), empty);
 }
 
 void SpellChecker::spellCheckOldSelection(const VisibleSelection& oldSelection, const VisibleSelection& newAdjacentWords)
 {
     if (!isSpellCheckingEnabled())
         return;
 
@@ skipping 179 matching lines @@
         VisiblePosition newParagraphStart = startOfNextParagraph(createVisiblePosition(paragraphEnd));
         paragraphStart = newParagraphStart.toParentAnchoredPosition();
         paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
         firstIteration = false;
         totalLengthProcessed += currentLength;
     }
     return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 } // namespace blink