<!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>[152668] 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/152668">152668</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-07-15 16:28:50 -0700 (Mon, 15 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>compositionstart event should contain the text to be replaced
https://bugs.webkit.org/show_bug.cgi?id=118684

Reviewed by Alexey Proskuryakov.

Source/WebCore: 

Merge https://chromium.googlesource.com/chromium/blink/+/9e04f728a95ad7d4783b1d31c3cdc1412dd6cc4d.

DOM3 level 3 specifies compositionstart event's data to be the text to be replaced.
http://www.w3.org/TR/DOM-Level-3-Events/#event-type-compositionstart

According to the author of the Blink change, IE10 on Windows and Firefox22 on Linux confirms
to the specified behavior.

Test: fast/events/ime-composition-events-001.html

* editing/Editor.cpp:
(WebCore::Editor::setComposition):

LayoutTests: 

Add a test case.

* fast/events/ime-composition-events-001-expected.txt:
* fast/events/ime-composition-events-001.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="#trunkLayoutTestsfasteventsimecompositionevents001html">trunk/LayoutTests/fast/events/ime-composition-events-001.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 (152667 => 152668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-07-15 23:27:35 UTC (rev 152667)
+++ trunk/LayoutTests/ChangeLog        2013-07-15 23:28:50 UTC (rev 152668)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-07-15  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        compositionstart event should contain the text to be replaced
+        https://bugs.webkit.org/show_bug.cgi?id=118684
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add a test case.
+
+        * fast/events/ime-composition-events-001-expected.txt:
+        * fast/events/ime-composition-events-001.html:
+
</ins><span class="cx"> 2013-07-15  Antoine Quint  &lt;graouts@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Text with &quot;text-overflow:ellipsis&quot; and an SVG font do not render correctly
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsimecompositionevents001expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt (152667 => 152668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt        2013-07-15 23:27:35 UTC (rev 152667)
+++ trunk/LayoutTests/fast/events/ime-composition-events-001-expected.txt        2013-07-15 23:28:50 UTC (rev 152668)
</span><span class="lines">@@ -3,19 +3,24 @@
</span><span class="cx"> To test manually, enable an IME, input CJK characters, and see this page doesn't show 'FAILED' lines.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-SUCCESS: INPUT - compositionstart - &quot;1&quot;
</del><ins>+SUCCESS: INPUT - compositionstart - &quot;&quot;
</ins><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;1&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;2&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;3&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionend - &quot;4&quot;
</span><span class="cx"> SUCCESS: INPUT - textInput - &quot;4&quot;
</span><del>-SUCCESS: INPUT - compositionstart - &quot;5&quot;
</del><ins>+SUCCESS: INPUT - compositionstart - &quot;&quot;
</ins><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;5&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;6&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;7&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionend - &quot;&quot;
</span><span class="cx"> SUCCESS: INPUT - textInput - &quot;8&quot;
</span><del>-SUCCESS: INPUT - compositionstart - &quot;9&quot;
</del><ins>+SUCCESS: INPUT - compositionstart - &quot;&quot;
</ins><span class="cx"> SUCCESS: INPUT - compositionupdate - &quot;9&quot;
</span><span class="cx"> SUCCESS: INPUT - compositionend - &quot;9&quot;
</span><span class="cx"> SUCCESS: INPUT - textInput - &quot;9&quot;
</span><ins>+SUCCESS: INPUT - compositionstart - &quot;have&quot;
+SUCCESS: INPUT - compositionupdate - &quot;lost&quot;
+SUCCESS: INPUT - compositionend - &quot;made&quot;
+SUCCESS: INPUT - textInput - &quot;made&quot;
+SUCCESS: I made a pen
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsimecompositionevents001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/ime-composition-events-001.html (152667 => 152668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/ime-composition-events-001.html        2013-07-15 23:27:35 UTC (rev 152667)
+++ trunk/LayoutTests/fast/events/ime-composition-events-001.html        2013-07-15 23:28:50 UTC (rev 152668)
</span><span class="lines">@@ -57,6 +57,17 @@
</span><span class="cx">         textInputController.setMarkedText('9', 0, 1);
</span><span class="cx">         textInputController.unmarkText();
</span><span class="cx">     }
</span><ins>+
+    // Case 5: Compose a text on selection and commit it.
+    test.value = 'I have a pen';
+    test.selectionStart = 2;
+    test.selectionEnd = 6;
+    textInputController.setMarkedText('lost', 0, 1);
+    textInputController.insertText('made');
+    if (test.value == 'I made a pen')
+        log('SUCCESS: ' + test.value);
+    else
+        log('FAILURE: ' + test.value + ' is not &quot;I made a pen&quot;.');
</ins><span class="cx"> }
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;/body&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (152667 => 152668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-07-15 23:27:35 UTC (rev 152667)
+++ trunk/Source/WebCore/ChangeLog        2013-07-15 23:28:50 UTC (rev 152668)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2013-07-15  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        compositionstart event should contain the text to be replaced
+        https://bugs.webkit.org/show_bug.cgi?id=118684
+
+        Reviewed by Alexey Proskuryakov.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/9e04f728a95ad7d4783b1d31c3cdc1412dd6cc4d.
+
+        DOM3 level 3 specifies compositionstart event's data to be the text to be replaced.
+        http://www.w3.org/TR/DOM-Level-3-Events/#event-type-compositionstart
+
+        According to the author of the Blink change, IE10 on Windows and Firefox22 on Linux confirms
+        to the specified behavior.
+
+        Test: fast/events/ime-composition-events-001.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::setComposition):
+
+2013-07-15  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
</ins><span class="cx">         xmlDocPtrForString shouldn't upconvert 8-bit string
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=118693
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (152667 => 152668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2013-07-15 23:27:35 UTC (rev 152667)
+++ trunk/Source/WebCore/editing/Editor.cpp        2013-07-15 23:28:50 UTC (rev 152668)
</span><span class="lines">@@ -1541,7 +1541,7 @@
</span><span class="cx">             // We should send a compositionstart event only when the given text is not empty because this
</span><span class="cx">             // function doesn't create a composition node when the text is empty.
</span><span class="cx">             if (!text.isEmpty()) {
</span><del>-                target-&gt;dispatchEvent(CompositionEvent::create(eventNames().compositionstartEvent, m_frame-&gt;document()-&gt;domWindow(), text));
</del><ins>+                target-&gt;dispatchEvent(CompositionEvent::create(eventNames().compositionstartEvent, m_frame-&gt;document()-&gt;domWindow(), selectedText()));
</ins><span class="cx">                 event = CompositionEvent::create(eventNames().compositionupdateEvent, m_frame-&gt;document()-&gt;domWindow(), text);
</span><span class="cx">             }
</span><span class="cx">         } else {
</span></span></pre>
</div>
</div>

</body>
</html>