[InputEvent] Fill |data| field for 'input' event InsertText

third_party/WebKit/Source/core/editing/Editor.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 124 matching lines @@
             return InputEvent::InputType::InsertText;
         default:
             return InputEvent::InputType::None;
         }
     }
 
     // TODO(chongz): Handle other edit actions.
     return InputEvent::InputType::None;
 }
 
+String dataFromCommand(const CompositeEditCommand* command)
+{
+    if (command->isTypingCommand()) {

[yosin_UTC9, 2016/07/05 01:22:07]

nit: To reduce indentation, we could write:

if (!command->isTypingCommand())
    return emptyString();
....

[chongz, 2016/07/05 20:33:27]

Done.

+        const TypingCommand* typingCommand = toTypingCommand(command);
+        // Only InsertText has |data|.
+        switch (typingCommand->commandTypeOfOpenCommand()) {
+        case TypingCommand::InsertText:
+            return typingCommand->textOfLastCommand();

[yosin_UTC9, 2016/07/05 01:22:07]

Can we make |textOfLastCommand()| as virtual function of |EditCommand|?
If so, we don't need to dispatching by type here.

[chongz, 2016/07/05 20:33:27]

Changed to |textData()|.

+        default:
+            return emptyString();
+        }
+    }
+
+    return emptyString();
+}
+
 InputEvent::EventIsComposing isComposingFromCommand(const CompositeEditCommand* command)
 {
     if (command->isTypingCommand() && toTypingCommand(command)->compositionType() != TypingCommand::TextCompositionNone)
         return InputEvent::EventIsComposing::IsComposing;
     return InputEvent::EventIsComposing::NotComposing;
 }
 
 } // anonymous namespace
 
 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor)
@@ skipping 590 matching lines @@
     EventQueueScope scope;
     frame().document()->updateStyleAndLayout();
 
     // Request spell checking after pasting before any further DOM change.
     requestSpellcheckingAfterApplyingCommand(cmd);
 
     EditCommandComposition* composition = cmd->composition();
     DCHECK(composition);
     dispatchEditableContentChangedEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement());
     // TODO(chongz): Filter empty InputType after spec is finalized.
-    // TODO(chongz): Fill in |data| field.
-    dispatchInputEventEditableContentChanged(composition->startingRootEditableElement(), composition->endingRootEditableElement(), inputTypeFromCommand(cmd), emptyString(), isComposingFromCommand(cmd));
+    dispatchInputEventEditableContentChanged(composition->startingRootEditableElement(), composition->endingRootEditableElement(), inputTypeFromCommand(cmd), dataFromCommand(cmd), isComposingFromCommand(cmd));
     VisibleSelection newSelection(cmd->endingSelection());
 
     // Don't clear the typing style with this selection change. We do those things elsewhere if necessary.
     changeSelectionAfterCommand(newSelection, 0);
 
     if (!cmd->preservesTypingStyle())
         frame().selection().clearTypingStyle();
 
     // Command will be equal to last edit command only in the case of typing
     if (m_lastEditCommand.get() == cmd) {
@@ skipping 656 matching lines @@
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_undoStack);
     visitor->trace(m_mark);
 }
 
 } // namespace blink