Audit the use of updateStyleAndLayoutIgnorePendingStylesheets in...

Audit the use of updateStyleAndLayoutIgnorePendingStylesheets in InputMethodController::setCompositionFromExistingText

BUG=590369

Review-Url: https://codereview.chromium.org/2316963003
Cr-Commit-Position: refs/heads/master@{#417196}

third_party/WebKit/Source/core/editing/InputMethodController.cpp

@@ -428,9 +428,7 @@ void InputMethodController::setCompositionFromExistingText(const Vector<Composit
     if (!editable)
         return;
 
-    // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
-    // see http://crbug.com/590369 for more details.
-    editable->document().updateStyleAndLayoutIgnorePendingStylesheets();
+    DCHECK(!editable->document().needsLayoutTreeUpdate());
 
     const EphemeralRange range = PlainTextRange(compositionStart, compositionEnd).createRange(*editable);
     if (range.isNull())

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -1239,6 +1239,10 @@ bool WebLocalFrameImpl::setCompositionFromExistingText(int compositionStart, int
     if (compositionStart == compositionEnd)
         return true;
 
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
     inputMethodController.setCompositionFromExistingText(CompositionUnderlineVectorBuilder(underlines), compositionStart, compositionEnd);
 
     return true;