Fix the bug that matras are input twice for Indian languages.

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 56 matching lines @@
 }
 
 // Used to insert/replace text during composition update and confirm composition.
 // Procedure:
 //   1. Fire 'beforeinput' event for (TODO(chongz): deleted composed text) and inserted text
 //   2. Fire 'compositionupdate' event
 //   3. Fire TextEvent and modify DOM
 //   TODO(chongz): 4. Fire 'input' event
 void insertTextDuringCompositionWithEvents(LocalFrame& frame, const String& text, TypingCommand::Options options, TypingCommand::TextCompositionType compositionType)
 {
-    DCHECK(compositionType == TypingCommand::TextCompositionType::TextCompositionUpdate || compositionType == TypingCommand::TextCompositionType::TextCompositionConfirm)
-        << "compositionType should be TextCompositionUpdate or TextCompositionConfirm, but got " << static_cast<int>(compositionType);
+    DCHECK(compositionType == TypingCommand::TextCompositionType::TextCompositionUpdate || compositionType == TypingCommand::TextCompositionType::TextCompositionConfirm || compositionType == TypingCommand::TextCompositionType::TextCompositionCancel)
+        << "compositionType should be TextCompositionUpdate or TextCompositionConfirm or TextCompositionCancel, but got " << static_cast<int>(compositionType);
     if (!frame.document())
         return;
 
     Element* target = frame.document()->focusedElement();
     if (!target)
         return;
 
     // TODO(chongz): Fire 'beforeinput' for the composed text being replaced/deleted.
 
     // Only the last confirmed text is cancelable.
     InputEvent::EventCancelable beforeInputCancelable = (compositionType == TypingCommand::TextCompositionType::TextCompositionUpdate) ? InputEvent::EventCancelable::NotCancelable : InputEvent::EventCancelable::IsCancelable;
     DispatchEventResult result = dispatchBeforeInputFromComposition(target, InputEvent::InputType::InsertText, text, beforeInputCancelable);
 
     if (beforeInputCancelable == InputEvent::EventCancelable::IsCancelable && result != DispatchEventResult::NotCanceled)
         return;
 
     // 'beforeinput' event handler may destroy document.
     if (!frame.document())
         return;
 
     dispatchCompositionUpdateEvent(frame, text);
     // 'compositionupdate' event handler may destroy document.
     if (!frame.document())
         return;
 
     switch (compositionType) {
     case TypingCommand::TextCompositionType::TextCompositionUpdate:
+    case TypingCommand::TextCompositionType::TextCompositionConfirm:
         TypingCommand::insertText(*frame.document(), text, options, compositionType);
         break;
-    case TypingCommand::TextCompositionType::TextCompositionConfirm:
+    case TypingCommand::TextCompositionType::TextCompositionCancel:
         // TODO(chongz): Use TypingCommand::insertText after TextEvent was removed. (Removed from spec since 2012)
         // See TextEvent.idl.
         frame.eventHandler().handleTextInputEvent(text, 0, TextEventInputComposition);
         break;
     default:
         NOTREACHED();
     }
     // TODO(chongz): Fire 'input' event.
 }
 
@@ skipping 147 matching lines @@
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
     if (frame().selection().isNone())
         return;
 
     clear();
 
     // TODO(chongz): Update InputType::DeleteComposedCharacter with latest discussion.
     dispatchBeforeInputFromComposition(frame().document()->focusedElement(), InputEvent::InputType::DeleteComposedCharacter, emptyString(), InputEvent::EventCancelable::NotCancelable);
     dispatchCompositionUpdateEvent(frame(), emptyString());
-    insertTextDuringCompositionWithEvents(frame(), emptyString(), 0, TypingCommand::TextCompositionType::TextCompositionConfirm);
+    insertTextDuringCompositionWithEvents(frame(), emptyString(), 0, TypingCommand::TextCompositionType::TextCompositionCancel);

[Changwan Ryu, 2016/07/14 02:11:08]

any chance that we incorrectly adjust selection for composition cancel? do we
still need to fix something?

     // Event handler might destroy document.
     if (!frame().document())
         return;
 
     // An open typing command that disagrees about current selection would cause
     // issues with typing later on.
     TypingCommand::closeTyping(m_frame);
 
     // No DOM update after 'compositionend'.
     dispatchCompositionEndEvent(frame(), emptyString());
@@ skipping 273 matching lines @@
     TypingCommand::deleteSelection(*frame().document());
 }
 
 DEFINE_TRACE(InputMethodController)
 {
     visitor->trace(m_frame);
     visitor->trace(m_compositionRange);
 }
 
 } // namespace blink