Make SpellChecker::respondToChangedSelection() to update layout tree explicitly

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 758 matching lines @@
     DocumentMarkerVector markers = frame().document()->markers().markersInRange(caretRange, DocumentMarker::MisspellingMarkers());
     if (markers.size() < 1 || markers[0]->startOffset() >= markers[0]->endOffset())
         return;
     EphemeralRange markerRange = EphemeralRange(Position(caretRange.startPosition().computeContainerNode(), markers[0]->startOffset()), Position(caretRange.endPosition().computeContainerNode(), markers[0]->endOffset()));
     if (markerRange.isNull())
         return;
     frame().selection().setSelection(VisibleSelection(markerRange), CharacterGranularity);
     frame().editor().replaceSelectionWithText(text, false, false);
 }
 
+static bool shouldCheckOldSelection(const VisibleSelection& oldSelection)
+{
+    if (!oldSelection.start().inShadowIncludingDocument())
+        return false;
+    if (isSelectionInTextField(oldSelection))
+        return false;
+    if (isSelectionInTextArea(oldSelection))
+        return true;
+    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;
-    if (isContinuousSpellCheckingEnabled) {
+    if (isContinuousSpellCheckingEnabled && closeTyping) {

[yoichio, 2016/06/24 09:52:39]

Why do you introduce the |closeTyping| condition?

[yosin_UTC9, 2016/06/27 01:46:49]

This if-statement does nothing if |!closeTyping| except for calculating
|newAdjacentWords|.
When |closeType| is true and another condition, e.g.
|shouldCheckOldSelection(oldSelection)| is true, it calls
|spellCheckOldSelection()| at L821.

[yoichio, 2016/06/27 02:10:40]

I see. then we can move the |shouldCheckOldSelection(oldSelection)| condition
 to this line.

[yosin_UTC9, 2016/06/27 04:11:07]

You're right. Good catch!
I moved it.

         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 if (newSelection.isContentEditable() || caretBrowsing) {
-            VisiblePosition newStart(newSelection.visibleStart());
-            newAdjacentWords = VisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
+        } 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.
-        if (closeTyping
-            && !isSelectionInTextField(oldSelection)
-            && (isSelectionInTextArea(oldSelection) || oldSelection.isContentEditable())
-            && oldSelection.start().inShadowIncludingDocument()) {
+        if (shouldCheckOldSelection(oldSelection))
             spellCheckOldSelection(oldSelection, newAdjacentWords);
-        }
     }
 
     // When continuous spell checking is off, existing markers disappear after the selection changes.
     if (!isContinuousSpellCheckingEnabled)
         frame().document()->markers().removeMarkers(DocumentMarker::Spelling);
     if (!isContinuousGrammarCheckingEnabled)
         frame().document()->markers().removeMarkers(DocumentMarker::Grammar);
 }
 
 void SpellChecker::removeSpellingMarkers()
@@ skipping 124 matching lines @@
     visitor->trace(m_frame);
     visitor->trace(m_spellCheckRequester);
 }
 
 void SpellChecker::prepareForLeakDetection()
 {
     m_spellCheckRequester->prepareForLeakDetection();
 }
 
 } // namespace blink