Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: third_party/WebKit/Source/core/editing/InputMethodController.cpp

Issue 1752933002: [InputEvent] Fire 'beforeinput' during typing, pressing hot keys and IME composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/InputMethodController.cpp
diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.cpp b/third_party/WebKit/Source/core/editing/InputMethodController.cpp
index e0bec0d04b7f7e5410c475b8e79a6102a73e6c87..ca051a0c662ea21fe8e1dd82ca3db819b1c1d4e9 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodController.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodController.cpp
@@ -172,6 +172,11 @@ bool InputMethodController::confirmComposition(const String& text, ConfirmCompos
clear();
+ // TODO(chongz): DOM update should happen before 'compositionend' and along with 'compositionupdate'.
+ // https://crbug.com/575294
+ if (dispatchBeforeInputInsertText(frame().document()->focusedElement(), text) != DispatchEventResult::NotCanceled)
+ return false;
+
insertTextForConfirmedComposition(text);
return true;
@@ -182,6 +187,10 @@ bool InputMethodController::confirmCompositionOrInsertText(const String& text, C
if (!hasComposition()) {
if (!text.length())
return false;
+
+ if (dispatchBeforeInputInsertText(frame().document()->focusedElement(), text) != DispatchEventResult::NotCanceled)
+ return false;
+
editor().insertText(text, 0);
return true;
}
@@ -278,8 +287,13 @@ void InputMethodController::setComposition(const String& text, const Vector<Comp
else
event = CompositionEvent::create(EventTypeNames::compositionend, frame().domWindow(), text);
}
- if (event)
+ if (event) {
+ // TODO(chongz): Support canceling IME composition.
+ // TODO(chongz): Should fire InsertText or DeleteComposedCharacter based on action.
+ if (event->type() == EventTypeNames::compositionupdate)
+ dispatchBeforeInputFromComposition(target, InputEvent::InputType::InsertText, text);
target->dispatchEvent(event);
+ }
}
// If text is empty, then delete the old composition here. If text is non-empty, InsertTextCommand::input
@@ -453,6 +467,8 @@ void InputMethodController::extendSelectionAndDelete(int before, int after)
break;
++before;
} while (frame().selection().start() == frame().selection().end() && before <= static_cast<int>(selectionOffsets.start()));
+ // TODO(chongz): According to spec |data| should be "forward" or "backward".
+ dispatchBeforeInputEditorCommand(frame().document()->focusedElement(), InputEvent::InputType::DeleteContent);
TypingCommand::deleteSelection(*frame().document());
}

Powered by Google App Engine
This is Rietveld 408576698