<!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>[207244] 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/207244">207244</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 14:49:10 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add experimental support for the "formatForeColor" inputType
https://bugs.webkit.org/show_bug.cgi?id=163348
<rdar://problem/28739334>
Reviewed by Ryosuke Niwa.
Source/WebCore:
Adds support for the "formatForeColor" attribute. This patch introduces a simple hook in Editor.cpp to extract
data for an input event from an EditingStyle when performing an editing action.
Test: fast/events/input-events-forecolor-data.html
* editing/EditCommand.cpp:
(WebCore::inputTypeNameForEditingAction):
* editing/Editor.cpp:
(WebCore::inputEventDataForEditingStyleAndAction):
Added a new static helper to compute the data attribute of an InputEvent when handling a style change.
(WebCore::Editor::computeAndSetTypingStyle):
LayoutTests:
Adds a new test verifying that input events with inputType "formatForeColor" are dispatched when changing
foreground color, and that their data attributes are as expected.
* fast/events/input-events-forecolor-data-expected.txt: Added.
* fast/events/input-events-forecolor-data.html: Added.
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoreeditingEditCommandcpp">trunk/Source/WebCore/editing/EditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsinputeventsforecolordataexpectedtxt">trunk/LayoutTests/fast/events/input-events-forecolor-data-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinputeventsforecolordatahtml">trunk/LayoutTests/fast/events/input-events-forecolor-data.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207243 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-12 21:09:46 UTC (rev 207243)
+++ trunk/LayoutTests/ChangeLog 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-12 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add experimental support for the "formatForeColor" inputType
+ https://bugs.webkit.org/show_bug.cgi?id=163348
+ <rdar://problem/28739334>
+
+ Reviewed by Ryosuke Niwa.
+
+ Adds a new test verifying that input events with inputType "formatForeColor" are dispatched when changing
+ foreground color, and that their data attributes are as expected.
+
+ * fast/events/input-events-forecolor-data-expected.txt: Added.
+ * fast/events/input-events-forecolor-data.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-10-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT][JSC] Explore the way to embed nodeType into JSC::JSType in WebCore
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsforecolordataexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/input-events-forecolor-data-expected.txt (0 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-forecolor-data-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/input-events-forecolor-data-expected.txt 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+To manually test this, change the foreground color and check the resulting debug messages.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+event.type = beforeinput
+event.inputType = formatForeColor
+event.data = rgb(255, 255, 255)
+event.type = input
+event.inputType = formatForeColor
+event.data = rgb(255, 255, 255)
+event.type = beforeinput
+event.inputType = formatForeColor
+event.data = rgb(100, 255, 0)
+event.type = input
+event.inputType = formatForeColor
+event.data = rgb(100, 255, 0)
+event.type = beforeinput
+event.inputType = formatForeColor
+event.data = rgb(0, 0, 0)
+event.type = input
+event.inputType = formatForeColor
+event.data = rgb(0, 0, 0)
+event.type = beforeinput
+event.inputType = formatForeColor
+event.data = rgb(255, 0, 0)
+event.type = input
+event.inputType = formatForeColor
+event.data = rgb(255, 0, 0)
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsinputeventsforecolordatahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/input-events-forecolor-data.html (0 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/input-events-forecolor-data.html (rev 0)
+++ trunk/LayoutTests/fast/events/input-events-forecolor-data.html 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <div id="editable" contenteditable onbeforeinput=handleInput(event) oninput=handleInput(event)></div>
+ <script type="text/javascript">
+ description("To manually test this, change the foreground color and check the resulting debug messages.");
+ if (window.internals)
+ internals.settings.setInputEventsEnabled(true);
+
+ document.getElementById("editable").focus();
+
+ if (window.testRunner) {
+ // FIXME: The value argument is passed twice here for compatibility with DumpRenderTree. We should address
+ // this if we require more editing tests that need to pass arguments to the editing command.
+ testRunner.execCommand("ForeColor", "rgb(255, 255, 255)", "rgb(255, 255, 255)");
+ testRunner.execCommand("ForeColor", "rgb(100, 255, 0)", "rgb(100, 255, 0)");
+ testRunner.execCommand("ForeColor", "rgb(0, 0, 0)", "rgb(0, 0, 0)");
+ testRunner.execCommand("ForeColor", "rgb(255, 0, 0)", "rgb(255, 0, 0)");
+ }
+
+ function handleInput(event)
+ {
+ debug(`event.type = ${event.type}`);
+ debug(`event.inputType = ${event.inputType}`);
+ debug(`event.data = ${event.data}`);
+ }
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (207243 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 21:09:46 UTC (rev 207243)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -1208,6 +1208,7 @@
</span><span class="cx"> fast/events/input-events-fired-when-typing.html [ Failure ]
</span><span class="cx"> fast/events/input-events-paste-data.html [ Failure ]
</span><span class="cx"> fast/events/input-events-typing-data.html [ Failure ]
</span><ins>+fast/events/input-events-forecolor-data.html [ Failure ]
</ins><span class="cx"> fast/events/before-input-events-prevent-default.html [ Failure ]
</span><span class="cx"> fast/events/before-input-events-prevent-default-in-textfield.html [ Failure ]
</span><span class="cx"> fast/events/before-input-events-different-start-end-elements.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207243 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-12 21:09:46 UTC (rev 207243)
+++ trunk/Source/WebCore/ChangeLog 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-12 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add experimental support for the "formatForeColor" inputType
+ https://bugs.webkit.org/show_bug.cgi?id=163348
+ <rdar://problem/28739334>
+
+ Reviewed by Ryosuke Niwa.
+
+ Adds support for the "formatForeColor" attribute. This patch introduces a simple hook in Editor.cpp to extract
+ data for an input event from an EditingStyle when performing an editing action.
+
+ Test: fast/events/input-events-forecolor-data.html
+
+ * editing/EditCommand.cpp:
+ (WebCore::inputTypeNameForEditingAction):
+ * editing/Editor.cpp:
+ (WebCore::inputEventDataForEditingStyleAndAction):
+
+ Added a new static helper to compute the data attribute of an InputEvent when handling a style change.
+
+ (WebCore::Editor::computeAndSetTypingStyle):
+
</ins><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Generated bindings include the wrong header when ImplementedAs is used on a dictionary
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditCommand.cpp (207243 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditCommand.cpp 2016-10-12 21:09:46 UTC (rev 207243)
+++ trunk/Source/WebCore/editing/EditCommand.cpp 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> return ASCIILiteral("formatSuperscript");
</span><span class="cx"> case EditActionUnderline:
</span><span class="cx"> return ASCIILiteral("formatUnderline");
</span><ins>+ case EditActionSetColor:
+ return ASCIILiteral("formatForeColor");
</ins><span class="cx"> case EditActionDrag:
</span><span class="cx"> return ASCIILiteral("deleteByDrag");
</span><span class="cx"> case EditActionCut:
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (207243 => 207244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-10-12 21:09:46 UTC (rev 207243)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-10-12 21:49:10 UTC (rev 207244)
</span><span class="lines">@@ -132,6 +132,20 @@
</span><span class="cx"> element.dispatchInputEvent();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String inputEventDataForEditingStyleAndAction(EditingStyle& style, EditAction action)
+{
+ auto* properties = style.style();
+ if (!properties)
+ return { };
+
+ switch (action) {
+ case EditActionSetColor:
+ return properties->getPropertyValue(CSSPropertyColor);
+ default:
+ return { };
+ }
+}
+
</ins><span class="cx"> class ClearTextCommand : public DeleteSelectionCommand {
</span><span class="cx"> public:
</span><span class="cx"> ClearTextCommand(Document& document);
</span><span class="lines">@@ -3107,8 +3121,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String inputTypeName = inputTypeNameForEditingAction(editingAction);
</span><ins>+ String inputEventData = inputEventDataForEditingStyleAndAction(style, editingAction);
</ins><span class="cx"> auto* element = m_frame.selection().selection().rootEditableElement();
</span><del>- if (element && !dispatchBeforeInputEvent(*element, inputTypeName))
</del><ins>+ if (element && !dispatchBeforeInputEvent(*element, inputTypeName, inputEventData))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Calculate the current typing style.
</span><span class="lines">@@ -3125,7 +3140,7 @@
</span><span class="cx"> applyCommand(ApplyStyleCommand::create(document(), blockStyle.get(), editingAction));
</span><span class="cx">
</span><span class="cx"> if (element)
</span><del>- dispatchInputEvent(*element, inputTypeName);
</del><ins>+ dispatchInputEvent(*element, inputTypeName, inputEventData);
</ins><span class="cx">
</span><span class="cx"> // Set the remaining style as the typing style.
</span><span class="cx"> m_frame.selection().setTypingStyle(typingStyle);
</span></span></pre>
</div>
</div>
</body>
</html>