Update layout at required place in InputMethodController::setComposition()

third_party/WebKit/Source/core/editing/InputMethodController.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 346 matching lines @@
 
     DCHECK(!text.isEmpty());
 
     clear();
 
     insertTextDuringCompositionWithEvents(frame(), text, TypingCommand::SelectInsertedText | TypingCommand::PreventSpellChecking, TypingCommand::TextCompositionUpdate);
     // Event handlers might destroy document.
     if (!frame().document())
         return;
 
+    // TODO(yosin): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited. see http://crbug.com/590369 for more details.
+    frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
     // Find out what node has the composition now.
     Position base = mostForwardCaretPosition(frame().selection().base());
     Node* baseNode = base.anchorNode();
     if (!baseNode || !baseNode->isTextNode())
         return;
 
     Position extent = frame().selection().extent();
     Node* extentNode = extent.anchorNode();
     if (baseNode != extentNode)
         return;
@@ skipping 15 matching lines @@
 
     // In case of exceeding the left boundary.
     int selectionOffsetsStart = static_cast<int>(getSelectionOffsets().start());
     int start = std::max(selectionOffsetsStart + selectionStart, 0);
     int end = std::max(selectionOffsetsStart + selectionEnd, start);
 
     Element* rootEditableElement = frame().selection().rootEditableElement();
     if (!rootEditableElement)
         return;
 
-    // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
-    // see http://crbug.com/590369 for more details.
-    rootEditableElement->document().updateStyleAndLayoutIgnorePendingStylesheets();
-
     // In case of exceeding the right boundary.
     // If both |value1| and |value2| exceed right boundary,
     // PlainTextRange(value1, value2)::createRange() will return a default
     // value, which is [0,0]. In order to get the correct Position in that case,
     // we should make sure |value1| is within range at least.
     const EphemeralRange& startRange = PlainTextRange(0, start).createRange(*rootEditableElement);
     const EphemeralRange& endRange = PlainTextRange(0, end).createRange(*rootEditableElement);
 
     // TODO(yabinh): There should be a better way to create |startPosition| and
     // |endPosition|. But for now, since we can't get |anchorNode| and |offset|,
@@ skipping 144 matching lines @@
     TypingCommand::deleteSelection(*frame().document());
 }
 
 DEFINE_TRACE(InputMethodController)
 {
     visitor->trace(m_frame);
     visitor->trace(m_compositionRange);
 }
 
 } // namespace blink