Revert 'Make "compositionend" event fired after setting caret position'

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 233 matching lines @@
 
 bool InputMethodController::finishComposingText(
     ConfirmCompositionBehavior confirmBehavior) {
   if (!hasComposition())
     return false;
 
   if (confirmBehavior == KeepSelection) {
     PlainTextRange oldOffsets = getSelectionOffsets();
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
-    const String& composing = composingText();
-    const bool result = replaceComposition(composing);
+    bool result = replaceComposition(composingText());
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited. see http://crbug.com/590369 for more details.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     setSelectionOffsets(oldOffsets);
-
-    // No DOM update after 'compositionend'.
-    dispatchCompositionEndEvent(frame(), composing);
-
     return result;
   }
 
   return replaceCompositionAndMoveCaret(composingText(), 0,
                                         Vector<CompositionUnderline>());
 }
 
 bool InputMethodController::commitText(
     const String& text,
     const Vector<CompositionUnderline>& underlines,
@@ skipping 34 matching lines @@
 
   clear();
 
   insertTextDuringCompositionWithEvents(
       frame(), text, 0,
       TypingCommand::TextCompositionType::TextCompositionConfirm);
   // Event handler might destroy document.
   if (!isAvailable())
     return false;
 
+  // No DOM update after 'compositionend'.
+  dispatchCompositionEndEvent(frame(), text);
+
   return true;
 }
 
 // relativeCaretPosition is relative to the end of the text.
 static int computeAbsoluteCaretPosition(size_t textStart,
                                         size_t textLength,
                                         int relativeCaretPosition) {
   return textStart + textLength + relativeCaretPosition;
 }
 
@@ skipping 27 matching lines @@
   DCHECK(hasComposition());
   PlainTextRange compositionRange =
       PlainTextRange::create(*rootEditableElement, *m_compositionRange);
   if (compositionRange.isNull())
     return false;
   int textStart = compositionRange.start();
 
   if (!replaceComposition(text))
     return false;
 
+  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited. see http://crbug.com/590369 for more details.
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
   addCompositionUnderlines(underlines, rootEditableElement, textStart);
 
   int absoluteCaretPosition = computeAbsoluteCaretPosition(
       textStart, text.length(), relativeCaretPosition);
-  if (!moveCaret(absoluteCaretPosition))
-    return false;
-
-  // No DOM update after 'compositionend'.
-  dispatchCompositionEndEvent(frame(), text);
-
-  return true;
+  return moveCaret(absoluteCaretPosition);
 }
 
 bool InputMethodController::insertText(const String& text) {
   if (dispatchBeforeInputInsertText(document().focusedElement(), text) !=
       DispatchEventResult::NotCanceled)
     return false;
   editor().insertText(text, 0);
   return true;
 }
 
@@ skipping 148 matching lines @@
       // we simply delete selection without sending extra events.
       TypingCommand::deleteSelection(document(),
                                      TypingCommand::PreventSpellChecking);
     }
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited. see http://crbug.com/590369 for more details.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     setEditableSelectionOffsets(selectedRange);
-
-    // No DOM update after 'compositionend'.
-    return dispatchCompositionEndEvent(frame(), text);
+    return;
   }
 
   // We should send a 'compositionstart' event only when the given text is not
   // empty because this function doesn't create a composition node when the text
   // is empty.
   if (!hasComposition()) {
     target->dispatchEvent(
         CompositionEvent::create(EventTypeNames::compositionstart,
                                  frame().domWindow(), frame().selectedText()));
     if (!isAvailable())
@@ skipping 514 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink