<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206944] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206944">206944</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2016-10-07 16:47:18 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support onbeforeinput event handling for the new InputEvent spec
https://bugs.webkit.org/show_bug.cgi?id=163021
<rdar://problem/28658073>
Reviewed by Darin Adler.
Source/WebCore:
Adds support for parsing the onbeforeinput attribute, and for sending default-preventable
`beforeinput` InputEvents to the page. To do this, we introduce two new virtual methods:
willApplyCommand and didApplyCommand on the CompositeEditCommand that are called before and
after CompositeEditCommand::doApply, respectively. willApplyCommand indicates whether or not
the composite editor command should proceed with applying the command.
Tweaks existing layout tests and adds new tests.
Tests: fast/events/before-input-events-different-start-end-elements.html
fast/events/before-input-events-prevent-default-in-textfield.html
fast/events/before-input-events-prevent-default.html
* dom/Document.idl:
* dom/Element.idl:
* dom/EventNames.h:
* dom/Node.cpp:
(WebCore::Node::dispatchInputEvent):
(WebCore::Node::defaultEventHandler):
Currently, we fire input events in Node in response to dispatching a webkitEditableContentChangedEvent. After
some discussion, Ryosuke and I believe that it will be ok to instead directly dispatch the input event where we
would normally dispatch a webkitEditableContentChangedEvent.
* editing/CompositeEditCommand.cpp:
(WebCore::EditCommandComposition::unapply):
(WebCore::EditCommandComposition::reapply):
Added calls to Editor::willUnapplyEditing and Editor::willReapplyEditing.
(WebCore::CompositeEditCommand::willApplyCommand):
(WebCore::CompositeEditCommand::apply):
(WebCore::CompositeEditCommand::didApplyCommand):
Added new virtual functions, willApplyCommand and didApplyCommand, that surround a call to
CompositeEditCommand::doApply. By default, they call willApplyEditing and appliedEditing on the editor, but may
be overridden in special cases, such as in TypingCommand, where we invoke appliedEditing after adding a new
typing command to the last open command.
If willApplyCommand returns false, CompositeEditCommand::apply will bail and not proceed with the command.
* editing/CompositeEditCommand.h:
* editing/Editor.cpp:
(WebCore::dispatchBeforeInputEvent):
(WebCore::dispatchBeforeInputEvents):
(WebCore::dispatchInputEvents):
(WebCore::Editor::willApplyEditing):
(WebCore::Editor::appliedEditing):
(WebCore::Editor::willUnapplyEditing):
(WebCore::Editor::unappliedEditing):
(WebCore::Editor::willReapplyEditing):
(WebCore::Editor::reappliedEditing):
(WebCore::Editor::computeAndSetTypingStyle):
(WebCore::dispatchEditableContentChangedEvents): Deleted.
* editing/Editor.h:
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::willApplyCommand):
(WebCore::TypingCommand::didApplyCommand):
(WebCore::TypingCommand::willAddTypingToOpenCommand):
(WebCore::TypingCommand::insertTextRunWithoutNewlines):
(WebCore::TypingCommand::insertLineBreak):
(WebCore::TypingCommand::insertParagraphSeparator):
(WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent):
(WebCore::TypingCommand::deleteKeyPressed):
(WebCore::TypingCommand::forwardDeleteKeyPressed):
(WebCore::TypingCommand::deleteSelection):
These now invoke willAddTypingToOpenCommand before proceeding with creating the command and applying it. The
flow is now:
- willAddTypingToOpenCommand
- create and apply a new command
- typingAddedToOpenCommand
* editing/TypingCommand.h:
(WebCore::TypingCommand::preservesTypingStyle): Deleted.
(WebCore::TypingCommand::shouldRetainAutocorrectionIndicator): Deleted.
(WebCore::TypingCommand::setShouldRetainAutocorrectionIndicator): Deleted.
(WebCore::TypingCommand::shouldStopCaretBlinking): Deleted.
* html/HTMLAttributeNames.in:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::createEventHandlerNameMap):
LayoutTests:
Tweak an existing test to hook into the 'input' event instead of 'webkitEditableContentChanged', as well as
tests added in <a href="http://trac.webkit.org/projects/webkit/changeset/206843">r206843</a> to verify that `onbeforeinput` handlers are invoked with InputEvents. Also introduces
new unit tests verifying that calling preventDefault on InputEvents fired by `onbeforeinput` correctly prevent
text from being inserted or deleted.
* editing/undo/undo-after-event-edited.html:
* fast/events/before-input-events-different-start-end-elements-expected.txt: Added.
* fast/events/before-input-events-different-start-end-elements.html: Added.
* fast/events/before-input-events-prevent-default-expected.txt: Added.
* fast/events/before-input-events-prevent-default-in-textfield-expected.txt: Added.
* fast/events/before-input-events-prevent-default-in-textfield.html: Added.
* fast/events/before-input-events-prevent-default.html: Added.
* fast/events/input-events-fired-when-typing-expected.txt:
* fast/events/input-events-fired-when-typing.html:
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingundoundoaftereventeditedhtml">trunk/LayoutTests/editing/undo/undo-after-event-edited.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsfiredwhentypingexpectedtxt">trunk/LayoutTests/fast/events/input-events-fired-when-typing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsfiredwhentypinghtml">trunk/LayoutTests/fast/events/input-events-fired-when-typing.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandh">trunk/Source/WebCore/editing/TypingCommand.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttributeNamesin">trunk/Source/WebCore/html/HTMLAttributeNames.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventsdifferentstartendelementsexpectedtxt">trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventsdifferentstartendelementshtml">trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultexpectedtxt">trunk/LayoutTests/fast/events/before-input-events-prevent-default-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultintextfieldexpectedtxt">trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultintextfieldhtml">trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeinputeventspreventdefaulthtml">trunk/LayoutTests/fast/events/before-input-events-prevent-default.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/LayoutTests/ChangeLog 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-10-07 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Support onbeforeinput event handling for the new InputEvent spec
+ https://bugs.webkit.org/show_bug.cgi?id=163021
+ <rdar://problem/28658073>
+
+ Reviewed by Darin Adler.
+
+ Tweak an existing test to hook into the 'input' event instead of 'webkitEditableContentChanged', as well as
+ tests added in r206843 to verify that `onbeforeinput` handlers are invoked with InputEvents. Also introduces
+ new unit tests verifying that calling preventDefault on InputEvents fired by `onbeforeinput` correctly prevent
+ text from being inserted or deleted.
+
+ * editing/undo/undo-after-event-edited.html:
+ * fast/events/before-input-events-different-start-end-elements-expected.txt: Added.
+ * fast/events/before-input-events-different-start-end-elements.html: Added.
+ * fast/events/before-input-events-prevent-default-expected.txt: Added.
+ * fast/events/before-input-events-prevent-default-in-textfield-expected.txt: Added.
+ * fast/events/before-input-events-prevent-default-in-textfield.html: Added.
+ * fast/events/before-input-events-prevent-default.html: Added.
+ * fast/events/input-events-fired-when-typing-expected.txt:
+ * fast/events/input-events-fired-when-typing.html:
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-10-07 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: <figcaption> should be AXTitleUIElement for other content inside the <figure>
</span></span></pre></div>
<a id="trunkLayoutTestseditingundoundoaftereventeditedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/undo/undo-after-event-edited.html (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/undo/undo-after-event-edited.html 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/LayoutTests/editing/undo/undo-after-event-edited.html 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> scriptElements[0].parentNode.removeChild(scriptElements[0]);
</span><span class="cx"> var eventHandlerActive = false;
</span><span class="cx">
</span><del>-document.addEventListener("webkitEditableContentChanged", function () {
</del><ins>+document.addEventListener("input", function () {
</ins><span class="cx"> if (eventHandlerActive)
</span><span class="cx"> return;
</span><span class="cx"> eventHandlerActive = true;
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventsdifferentstartendelementsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements-expected.txt (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements-expected.txt 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+Fired `onbeforeinput` handler!
+Fired `oninput` handler!
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventsdifferentstartendelementshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements.html (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements.html (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-different-start-end-elements.html 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function beginTest()
+ {
+ if (!window.eventSender || !window.internals || !window.testRunner)
+ return;
+
+ internals.settings.setInputEventsEnabled(true);
+ testRunner.dumpAsText();
+ document.querySelector("#foo").focus();
+
+ for (var i = 0; i < 11; i++)
+ eventSender.keyDown("delete");
+ }
+
+ function checkInputEvent(event)
+ {
+ debug("Fired `oninput` handler!");
+ }
+
+ function checkBeforeInputEvent(event)
+ {
+ debug("Fired `onbeforeinput` handler!");
+ }
+ </script>
+</head>
+
+<body onload=beginTest()>
+ <div id="foo" contenteditable oninput=checkInputEvent(event) onbeforeinput=checkBeforeInputEvent(event)>
+ <b>
+ abc
+ <i>def</i>
+ <u>ghi</u>
+ </b>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-prevent-default-expected.txt (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-prevent-default-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-prevent-default-expected.txt 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Fired `onbeforeinput`: preventing default!
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultintextfieldexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield-expected.txt (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield-expected.txt 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Fired `onbeforeinput`: preventing default!
+The final value is: abc
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventspreventdefaultintextfieldhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield.html (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield.html (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-prevent-default-in-textfield.html 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ var preventDefaultInputEvents = false;
+
+ function beginTest()
+ {
+ if (!window.eventSender || !window.internals || !window.testRunner)
+ return;
+
+ internals.settings.setInputEventsEnabled(true);
+ testRunner.dumpAsText();
+ let input = document.querySelector("#foo");
+ input.focus();
+
+ eventSender.keyDown("a", []);
+ eventSender.keyDown("b", []);
+ eventSender.keyDown("c", []);
+
+ preventDefaultInputEvents = true;
+
+ eventSender.keyDown("delete");
+ debug(`The final value is: ${input.value}`);
+ }
+
+ function checkInputEvent(event)
+ {
+ if (preventDefaultInputEvents)
+ debug("FAIL: Did not expect to the `oninput` handler to fire.");
+ }
+
+ function checkBeforeInputEvent(event)
+ {
+ if (preventDefaultInputEvents) {
+ debug("Fired `onbeforeinput`: preventing default!");
+ event.preventDefault();
+ }
+ }
+ </script>
+</head>
+
+<body onload=beginTest()>
+ <input id="foo" contenteditable value="helloworld" oninput=checkInputEvent(event) onbeforeinput=checkBeforeInputEvent(event)></div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeinputeventspreventdefaulthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/before-input-events-prevent-default.html (0 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/before-input-events-prevent-default.html (rev 0)
+++ trunk/LayoutTests/fast/events/before-input-events-prevent-default.html 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function beginTest()
+ {
+ if (!window.eventSender || !window.internals || !window.testRunner)
+ return;
+
+ internals.settings.setInputEventsEnabled(true);
+ testRunner.dumpAsText();
+ document.querySelector("#foo").focus();
+ eventSender.keyDown("a", []);
+ }
+
+ function checkInputEvent(event)
+ {
+ debug("FAIL: Did not expect to the `oninput` handler to fire.");
+ }
+
+ function checkBeforeInputEvent(event)
+ {
+ debug("Fired `onbeforeinput`: preventing default!");
+ event.preventDefault();
+ }
+ </script>
+</head>
+
+<body onload=beginTest()>
+ <div id="foo" contenteditable oninput=checkInputEvent(event) onbeforeinput=checkBeforeInputEvent(event)></div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsfiredwhentypingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-fired-when-typing-expected.txt (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-fired-when-typing-expected.txt 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/LayoutTests/fast/events/input-events-fired-when-typing-expected.txt 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -1,16 +1,32 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><ins>+Fired `onbeforeinput`!
</ins><span class="cx"> PASS event.__lookupGetter__('inputType') is defined.
</span><span class="cx"> PASS Object.getPrototypeOf(event) is InputEvent.prototype
</span><span class="cx"> PASS event.target.id is expectedTargetID
</span><span class="cx"> PASS event.bubbles is true
</span><ins>+PASS event.cancelable is true
+PASS event.composed is true
+Fired `oninput`!
+PASS event.__lookupGetter__('inputType') is defined.
+PASS Object.getPrototypeOf(event) is InputEvent.prototype
+PASS event.target.id is expectedTargetID
+PASS event.bubbles is true
</ins><span class="cx"> PASS event.cancelable is false
</span><span class="cx"> PASS event.composed is true
</span><ins>+Fired `onbeforeinput`!
</ins><span class="cx"> PASS event.__lookupGetter__('inputType') is defined.
</span><span class="cx"> PASS Object.getPrototypeOf(event) is InputEvent.prototype
</span><span class="cx"> PASS event.target.id is expectedTargetID
</span><span class="cx"> PASS event.bubbles is true
</span><ins>+PASS event.cancelable is true
+PASS event.composed is true
+Fired `oninput`!
+PASS event.__lookupGetter__('inputType') is defined.
+PASS Object.getPrototypeOf(event) is InputEvent.prototype
+PASS event.target.id is expectedTargetID
+PASS event.bubbles is true
</ins><span class="cx"> PASS event.cancelable is false
</span><span class="cx"> PASS event.composed is true
</span><span class="cx"> a
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsfiredwhentypinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-fired-when-typing.html (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-fired-when-typing.html 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/LayoutTests/fast/events/input-events-fired-when-typing.html 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> function checkInputEvent(event)
</span><span class="cx"> {
</span><ins>+ debug("Fired `oninput`!");
</ins><span class="cx"> shouldBeDefined("event.__lookupGetter__('inputType')");
</span><span class="cx"> shouldBe("Object.getPrototypeOf(event)", "InputEvent.prototype");
</span><span class="cx"> shouldBe("event.target.id", "expectedTargetID");
</span><span class="lines">@@ -40,12 +41,23 @@
</span><span class="cx"> shouldBe("event.cancelable", "false");
</span><span class="cx"> shouldBe("event.composed", "true");
</span><span class="cx"> }
</span><ins>+
+ function checkBeforeInputEvent(event)
+ {
+ debug("Fired `onbeforeinput`!");
+ shouldBeDefined("event.__lookupGetter__('inputType')");
+ shouldBe("Object.getPrototypeOf(event)", "InputEvent.prototype");
+ shouldBe("event.target.id", "expectedTargetID");
+ shouldBe("event.bubbles", "true");
+ shouldBe("event.cancelable", "true");
+ shouldBe("event.composed", "true");
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body onload=beginTest()>
</span><del>- <div id="foo" contenteditable oninput=checkInputEvent(event)></div>
- <input id="bar" oninput=checkInputEvent(event)></input>
</del><ins>+ <div id="foo" contenteditable oninput=checkInputEvent(event) onbeforeinput=checkBeforeInputEvent(event)></div>
+ <input id="bar" oninput=checkInputEvent(event) onbeforeinput=checkBeforeInputEvent(event)></input>
</ins><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -1198,6 +1198,8 @@
</span><span class="cx"> fast/events/ime-composition-events-001.html [ Failure ]
</span><span class="cx"> fast/events/inputText-never-fired-on-keydown-cancel.html [ Failure ]
</span><span class="cx"> fast/events/input-events-fired-when-typing.html [ Failure ]
</span><ins>+fast/events/before-input-events-prevent-default.html [ Failure ]
+fast/events/before-input-events-prevent-default-in-textfield.html [ Failure ]
</ins><span class="cx"> fast/events/key-events-in-input-button.html [ Failure ]
</span><span class="cx"> fast/events/keydown-1.html [ Failure ]
</span><span class="cx"> fast/events/keydown-leftright-keys.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2016-10-07 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Support onbeforeinput event handling for the new InputEvent spec
+ https://bugs.webkit.org/show_bug.cgi?id=163021
+ <rdar://problem/28658073>
+
+ Reviewed by Darin Adler.
+
+ Adds support for parsing the onbeforeinput attribute, and for sending default-preventable
+ `beforeinput` InputEvents to the page. To do this, we introduce two new virtual methods:
+ willApplyCommand and didApplyCommand on the CompositeEditCommand that are called before and
+ after CompositeEditCommand::doApply, respectively. willApplyCommand indicates whether or not
+ the composite editor command should proceed with applying the command.
+
+ Tweaks existing layout tests and adds new tests.
+
+ Tests: fast/events/before-input-events-different-start-end-elements.html
+ fast/events/before-input-events-prevent-default-in-textfield.html
+ fast/events/before-input-events-prevent-default.html
+
+ * dom/Document.idl:
+ * dom/Element.idl:
+ * dom/EventNames.h:
+ * dom/Node.cpp:
+ (WebCore::Node::dispatchInputEvent):
+ (WebCore::Node::defaultEventHandler):
+
+ Currently, we fire input events in Node in response to dispatching a webkitEditableContentChangedEvent. After
+ some discussion, Ryosuke and I believe that it will be ok to instead directly dispatch the input event where we
+ would normally dispatch a webkitEditableContentChangedEvent.
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::EditCommandComposition::unapply):
+ (WebCore::EditCommandComposition::reapply):
+
+ Added calls to Editor::willUnapplyEditing and Editor::willReapplyEditing.
+
+ (WebCore::CompositeEditCommand::willApplyCommand):
+ (WebCore::CompositeEditCommand::apply):
+ (WebCore::CompositeEditCommand::didApplyCommand):
+
+ Added new virtual functions, willApplyCommand and didApplyCommand, that surround a call to
+ CompositeEditCommand::doApply. By default, they call willApplyEditing and appliedEditing on the editor, but may
+ be overridden in special cases, such as in TypingCommand, where we invoke appliedEditing after adding a new
+ typing command to the last open command.
+
+ If willApplyCommand returns false, CompositeEditCommand::apply will bail and not proceed with the command.
+
+ * editing/CompositeEditCommand.h:
+ * editing/Editor.cpp:
+ (WebCore::dispatchBeforeInputEvent):
+ (WebCore::dispatchBeforeInputEvents):
+ (WebCore::dispatchInputEvents):
+ (WebCore::Editor::willApplyEditing):
+ (WebCore::Editor::appliedEditing):
+ (WebCore::Editor::willUnapplyEditing):
+ (WebCore::Editor::unappliedEditing):
+ (WebCore::Editor::willReapplyEditing):
+ (WebCore::Editor::reappliedEditing):
+ (WebCore::Editor::computeAndSetTypingStyle):
+ (WebCore::dispatchEditableContentChangedEvents): Deleted.
+ * editing/Editor.h:
+ * editing/TypingCommand.cpp:
+ (WebCore::TypingCommand::willApplyCommand):
+ (WebCore::TypingCommand::didApplyCommand):
+ (WebCore::TypingCommand::willAddTypingToOpenCommand):
+ (WebCore::TypingCommand::insertTextRunWithoutNewlines):
+ (WebCore::TypingCommand::insertLineBreak):
+ (WebCore::TypingCommand::insertParagraphSeparator):
+ (WebCore::TypingCommand::insertParagraphSeparatorInQuotedContent):
+ (WebCore::TypingCommand::deleteKeyPressed):
+ (WebCore::TypingCommand::forwardDeleteKeyPressed):
+ (WebCore::TypingCommand::deleteSelection):
+
+ These now invoke willAddTypingToOpenCommand before proceeding with creating the command and applying it. The
+ flow is now:
+ - willAddTypingToOpenCommand
+ - create and apply a new command
+ - typingAddedToOpenCommand
+
+ * editing/TypingCommand.h:
+ (WebCore::TypingCommand::preservesTypingStyle): Deleted.
+ (WebCore::TypingCommand::shouldRetainAutocorrectionIndicator): Deleted.
+ (WebCore::TypingCommand::setShouldRetainAutocorrectionIndicator): Deleted.
+ (WebCore::TypingCommand::shouldStopCaretBlinking): Deleted.
+ * html/HTMLAttributeNames.in:
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::createEventHandlerNameMap):
+
</ins><span class="cx"> 2016-10-07 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: <figcaption> should be AXTitleUIElement for other content inside the <figure>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/dom/Document.idl 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -192,6 +192,7 @@
</span><span class="cx"> // FIXME: Should these be exposed on Window as well (and therefore moved to GlobalEventHandlers.idl)?
</span><span class="cx"> [NotEnumerable] attribute EventHandler onbeforecopy;
</span><span class="cx"> [NotEnumerable] attribute EventHandler onbeforecut;
</span><ins>+ [NotEnumerable] attribute EventHandler onbeforeinput;
</ins><span class="cx"> [NotEnumerable] attribute EventHandler onbeforepaste;
</span><span class="cx"> [NotEnumerable] attribute EventHandler oncopy;
</span><span class="cx"> [NotEnumerable] attribute EventHandler oncut;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/dom/Element.idl 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx"> // FIXME: Should these be exposed on Window as well (and therefore moved to GlobalEventHandlers.idl)?
</span><span class="cx"> [NotEnumerable] attribute EventHandler onbeforecopy;
</span><span class="cx"> [NotEnumerable] attribute EventHandler onbeforecut;
</span><ins>+ [NotEnumerable] attribute EventHandler onbeforeinput;
</ins><span class="cx"> [NotEnumerable] attribute EventHandler onbeforepaste;
</span><span class="cx"> [NotEnumerable] attribute EventHandler oncopy;
</span><span class="cx"> [NotEnumerable] attribute EventHandler oncut;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/dom/EventNames.h 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> macro(autocompleteerror) \
</span><span class="cx"> macro(beforecopy) \
</span><span class="cx"> macro(beforecut) \
</span><ins>+ macro(beforeinput) \
</ins><span class="cx"> macro(beforeload) \
</span><span class="cx"> macro(beforepaste) \
</span><span class="cx"> macro(beforeunload) \
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -2204,7 +2204,8 @@
</span><span class="cx">
</span><span class="cx"> void Node::dispatchInputEvent(const AtomicString& inputType)
</span><span class="cx"> {
</span><del>- if (document().settings()->inputEventsEnabled())
</del><ins>+ auto* settings = document().settings();
+ if (settings && settings->inputEventsEnabled())
</ins><span class="cx"> dispatchScopedEvent(InputEvent::create(eventNames().inputEvent, inputType, true, false, document().defaultView(), 0));
</span><span class="cx"> else
</span><span class="cx"> dispatchScopedEvent(Event::create(eventNames().inputEvent, true, false));
</span><span class="lines">@@ -2272,8 +2273,6 @@
</span><span class="cx"> frame->eventHandler().defaultTouchEventHandler(renderer->node(), &downcast<TouchEvent>(event));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- } else if (event.type() == eventNames().webkitEditableContentChangedEvent) {
- dispatchInputEvent(emptyString());
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -231,6 +231,9 @@
</span><span class="cx"> frame->editor().cancelComposition();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (!frame->editor().willUnapplyEditing(*this))
+ return;
+
</ins><span class="cx"> size_t size = m_commands.size();
</span><span class="cx"> for (size_t i = size; i; --i)
</span><span class="cx"> m_commands[i - 1]->doUnapply();
</span><span class="lines">@@ -255,6 +258,9 @@
</span><span class="cx"> // if one is necessary (like for the creation of VisiblePositions).
</span><span class="cx"> m_document->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><ins>+ if (!frame->editor().willReapplyEditing(*this))
+ return;
+
</ins><span class="cx"> for (auto& command : m_commands)
</span><span class="cx"> command->doReapply();
</span><span class="cx">
</span><span class="lines">@@ -311,6 +317,11 @@
</span><span class="cx"> ASSERT(isTopLevelCommand() || !m_composition);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CompositeEditCommand::willApplyCommand()
+{
+ return frame().editor().willApplyEditing(*this);
+}
+
</ins><span class="cx"> void CompositeEditCommand::apply()
</span><span class="cx"> {
</span><span class="cx"> if (!endingSelection().isContentRichlyEditable()) {
</span><span class="lines">@@ -337,18 +348,23 @@
</span><span class="cx"> // if one is necessary (like for the creation of VisiblePositions).
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><ins>+ if (!willApplyCommand())
+ return;
+
</ins><span class="cx"> {
</span><span class="cx"> EventQueueScope eventQueueScope;
</span><span class="cx"> doApply();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Only need to call appliedEditing for top-level commands,
- // and TypingCommands do it on their own (see TypingCommand::typingAddedToOpenCommand).
- if (!isTypingCommand())
- frame().editor().appliedEditing(this);
</del><ins>+ didApplyCommand();
</ins><span class="cx"> setShouldRetainAutocorrectionIndicator(false);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CompositeEditCommand::didApplyCommand()
+{
+ frame().editor().appliedEditing(this);
+}
+
</ins><span class="cx"> EditCommandComposition* CompositeEditCommand::ensureComposition()
</span><span class="cx"> {
</span><span class="cx"> CompositeEditCommand* command = this;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -117,6 +117,10 @@
</span><span class="cx"> protected:
</span><span class="cx"> explicit CompositeEditCommand(Document&, EditAction = EditActionUnspecified);
</span><span class="cx">
</span><ins>+ // If willApplyCommand returns false, we won't proceed with applying the command.
+ virtual bool willApplyCommand();
+ virtual void didApplyCommand();
+
</ins><span class="cx"> //
</span><span class="cx"> // sugary-sweet convenience functions to help create and apply edit commands in composite commands
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -59,7 +59,9 @@
</span><span class="cx"> #include "HTMLTextAreaElement.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "IndentOutdentCommand.h"
</span><ins>+#include "InputEvent.h"
</ins><span class="cx"> #include "InsertListCommand.h"
</span><ins>+#include "InsertTextCommand.h"
</ins><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "KillRing.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -109,6 +111,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static bool dispatchBeforeInputEvent(Element& element, const AtomicString& inputType)
+{
+ auto* settings = element.document().settings();
+ if (!settings || !settings->inputEventsEnabled())
+ return true;
+
+ auto event = InputEvent::create(eventNames().beforeinputEvent, inputType, true, true, element.document().defaultView(), 0);
+ element.dispatchScopedEvent(event);
+
+ return !event->defaultPrevented();
+}
+
</ins><span class="cx"> class ClearTextCommand : public DeleteSelectionCommand {
</span><span class="cx"> public:
</span><span class="cx"> ClearTextCommand(Document& document);
</span><span class="lines">@@ -1025,16 +1039,33 @@
</span><span class="cx"> endingTextControl->didEditInnerTextValue();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void dispatchEditableContentChangedEvents(PassRefPtr<Element> prpStartRoot, PassRefPtr<Element> prpEndRoot)
</del><ins>+static bool dispatchBeforeInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomicString& inputTypeName)
</ins><span class="cx"> {
</span><del>- RefPtr<Element> startRoot = prpStartRoot;
- RefPtr<Element> endRoot = prpEndRoot;
</del><ins>+ bool continueWithDefaultBehavior = true;
</ins><span class="cx"> if (startRoot)
</span><del>- startRoot->dispatchEvent(Event::create(eventNames().webkitEditableContentChangedEvent, false, false));
</del><ins>+ continueWithDefaultBehavior &= dispatchBeforeInputEvent(*startRoot, inputTypeName);
</ins><span class="cx"> if (endRoot && endRoot != startRoot)
</span><del>- endRoot->dispatchEvent(Event::create(eventNames().webkitEditableContentChangedEvent, false, false));
</del><ins>+ continueWithDefaultBehavior &= dispatchBeforeInputEvent(*endRoot, inputTypeName);
+ return continueWithDefaultBehavior;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void dispatchInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomicString& inputTypeName)
+{
+ if (startRoot)
+ startRoot->dispatchInputEvent(inputTypeName);
+ if (endRoot && endRoot != startRoot)
+ endRoot->dispatchInputEvent(inputTypeName);
+}
+
+bool Editor::willApplyEditing(CompositeEditCommand& command) const
+{
+ auto* composition = command.composition();
+ if (!composition)
+ return true;
+
+ return dispatchBeforeInputEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement(), emptyString());
+}
+
</ins><span class="cx"> void Editor::appliedEditing(PassRefPtr<CompositeEditCommand> cmd)
</span><span class="cx"> {
</span><span class="cx"> LOG(Editing, "Editor %p appliedEditing", this);
</span><span class="lines">@@ -1051,7 +1082,7 @@
</span><span class="cx"> FrameSelection::SetSelectionOptions options = cmd->isDictationCommand() ? FrameSelection::DictationTriggered : 0;
</span><span class="cx">
</span><span class="cx"> changeSelectionAfterCommand(newSelection, options);
</span><del>- dispatchEditableContentChangedEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement());
</del><ins>+ dispatchInputEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement(), emptyString());
</ins><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="cx">
</span><span class="lines">@@ -1074,6 +1105,11 @@
</span><span class="cx"> respondToChangedContents(newSelection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Editor::willUnapplyEditing(const EditCommandComposition& composition) const
+{
+ return dispatchBeforeInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), emptyString());
+}
+
</ins><span class="cx"> void Editor::unappliedEditing(PassRefPtr<EditCommandComposition> cmd)
</span><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="lines">@@ -1082,7 +1118,7 @@
</span><span class="cx">
</span><span class="cx"> VisibleSelection newSelection(cmd->startingSelection());
</span><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><del>- dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</del><ins>+ dispatchInputEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement(), emptyString());
</ins><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="cx">
</span><span class="lines">@@ -1094,6 +1130,11 @@
</span><span class="cx"> respondToChangedContents(newSelection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Editor::willReapplyEditing(const EditCommandComposition& composition) const
+{
+ return dispatchBeforeInputEvents(composition.startingRootEditableElement(), composition.endingRootEditableElement(), emptyString());
+}
+
</ins><span class="cx"> void Editor::reappliedEditing(PassRefPtr<EditCommandComposition> cmd)
</span><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="lines">@@ -1102,7 +1143,7 @@
</span><span class="cx">
</span><span class="cx"> VisibleSelection newSelection(cmd->endingSelection());
</span><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><del>- dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</del><ins>+ dispatchInputEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement(), emptyString());
</ins><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="cx">
</span><span class="lines">@@ -3052,6 +3093,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ auto* element = m_frame.selection().selection().rootEditableElement();
+ if (element && !dispatchBeforeInputEvent(*element, emptyString()))
+ return;
+
</ins><span class="cx"> // Calculate the current typing style.
</span><span class="cx"> RefPtr<EditingStyle> typingStyle;
</span><span class="cx"> if (auto existingTypingStyle = m_frame.selection().typingStyle())
</span><span class="lines">@@ -3065,6 +3110,9 @@
</span><span class="cx"> if (!blockStyle->isEmpty())
</span><span class="cx"> applyCommand(ApplyStyleCommand::create(document(), blockStyle.get(), editingAction));
</span><span class="cx">
</span><ins>+ if (element)
+ element->dispatchInputEvent(emptyString());
+
</ins><span class="cx"> // Set the remaining style as the typing style.
</span><span class="cx"> m_frame.selection().setTypingStyle(typingStyle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/Editor.h 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -198,6 +198,11 @@
</span><span class="cx"> WEBCORE_EXPORT void applyStyleToSelection(Ref<EditingStyle>&&, EditAction);
</span><span class="cx"> void applyParagraphStyleToSelection(StyleProperties*, EditAction);
</span><span class="cx">
</span><ins>+ // Returns whether or not we should proceed with editing.
+ bool willApplyEditing(CompositeEditCommand&) const;
+ bool willUnapplyEditing(const EditCommandComposition&) const;
+ bool willReapplyEditing(const EditCommandComposition&) const;
+
</ins><span class="cx"> void appliedEditing(PassRefPtr<CompositeEditCommand>);
</span><span class="cx"> void unappliedEditing(PassRefPtr<EditCommandComposition>);
</span><span class="cx"> void reappliedEditing(PassRefPtr<EditCommandComposition>);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -262,6 +262,16 @@
</span><span class="cx"> composition()->setRangeDeletedByUnapply(range);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TypingCommand::willApplyCommand()
+{
+ if (!m_isHandlingInitialTypingCommand) {
+ // The TypingCommand will handle the willApplyCommand logic separately in TypingCommand::willAddTypingToOpenCommand.
+ return true;
+ }
+
+ return CompositeEditCommand::willApplyCommand();
+}
+
</ins><span class="cx"> void TypingCommand::doApply()
</span><span class="cx"> {
</span><span class="cx"> if (endingSelection().isNoneOrOrphaned())
</span><span class="lines">@@ -298,6 +308,12 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TypingCommand::didApplyCommand()
+{
+ // TypingCommands handle applied editing separately (see TypingCommand::typingAddedToOpenCommand).
+ m_isHandlingInitialTypingCommand = false;
+}
+
</ins><span class="cx"> void TypingCommand::markMisspellingsAfterTyping(ETypingCommand commandType)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = this->frame();
</span><span class="lines">@@ -352,6 +368,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TypingCommand::willAddTypingToOpenCommand(ETypingCommand, TextGranularity)
+{
+ if (m_isHandlingInitialTypingCommand)
+ return true;
+
+ // FIXME: Use the newly added typing command and granularity to ensure that an InputEvent with the
+ // correct inputType is dispatched.
+ return frame().editor().willApplyEditing(*this);
+}
+
</ins><span class="cx"> void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = this->frame();
</span><span class="lines">@@ -393,6 +419,9 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::insertTextRunWithoutNewlines(const String &text, bool selectInsertedText)
</span><span class="cx"> {
</span><ins>+ if (!willAddTypingToOpenCommand(InsertText, CharacterGranularity))
+ return;
+
</ins><span class="cx"> RefPtr<InsertTextCommand> command = InsertTextCommand::create(document(), text, selectInsertedText,
</span><span class="cx"> m_compositionType == TextCompositionNone ? InsertTextCommand::RebalanceLeadingAndTrailingWhitespaces : InsertTextCommand::RebalanceAllWhitespaces, EditActionTyping);
</span><span class="cx">
</span><span class="lines">@@ -406,6 +435,9 @@
</span><span class="cx"> if (!canAppendNewLineFeedToSelection(endingSelection()))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!willAddTypingToOpenCommand(InsertLineBreak, LineGranularity))
+ return;
+
</ins><span class="cx"> applyCommandToComposite(InsertLineBreakCommand::create(document()));
</span><span class="cx"> typingAddedToOpenCommand(InsertLineBreak);
</span><span class="cx"> }
</span><span class="lines">@@ -423,6 +455,9 @@
</span><span class="cx"> if (!canAppendNewLineFeedToSelection(endingSelection()))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!willAddTypingToOpenCommand(InsertParagraphSeparator, ParagraphGranularity))
+ return;
+
</ins><span class="cx"> applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditActionTyping));
</span><span class="cx"> typingAddedToOpenCommand(InsertParagraphSeparator);
</span><span class="cx"> }
</span><span class="lines">@@ -437,6 +472,9 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::insertParagraphSeparatorInQuotedContent()
</span><span class="cx"> {
</span><ins>+ if (!willAddTypingToOpenCommand(InsertParagraphSeparatorInQuotedContent, ParagraphGranularity))
+ return;
+
</ins><span class="cx"> // If the selection starts inside a table, just insert the paragraph separator normally
</span><span class="cx"> // Breaking the blockquote would also break apart the table, which is unecessary when inserting a newline
</span><span class="cx"> if (enclosingNodeOfType(endingSelection().start(), &isTableStructureNode)) {
</span><span class="lines">@@ -479,6 +517,9 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::deleteKeyPressed(TextGranularity granularity, bool shouldAddToKillRing)
</span><span class="cx"> {
</span><ins>+ if (!willAddTypingToOpenCommand(DeleteKey, granularity))
+ return;
+
</ins><span class="cx"> Frame& frame = this->frame();
</span><span class="cx">
</span><span class="cx"> frame.editor().updateMarkersForWordsAffectedByEditing(false);
</span><span class="lines">@@ -592,6 +633,9 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, bool shouldAddToKillRing)
</span><span class="cx"> {
</span><ins>+ if (!willAddTypingToOpenCommand(ForwardDeleteKey, granularity))
+ return;
+
</ins><span class="cx"> Frame& frame = this->frame();
</span><span class="cx">
</span><span class="cx"> frame.editor().updateMarkersForWordsAffectedByEditing(false);
</span><span class="lines">@@ -690,6 +734,9 @@
</span><span class="cx">
</span><span class="cx"> void TypingCommand::deleteSelection(bool smartDelete)
</span><span class="cx"> {
</span><ins>+ if (!willAddTypingToOpenCommand(DeleteSelection, CharacterGranularity))
+ return;
+
</ins><span class="cx"> CompositeEditCommand::deleteSelection(smartDelete);
</span><span class="cx"> typingAddedToOpenCommand(DeleteSelection);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.h (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.h 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/editing/TypingCommand.h 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class TypingCommand : public TextInsertionBaseCommand {
</del><ins>+class TypingCommand final : public TextInsertionBaseCommand {
</ins><span class="cx"> public:
</span><span class="cx"> enum ETypingCommand {
</span><span class="cx"> DeleteSelection,
</span><span class="lines">@@ -104,21 +104,22 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<TypingCommand> lastTypingCommandIfStillOpenForTyping(Frame&);
</span><span class="cx">
</span><del>- virtual void doApply();
- virtual bool isTypingCommand() const;
- virtual bool preservesTypingStyle() const { return m_preservesTypingStyle; }
- virtual bool shouldRetainAutocorrectionIndicator() const
</del><ins>+ void doApply();
+ bool isTypingCommand() const;
+ bool preservesTypingStyle() const { return m_preservesTypingStyle; }
+ bool shouldRetainAutocorrectionIndicator() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isTopLevelCommand());
</span><span class="cx"> return m_shouldRetainAutocorrectionIndicator;
</span><span class="cx"> }
</span><del>- virtual void setShouldRetainAutocorrectionIndicator(bool retain) { m_shouldRetainAutocorrectionIndicator = retain; }
- virtual bool shouldStopCaretBlinking() const { return true; }
</del><ins>+ void setShouldRetainAutocorrectionIndicator(bool retain) { m_shouldRetainAutocorrectionIndicator = retain; }
+ bool shouldStopCaretBlinking() const { return true; }
</ins><span class="cx"> void setShouldPreventSpellChecking(bool prevent) { m_shouldPreventSpellChecking = prevent; }
</span><span class="cx">
</span><span class="cx"> static void updateSelectionIfDifferentFromCurrentSelection(TypingCommand*, Frame*);
</span><span class="cx">
</span><span class="cx"> void updatePreservesTypingStyle(ETypingCommand);
</span><ins>+ bool willAddTypingToOpenCommand(ETypingCommand, TextGranularity);
</ins><span class="cx"> void markMisspellingsAfterTyping(ETypingCommand);
</span><span class="cx"> void typingAddedToOpenCommand(ETypingCommand);
</span><span class="cx"> bool makeEditableRootEmpty();
</span><span class="lines">@@ -129,11 +130,15 @@
</span><span class="cx"> void insertParagraphSeparatorInQuotedContentAndNotifyAccessibility();
</span><span class="cx"> void insertParagraphSeparatorAndNotifyAccessibility();
</span><span class="cx">
</span><ins>+ bool willApplyCommand();
+ void didApplyCommand();
+
</ins><span class="cx"> ETypingCommand m_commandType;
</span><span class="cx"> String m_textToInsert;
</span><span class="cx"> bool m_openForMoreTyping;
</span><span class="cx"> bool m_selectInsertedText;
</span><span class="cx"> bool m_smartDelete;
</span><ins>+ bool m_isHandlingInitialTypingCommand { true };
</ins><span class="cx"> TextGranularity m_granularity;
</span><span class="cx"> TextCompositionType m_compositionType;
</span><span class="cx"> bool m_shouldAddToKillRing;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -188,6 +188,7 @@
</span><span class="cx"> onautocompleteerror
</span><span class="cx"> onbeforecopy
</span><span class="cx"> onbeforecut
</span><ins>+onbeforeinput
</ins><span class="cx"> onbeforeload
</span><span class="cx"> onbeforepaste
</span><span class="cx"> onbeforeunload
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (206943 => 206944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-07 23:30:16 UTC (rev 206943)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-10-07 23:47:18 UTC (rev 206944)
</span><span class="lines">@@ -231,6 +231,7 @@
</span><span class="cx"> &onautocompleteerrorAttr,
</span><span class="cx"> &onbeforecopyAttr,
</span><span class="cx"> &onbeforecutAttr,
</span><ins>+ &onbeforeinputAttr,
</ins><span class="cx"> &onbeforeloadAttr,
</span><span class="cx"> &onbeforepasteAttr,
</span><span class="cx"> &onblurAttr,
</span></span></pre>
</div>
</div>
</body>
</html>