Remove replaceComposition() calls in finishComposingText.

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 229 matching lines @@
   // to override checks. See <http://bugs.webkit.org/show_bug.cgi?id=15781>
   frame().selection().setSelection(
       SelectionInDOMTree::Builder().setBaseAndExtent(range).build(), 0);
 }
 
 bool InputMethodController::finishComposingText(
     ConfirmCompositionBehavior confirmBehavior) {
   if (!hasComposition())
     return false;
 
+  const String& composing = composingText();
+
   if (confirmBehavior == KeepSelection) {
     PlainTextRange oldOffsets = getSelectionOffsets();
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
-    bool result = replaceComposition(composingText());
+    clear();
 
-    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-    // needs to be audited. see http://crbug.com/590369 for more details.
-    document().updateStyleAndLayoutIgnorePendingStylesheets();
-
+    dispatchCompositionEndEvent(frame(), composing);
     setSelectionOffsets(oldOffsets);
-    return result;
+    return true;
   }
 
-  return replaceCompositionAndMoveCaret(composingText(), 0,
-                                        Vector<CompositionUnderline>());
+  Element* rootEditableElement = frame().selection().rootEditableElement();
+  if (!rootEditableElement)
+    return false;
+  PlainTextRange compositionRange =
+      PlainTextRange::create(*rootEditableElement, *m_compositionRange);
+  if (compositionRange.isNull())
+    return false;
+
+  clear();
+
+  if (!moveCaret(compositionRange.end()))
+    return false;
+
+  dispatchCompositionEndEvent(frame(), composing);
+  return true;
 }
 
 bool InputMethodController::commitText(
     const String& text,
     const Vector<CompositionUnderline>& underlines,
     int relativeCaretPosition) {
   if (hasComposition()) {
     return replaceCompositionAndMoveCaret(text, relativeCaretPosition,
                                           underlines);
   }
@@ skipping 791 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink