<!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>[212617] 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/212617">212617</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-19 16:46:27 -0800 (Sun, 19 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre><input type=color readonly> doesn't act per spec
https://bugs.webkit.org/show_bug.cgi?id=168421
<rdar://problem/30593185>
Reviewed by Ryosuke Niwa.
Source/WebCore:
The 'readonly' attribute should not apply to <input type=color> as per the
HTML specification:
- https://html.spec.whatwg.org/#the-input-element:attr-input-readonly-3
Chrome / Firefox and Edge already behave as per the specification.
Tests: fast/forms/color/input-color-disabled.html
fast/forms/color/input-color-readonly.html
* html/ColorInputType.cpp:
(WebCore::ColorInputType::handleDOMActivateEvent):
(WebCore::ColorInputType::didChooseColor):
LayoutTests:
Add layout test coverage.
* fast/forms/color/input-color-disabled-expected.txt: Added.
* fast/forms/color/input-color-disabled.html: Added.
* fast/forms/color/input-color-readonly-expected.txt: Added.
* fast/forms/color/input-color-readonly.html: Added.</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="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlColorInputTypecpp">trunk/Source/WebCore/html/ColorInputType.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformscolorinputcolordisabledexpectedtxt">trunk/LayoutTests/fast/forms/color/input-color-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformscolorinputcolordisabledhtml">trunk/LayoutTests/fast/forms/color/input-color-disabled.html</a></li>
<li><a href="#trunkLayoutTestsfastformscolorinputcolorreadonlyexpectedtxt">trunk/LayoutTests/fast/forms/color/input-color-readonly-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformscolorinputcolorreadonlyhtml">trunk/LayoutTests/fast/forms/color/input-color-readonly.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212616 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-19 22:07:58 UTC (rev 212616)
+++ trunk/LayoutTests/ChangeLog 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-19 Chris Dumez <cdumez@apple.com>
+
+ <input type=color readonly> doesn't act per spec
+ https://bugs.webkit.org/show_bug.cgi?id=168421
+ <rdar://problem/30593185>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test coverage.
+
+ * fast/forms/color/input-color-disabled-expected.txt: Added.
+ * fast/forms/color/input-color-disabled.html: Added.
+ * fast/forms/color/input-color-readonly-expected.txt: Added.
+ * fast/forms/color/input-color-readonly.html: Added.
+
</ins><span class="cx"> 2017-02-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r212466.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformscolorinputcolordisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/input-color-disabled-expected.txt (0 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/input-color-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/color/input-color-disabled-expected.txt 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that it is not possible to select a color on a input type=color that is marked as disabled.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS onChangeCount is 0
+PASS onChangeCount is 0
+PASS input.value is "#000000"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformscolorinputcolordisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/input-color-disabled.html (0 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/input-color-disabled.html (rev 0)
+++ trunk/LayoutTests/fast/forms/color/input-color-disabled.html 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Tests that it is not possible to select a color on a input type=color that is marked as disabled.");
+
+var input = document.createElement('input');
+input.type = 'color';
+input.disabled = true;
+input.value = '#000000';
+document.body.appendChild(input);
+
+input.style.position = 'absolute';
+input.style.left = '0';
+input.style.top = '0';
+input.style.width = '20px';
+input.style.height = '20px';
+
+var onChangeCount = 0;
+input.onchange = function() {
+ debug("change event dispatched - value changed to " + input.value);
+ onChangeCount++;
+};
+
+input.oninput = function() {
+ debug("input event dispatched - value is: " + input.value);
+};
+
+eventSender.mouseMoveTo(10, 10);
+eventSender.mouseDown();
+eventSender.mouseUp();
+
+shouldBe('onChangeCount', '0');
+internals.selectColorInColorChooser(input, '#ff0000');
+shouldBe('onChangeCount', '0');
+shouldBeEqualToString('input.value', '#000000');
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformscolorinputcolorreadonlyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/input-color-readonly-expected.txt (0 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/input-color-readonly-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/color/input-color-readonly-expected.txt 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests that it is possible to select a color on a input type=color that is marked as readOnly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS onChangeCount is 0
+input event dispatched - value is: #ff0000
+change event dispatched - value changed to #ff0000
+PASS onChangeCount is 1
+PASS input.value is "#ff0000"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformscolorinputcolorreadonlyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/color/input-color-readonly.html (0 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/color/input-color-readonly.html (rev 0)
+++ trunk/LayoutTests/fast/forms/color/input-color-readonly.html 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Tests that it is possible to select a color on a input type=color that is marked as readOnly.");
+
+var input = document.createElement('input');
+input.type = 'color';
+input.readOnly = true;
+input.value = '#000000';
+document.body.appendChild(input);
+
+input.style.position = 'absolute';
+input.style.left = '0';
+input.style.top = '0';
+input.style.width = '20px';
+input.style.height = '20px';
+
+var onChangeCount = 0;
+input.onchange = function() {
+ debug("change event dispatched - value changed to " + input.value);
+ onChangeCount++;
+};
+
+input.oninput = function() {
+ debug("input event dispatched - value is: " + input.value);
+};
+
+eventSender.mouseMoveTo(10, 10);
+eventSender.mouseDown();
+eventSender.mouseUp();
+
+shouldBe('onChangeCount', '0');
+
+// input.onchange should be called
+internals.selectColorInColorChooser(input, '#ff0000');
+shouldBe('onChangeCount', '1');
+shouldBeEqualToString('input.value', '#ff0000');
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (212616 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-19 22:07:58 UTC (rev 212616)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -1328,9 +1328,12 @@
</span><span class="cx"> fast/forms/autofocus-opera-003.html [ Failure ]
</span><span class="cx"> fast/forms/button-inner-block-reuse.html [ Failure ]
</span><span class="cx"> fast/forms/button-with-float.html [ ImageOnlyFailure ]
</span><del>-fast/forms/color/color-setrangetext.html [ Failure ]
</del><ins>+
+# <input type=color> is not supported on iOS.
</ins><span class="cx"> fast/forms/color/input-color-onchange-event.html [ Failure ]
</span><ins>+fast/forms/color/input-color-readonly.html [ Failure ]
</ins><span class="cx"> fast/forms/color/input-value-sanitization-color.html [ Failure ]
</span><ins>+fast/forms/color/color-setrangetext.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> fast/forms/datalist/datalist-fallback-content.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/forms/datalist/datalist-nonoption-child.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (212616 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-02-19 22:07:58 UTC (rev 212616)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> # Color input is not yet implemented on Mac WK1. Currently, using it erroneously triggers an ASSERT_NOT_REACHED.
</span><span class="cx"> webkit.org/b/119094 fast/forms/color/input-color-onchange-event.html [ Skip ]
</span><span class="cx"> webkit.org/b/119094 fast/forms/color/color-suggestion-picker-crash-on-set-value.html [ Skip ]
</span><ins>+webkit.org/b/119094 fast/forms/color/input-color-readonly.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # DumpRenderTree doesn't support logging calls to runOpenPanel.
</span><span class="cx"> fast/forms/file/open-file-panel.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212616 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-19 22:07:58 UTC (rev 212616)
+++ trunk/Source/WebCore/ChangeLog 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-19 Chris Dumez <cdumez@apple.com>
+
+ <input type=color readonly> doesn't act per spec
+ https://bugs.webkit.org/show_bug.cgi?id=168421
+ <rdar://problem/30593185>
+
+ Reviewed by Ryosuke Niwa.
+
+ The 'readonly' attribute should not apply to <input type=color> as per the
+ HTML specification:
+ - https://html.spec.whatwg.org/#the-input-element:attr-input-readonly-3
+
+ Chrome / Firefox and Edge already behave as per the specification.
+
+ Tests: fast/forms/color/input-color-disabled.html
+ fast/forms/color/input-color-readonly.html
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::handleDOMActivateEvent):
+ (WebCore::ColorInputType::didChooseColor):
+
</ins><span class="cx"> 2017-02-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r212466.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlColorInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ColorInputType.cpp (212616 => 212617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ColorInputType.cpp 2017-02-19 22:07:58 UTC (rev 212616)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2017-02-20 00:46:27 UTC (rev 212617)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> void ColorInputType::handleDOMActivateEvent(Event& event)
</span><span class="cx"> {
</span><del>- if (element().isDisabledOrReadOnly() || !element().renderer())
</del><ins>+ if (element().isDisabledFormControl() || !element().renderer())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!ScriptController::processingUserGesture())
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> void ColorInputType::didChooseColor(const Color& color)
</span><span class="cx"> {
</span><del>- if (element().isDisabledOrReadOnly() || color == valueAsColor())
</del><ins>+ if (element().isDisabledFormControl() || color == valueAsColor())
</ins><span class="cx"> return;
</span><span class="cx"> EventQueueScope scope;
</span><span class="cx"> element().setValueFromRenderer(color.serialized());
</span></span></pre>
</div>
</div>
</body>
</html>