nephele
/
haikuwebkit
1
0
Fork 0
Code Issues Releases Activity
haikuwebkit/LayoutTests/fast/events/before-input-events-prevent...

14 lines
356 B
Plaintext
Raw Permalink Normal View History

Support (insertFrom|deleteBy)Composition and (insert|delete)CompositionText inputTypes for InputEvents https://bugs.webkit.org/show_bug.cgi?id=163460 <rdar://problem/28784142> Reviewed by Darin Adler. Source/WebCore: Adds basic support for the composition inputTypes in the InputEvent spec. See w3.org/TR/input-events, github.com/w3c/input-events/issues/41 and github.com/w3c/input-events/issues/42 for more details. While input events are fired in the correct order with respect to each other, additional work will be required to ensure that input events are fired in the correct order with respect to composition(start|update|end) events and textInput events. This is held off until the expected ordering of events is officially defined in the spec. Tests: fast/events/before-input-events-prevent-insert-composition.html fast/events/before-input-events-prevent-recomposition.html fast/events/input-events-ime-composition.html fast/events/input-events-ime-recomposition.html * editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::apply): * editing/CompositeEditCommand.h: (WebCore::CompositeEditCommand::isBeforeInputEventCancelable): Adds a new virtual method hook for subclasses to mark their `beforeinput` events as non-cancelable (see TypingCommand::isBeforeInputEventCancelable). By default, `beforeinput` events are cancelable. * editing/EditAction.h: Adds 4 new EditActions corresponding to the 4 composition-related inputTypes. These are: EditActionTypingDeletePendingComposition => "deleteCompositionText" EditActionTypingDeleteFinalComposition => "deleteByComposition" EditActionTypingInsertPendingComposition => "insertCompositionText" EditActionTypingInsertFinalComposition => "insertFromComposition" * editing/EditCommand.cpp: (WebCore::inputTypeNameForEditingAction): * editing/Editor.cpp: (WebCore::dispatchBeforeInputEvent): (WebCore::dispatchBeforeInputEvents): (WebCore::Editor::willApplyEditing): (WebCore::Editor::insertTextWithoutSendingTextEvent): (WebCore::Editor::setComposition): In setComposition(text, mode), tweak the logic for committing a composition to always delete the selection before inserting the final composition text. In setComposition(text, underlines, start, end), catch the case where we're beginning to recompose an existing range in the DOM and delete the recomposed text first. * editing/TypingCommand.cpp: (WebCore::editActionForTypingCommand): (WebCore::TypingCommand::TypingCommand): (WebCore::TypingCommand::deleteSelection): Adds a TextCompositionType parameter so that call sites (see Editor::setComposition) can indicate what state the edited composition is in. This allows us to differentiate between deletion of finalized composition text in preparation of recomposing a range in the DOM, and deletion of composition text that has not yet been committed in preparation for inserting a finalized composition into the DOM. (WebCore::TypingCommand::deleteKeyPressed): (WebCore::TypingCommand::forwardDeleteKeyPressed): (WebCore::TypingCommand::insertText): (WebCore::TypingCommand::insertLineBreak): (WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent): (WebCore::TypingCommand::insertParagraphSeparator): (WebCore::TypingCommand::isBeforeInputEventCancelable): (WebCore::TypingCommand::inputEventData): (WebCore::TypingCommand::willAddTypingToOpenCommand): * editing/TypingCommand.h: Source/WebKit/mac: Handle new EditAction types for inserting/deleting pending/final compositions. * WebCoreSupport/WebEditorClient.mm: (undoNameForEditAction): Source/WebKit2: Handle new EditAction types for inserting/deleting pending/final compositions. * UIProcess/WebEditCommandProxy.cpp: (WebKit::WebEditCommandProxy::nameForEditAction): LayoutTests: Adds 4 new layout tests to verify that composition events are dispatched as expected when using IME, and that input events of type "insertFromComposition" and "deleteByComposition" can be prevented. Also rebaselines an existing WK1 editing test (text-input-controller.html) to account for how we now delete the existing composition text before inserting the finalized composition text in Editor::setComposition. This means that there are a few more delegate calls than there were before (as seen in the expected output), although the resulting behavior is still the same. * editing/mac/input/text-input-controller-expected.txt: * fast/events/before-input-events-prevent-insert-composition.html: Added. * fast/events/before-input-events-prevent-recomposition.html: Added. * fast/events/input-events-ime-composition.html: Added. * fast/events/input-events-ime-recomposition.html: Added. * platform/ios-simulator/TestExpectations: Canonical link: https://commits.webkit.org/181577@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207698 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2016-10-21 23:06:05 +00:00
To manually test this, try to insert text using IME. No text should be committed to the input.
after trying to commit a typed composition:
| <shadow:root>
| <div>
| contenteditable="plaintext-only"
| <br>
after trying to commit a selected composition:
| <shadow:root>
| <div>
| contenteditable="plaintext-only"
| <br>