<!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>[208462] 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/208462">208462</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 12:06:00 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>When editing IME, `compositionend` events should fire after input events
https://bugs.webkit.org/show_bug.cgi?id=164324
<rdar://problem/29050438>
Reviewed by Darin Adler.
Source/WebCore:
Moves where we dispatch `compositionend` events to after applying editing commands that fire `beforeinput` or
`input` events. Also augments existing layout tests to verify the change.
* editing/Editor.cpp:
(WebCore::Editor::setComposition):
LayoutTests:
Augments fast/events/input-events-ime-recomposition.html and fast/events/input-events-ime-composition.html to
verify that compositionend events are fired after input events. Also rebaselines
fast/events/ime-composition-events-001.html.
* fast/events/ime-composition-events-001-expected.txt:
* fast/events/input-events-ime-composition-expected.txt:
* fast/events/input-events-ime-composition.html:
* fast/events/input-events-ime-recomposition-expected.txt:
* fast/events/input-events-ime-recomposition.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsimecompositionevents001expectedtxt">trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsimecompositionexpectedtxt">trunk/LayoutTests/fast/events/input-events-ime-composition-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsimecompositionhtml">trunk/LayoutTests/fast/events/input-events-ime-composition.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsimerecompositionexpectedtxt">trunk/LayoutTests/fast/events/input-events-ime-recomposition-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsimerecompositionhtml">trunk/LayoutTests/fast/events/input-events-ime-recomposition.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/ChangeLog 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-11-09 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><ins>+ When editing IME, `compositionend` events should fire after input events
+ https://bugs.webkit.org/show_bug.cgi?id=164324
+ <rdar://problem/29050438>
+
+ Reviewed by Darin Adler.
+
+ Augments fast/events/input-events-ime-recomposition.html and fast/events/input-events-ime-composition.html to
+ verify that compositionend events are fired after input events. Also rebaselines
+ fast/events/ime-composition-events-001.html.
+
+ * fast/events/ime-composition-events-001-expected.txt:
+ * fast/events/input-events-ime-composition-expected.txt:
+ * fast/events/input-events-ime-composition.html:
+ * fast/events/input-events-ime-recomposition-expected.txt:
+ * fast/events/input-events-ime-recomposition.html:
+
+2016-11-09 Wenson Hsieh <wenson_hsieh@apple.com>
+
</ins><span class="cx"> Setting foreground color when text is selected should fire an input event with color data
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164241
</span><span class="cx"> <rdar://problem/29032759>
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsimecompositionevents001expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "1"
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "2"
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "3"
</span><ins>+SUCCESS: INPUT - textInput - "4"
</ins><span class="cx"> SUCCESS: INPUT - compositionend - "4"
</span><del>-SUCCESS: INPUT - textInput - "4"
</del><span class="cx"> SUCCESS: INPUT - compositionstart - ""
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "5"
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "6"
</span><span class="lines">@@ -17,10 +17,10 @@
</span><span class="cx"> SUCCESS: INPUT - textInput - "8"
</span><span class="cx"> SUCCESS: INPUT - compositionstart - ""
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "9"
</span><ins>+SUCCESS: INPUT - textInput - "9"
</ins><span class="cx"> SUCCESS: INPUT - compositionend - "9"
</span><del>-SUCCESS: INPUT - textInput - "9"
</del><span class="cx"> SUCCESS: INPUT - compositionstart - "have"
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - "lost"
</span><ins>+SUCCESS: INPUT - textInput - "made"
</ins><span class="cx"> SUCCESS: INPUT - compositionend - "made"
</span><del>-SUCCESS: INPUT - textInput - "made"
</del><span class="cx"> SUCCESS: I made a pen
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsimecompositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-ime-composition-expected.txt (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-ime-composition-expected.txt 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/fast/events/input-events-ime-composition-expected.txt 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> input(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><span class="cx"> beforeinput(inputType = 'insertFromComposition', data = 'abc', cancelable = true)
</span><span class="cx"> input(inputType = 'insertFromComposition', data = 'abc', cancelable = false)
</span><ins>+compositionend(data = 'abc')
</ins><span class="cx"> * * * Second case: canceling a new composition * * *
</span><span class="cx"> beforeinput(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="cx"> input(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="lines">@@ -23,6 +24,7 @@
</span><span class="cx"> input(inputType = 'insertCompositionText', data = ' ', cancelable = false)
</span><span class="cx"> beforeinput(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><span class="cx"> input(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><ins>+compositionend(data = '')
</ins><span class="cx"> * * * Third case: replacing a composition * * *
</span><span class="cx"> beforeinput(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="cx"> input(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="lines">@@ -36,6 +38,7 @@
</span><span class="cx"> input(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><span class="cx"> beforeinput(inputType = 'insertFromComposition', data = 'fg', cancelable = true)
</span><span class="cx"> input(inputType = 'insertFromComposition', data = 'fg', cancelable = false)
</span><ins>+compositionend(data = 'fg')
</ins><span class="cx"> * * * Fourth case: partially committing a composition * * *
</span><span class="cx"> beforeinput(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="cx"> input(inputType = 'insertCompositionText', data = 'a', cancelable = false)
</span><span class="lines">@@ -47,6 +50,7 @@
</span><span class="cx"> input(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><span class="cx"> beforeinput(inputType = 'insertFromComposition', data = 'a', cancelable = true)
</span><span class="cx"> input(inputType = 'insertFromComposition', data = 'a', cancelable = false)
</span><ins>+compositionend(data = 'a')
</ins><span class="cx"> beforeinput(inputType = 'insertCompositionText', data = 'aa', cancelable = false)
</span><span class="cx"> input(inputType = 'insertCompositionText', data = 'aa', cancelable = false)
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsimecompositionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-ime-composition.html (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-ime-composition.html 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/fast/events/input-events-ime-composition.html 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> if (window.internals)
</span><span class="cx"> internals.settings.setInputEventsEnabled(true);
</span><span class="cx">
</span><ins>+ editable.addEventListener("compositionend", logCompositionEvent);
</ins><span class="cx"> editable.focus();
</span><span class="cx">
</span><span class="cx"> if (window.testRunner && window.textInputController) {
</span><span class="lines">@@ -42,6 +43,11 @@
</span><span class="cx"> {
</span><span class="cx"> debug(`${event.type}(inputType = '${event.inputType}', data = '${event.data}', cancelable = ${event.cancelable})`);
</span><span class="cx"> }
</span><ins>+
+ function logCompositionEvent(event)
+ {
+ debug(`${event.type}(data = '${event.data}')`);
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsimerecompositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-ime-recomposition-expected.txt (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-ime-recomposition-expected.txt 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/fast/events/input-events-ime-recomposition-expected.txt 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> input(inputType = 'deleteCompositionText', data = 'null', cancelable = false)
</span><span class="cx"> beforeinput(inputType = 'insertFromComposition', data = 'ghi', cancelable = true)
</span><span class="cx"> input(inputType = 'insertFromComposition', data = 'ghi', cancelable = false)
</span><ins>+compositionend(data = 'ghi')
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsimerecompositionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/input-events-ime-recomposition.html (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-ime-recomposition.html 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/LayoutTests/fast/events/input-events-ime-recomposition.html 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> if (window.internals)
</span><span class="cx"> internals.settings.setInputEventsEnabled(true);
</span><span class="cx">
</span><ins>+ editable.addEventListener("compositionend", logCompositionEvent);
</ins><span class="cx"> editable.focus();
</span><span class="cx">
</span><span class="cx"> if (window.testRunner && window.textInputController) {
</span><span class="lines">@@ -24,6 +25,11 @@
</span><span class="cx"> {
</span><span class="cx"> debug(`${event.type}(inputType = '${event.inputType}', data = '${event.data}', cancelable = ${event.cancelable})`);
</span><span class="cx"> }
</span><ins>+
+ function logCompositionEvent(event)
+ {
+ debug(`${event.type}(data = '${event.data}')`);
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-11-09 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><ins>+ When editing IME, `compositionend` events should fire after input events
+ https://bugs.webkit.org/show_bug.cgi?id=164324
+ <rdar://problem/29050438>
+
+ Reviewed by Darin Adler.
+
+ Moves where we dispatch `compositionend` events to after applying editing commands that fire `beforeinput` or
+ `input` events. Also augments existing layout tests to verify the change.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::setComposition):
+
+2016-11-09 Wenson Hsieh <wenson_hsieh@apple.com>
+
</ins><span class="cx"> Setting foreground color when text is selected should fire an input event with color data
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164241
</span><span class="cx"> <rdar://problem/29032759>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (208461 => 208462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-11-09 20:04:51 UTC (rev 208461)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-11-09 20:06:00 UTC (rev 208462)
</span><span class="lines">@@ -1680,14 +1680,6 @@
</span><span class="cx"> setIgnoreCompositionSelectionChange(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- // Dispatch a compositionend event to the focused node.
- // We should send this event before sending a TextEvent as written in Section 6.2.2 and 6.2.3 of
- // the DOM Event specification.
- if (Element* target = document().focusedElement()) {
- Ref<CompositionEvent> event = CompositionEvent::create(eventNames().compositionendEvent, document().domWindow(), text);
- target->dispatchEvent(event);
- }
</del><span class="cx">
</span><span class="cx"> // Always delete the current composition before inserting the finalized composition text if we're confirming our composition.
</span><span class="cx"> // Our default behavior (if the beforeinput event is not prevented) is to insert the finalized composition text back in.
</span><span class="lines">@@ -1700,6 +1692,9 @@
</span><span class="cx">
</span><span class="cx"> insertTextForConfirmedComposition(text);
</span><span class="cx">
</span><ins>+ if (auto* target = document().focusedElement())
+ target->dispatchEvent(CompositionEvent::create(eventNames().compositionendEvent, document().domWindow(), text));
+
</ins><span class="cx"> if (mode == CancelComposition) {
</span><span class="cx"> // An open typing command that disagrees about current selection would cause issues with typing later on.
</span><span class="cx"> TypingCommand::closeTyping(&m_frame);
</span><span class="lines">@@ -1769,12 +1764,9 @@
</span><span class="cx"> target->dispatchEvent(CompositionEvent::create(eventNames().compositionstartEvent, document().domWindow(), originalText));
</span><span class="cx"> event = CompositionEvent::create(eventNames().compositionupdateEvent, document().domWindow(), text);
</span><span class="cx"> }
</span><del>- } else {
- if (!text.isEmpty())
- event = CompositionEvent::create(eventNames().compositionupdateEvent, document().domWindow(), text);
- else
- event = CompositionEvent::create(eventNames().compositionendEvent, document().domWindow(), text);
- }
</del><ins>+ } else if (!text.isEmpty())
+ event = CompositionEvent::create(eventNames().compositionupdateEvent, document().domWindow(), text);
+
</ins><span class="cx"> if (event)
</span><span class="cx"> target->dispatchEvent(*event);
</span><span class="cx"> }
</span><span class="lines">@@ -1781,8 +1773,11 @@
</span><span class="cx">
</span><span class="cx"> // If text is empty, then delete the old composition here. If text is non-empty, InsertTextCommand::input
</span><span class="cx"> // will delete the old composition with an optimized replace operation.
</span><del>- if (text.isEmpty())
</del><ins>+ if (text.isEmpty()) {
</ins><span class="cx"> TypingCommand::deleteSelection(document(), TypingCommand::PreventSpellChecking, TypingCommand::TextCompositionPending);
</span><ins>+ if (target)
+ target->dispatchEvent(CompositionEvent::create(eventNames().compositionendEvent, document().domWindow(), text));
+ }
</ins><span class="cx">
</span><span class="cx"> m_compositionNode = nullptr;
</span><span class="cx"> m_customCompositionUnderlines.clear();
</span></span></pre>
</div>
</div>
</body>
</html>