Introduce 'TextCompositionCancel' for cancelComposition

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 66 matching lines @@
 //   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)
+             TypingCommand::TextCompositionType::TextCompositionConfirm ||
+         compositionType ==
+             TypingCommand::TextCompositionType::TextCompositionCancel)
       << "compositionType should be TextCompositionUpdate or "
-         "TextCompositionConfirm, but got "
+         "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.
@@ skipping 19 matching lines @@
   // 'compositionupdate' event handler may destroy document.
   if (!frame.document())
     return;
 
   switch (compositionType) {
     case TypingCommand::TextCompositionType::TextCompositionUpdate:
       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 233 matching lines @@
   clear();
 
   // TODO(chongz): Figure out which InputType should we use here.
   dispatchBeforeInputFromComposition(
       document().focusedElement(),
       InputEvent::InputType::DeleteComposedCharacterBackward, nullAtom,
       InputEvent::EventCancelable::NotCancelable);
   dispatchCompositionUpdateEvent(frame(), emptyString());
   insertTextDuringCompositionWithEvents(
       frame(), emptyString(), 0,
-      TypingCommand::TextCompositionType::TextCompositionConfirm);
+      TypingCommand::TextCompositionType::TextCompositionCancel);
   // Event handler might destroy document.
   if (!isAvailable())
     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 797 matching lines @@
   return WebTextInputTypeNone;
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink