<!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>[200501] 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/200501">200501</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 18:26:26 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>4 and 8 digit color attributes should use the crazypants algorithm, not the CSS one.
https://bugs.webkit.org/show_bug.cgi?id=157402
<rdar://problem/26131142>
Reviewed by Simon Fraser.
Source/WebCore:
Noel and Tab from Google alerted me to the fact I broke some legacy
HTML color attributes when I added support for 4 and 8 digit hex colors
in CSS. The fix is to favor the "crazy" parsing unless we know it is a 3 or 6
digit hex value (in which case we try the CSS algorithm first).
Covered by reverting an existing test.
* html/HTMLElement.cpp:
(WebCore::HTMLElement::addHTMLColorToStyle):
LayoutTests:
Restore the version that was there before I added support for
4 and 8 digit hex colors in CSS.
* fast/dom/attribute-legacy-colors-expected.txt:
* fast/dom/script-tests/attribute-legacy-colors.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomattributelegacycolorsexpectedtxt">trunk/LayoutTests/fast/dom/attribute-legacy-colors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomscripttestsattributelegacycolorsjs">trunk/LayoutTests/fast/dom/script-tests/attribute-legacy-colors.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200500 => 200501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-06 01:23:31 UTC (rev 200500)
+++ trunk/LayoutTests/ChangeLog 2016-05-06 01:26:26 UTC (rev 200501)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-05 Dean Jackson <dino@apple.com>
+
+ 4 and 8 digit color attributes should use the crazypants algorithm, not the CSS one.
+ https://bugs.webkit.org/show_bug.cgi?id=157402
+ <rdar://problem/26131142>
+
+ Reviewed by Simon Fraser.
+
+ Restore the version that was there before I added support for
+ 4 and 8 digit hex colors in CSS.
+
+ * fast/dom/attribute-legacy-colors-expected.txt:
+ * fast/dom/script-tests/attribute-legacy-colors.js:
+
</ins><span class="cx"> 2016-05-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r200422): Web Inspector: Make new Array Iterator objects play nice with Web Inspector
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomattributelegacycolorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/attribute-legacy-colors-expected.txt (200500 => 200501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/attribute-legacy-colors-expected.txt 2016-05-06 01:23:31 UTC (rev 200500)
+++ trunk/LayoutTests/fast/dom/attribute-legacy-colors-expected.txt 2016-05-06 01:26:26 UTC (rev 200501)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> PASS document.body.bgColor='#ffzzzz';getComputedStyle(document.body).backgroundColor; is 'rgb(255, 0, 0)'
</span><span class="cx"> PASS document.body.bgColor='f00';getComputedStyle(document.body).backgroundColor; is 'rgb(15, 0, 0)'
</span><span class="cx"> PASS document.body.bgColor='ff0000';getComputedStyle(document.body).backgroundColor; is 'rgb(255, 0, 0)'
</span><ins>+PASS document.body.bgColor='#00000000';getComputedStyle(document.body).backgroundColor; is 'rgb(0, 0, 0)'
</ins><span class="cx"> PASS document.body.bgColor='foo';getComputedStyle(document.body).backgroundColor; is 'rgb(15, 0, 0)'
</span><span class="cx"> PASS document.body.bgColor='cheese';getComputedStyle(document.body).backgroundColor; is 'rgb(192, 238, 14)'
</span><span class="cx"> PASS document.body.bgColor='ffff';getComputedStyle(document.body).backgroundColor; is 'rgb(255, 0, 255)'
</span><span class="lines">@@ -34,9 +35,11 @@
</span><span class="cx"> PASS document.body.bgColor='#5';getComputedStyle(document.body).backgroundColor; is 'rgb(5, 0, 0)'
</span><span class="cx"> PASS document.body.bgColor='#55';getComputedStyle(document.body).backgroundColor; is 'rgb(5, 5, 0)'
</span><span class="cx"> PASS document.body.bgColor='#555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 85)'
</span><ins>+PASS document.body.bgColor='#5555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 0)'
</ins><span class="cx"> PASS document.body.bgColor='#55555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 80)'
</span><span class="cx"> PASS document.body.bgColor='#555555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 85)'
</span><span class="cx"> PASS document.body.bgColor='#5555555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 80)'
</span><ins>+PASS document.body.bgColor='#55555555';getComputedStyle(document.body).backgroundColor; is 'rgb(85, 85, 85)'
</ins><span class="cx"> PASS document.body.bgColor='5';getComputedStyle(document.body).backgroundColor; is 'rgb(5, 0, 0)'
</span><span class="cx"> PASS document.body.bgColor='55';getComputedStyle(document.body).backgroundColor; is 'rgb(5, 5, 0)'
</span><span class="cx"> PASS document.body.bgColor='555';getComputedStyle(document.body).backgroundColor; is 'rgb(5, 5, 5)'
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscripttestsattributelegacycolorsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/script-tests/attribute-legacy-colors.js (200500 => 200501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-tests/attribute-legacy-colors.js 2016-05-06 01:23:31 UTC (rev 200500)
+++ trunk/LayoutTests/fast/dom/script-tests/attribute-legacy-colors.js 2016-05-06 01:26:26 UTC (rev 200501)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> {'test':'#ffzzzz', 'expected':[255, 0, 0]},
</span><span class="cx"> {'test':'f00', 'expected':[15, 0, 0]},
</span><span class="cx"> {'test':'ff0000', 'expected':[255, 0, 0]},
</span><ins>+ {'test':'#00000000', 'expected':[0, 0, 0]},
</ins><span class="cx"> {'test':'foo', 'expected':[15, 0, 0]},
</span><span class="cx"> {'test':'cheese', 'expected':[192, 238, 14]},
</span><span class="cx"> {'test':'ffff', 'expected':[255, 0, 255]},
</span><span class="lines">@@ -33,9 +34,11 @@
</span><span class="cx"> {'test':'#5', 'expected':[5, 0, 0]},
</span><span class="cx"> {'test':'#55', 'expected':[5, 5, 0]},
</span><span class="cx"> {'test':'#555', 'expected':[85, 85, 85]},
</span><ins>+ {'test':'#5555', 'expected':[85, 85, 0]},
</ins><span class="cx"> {'test':'#55555', 'expected':[85, 85, 80]},
</span><span class="cx"> {'test':'#555555', 'expected':[85, 85, 85]},
</span><span class="cx"> {'test':'#5555555', 'expected':[85, 85, 80]},
</span><ins>+ {'test':'#55555555', 'expected':[85, 85, 85]},
</ins><span class="cx"> {'test':'5', 'expected':[5, 0, 0]},
</span><span class="cx"> {'test':'55', 'expected':[5, 5, 0]},
</span><span class="cx"> {'test':'555', 'expected':[5, 5, 5]},
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200500 => 200501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-06 01:23:31 UTC (rev 200500)
+++ trunk/Source/WebCore/ChangeLog 2016-05-06 01:26:26 UTC (rev 200501)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-05 Dean Jackson <dino@apple.com>
+
+ 4 and 8 digit color attributes should use the crazypants algorithm, not the CSS one.
+ https://bugs.webkit.org/show_bug.cgi?id=157402
+ <rdar://problem/26131142>
+
+ Reviewed by Simon Fraser.
+
+ Noel and Tab from Google alerted me to the fact I broke some legacy
+ HTML color attributes when I added support for 4 and 8 digit hex colors
+ in CSS. The fix is to favor the "crazy" parsing unless we know it is a 3 or 6
+ digit hex value (in which case we try the CSS algorithm first).
+
+ Covered by reverting an existing test.
+
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::addHTMLColorToStyle):
+
</ins><span class="cx"> 2016-05-05 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB (Workers): Remove the need for IDBConnectionProxy to expose its IDBConnectionToServer.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (200500 => 200501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-05-06 01:23:31 UTC (rev 200500)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-05-06 01:26:26 UTC (rev 200501)
</span><span class="lines">@@ -1139,11 +1139,19 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the string is a named CSS color or a 3/6-digit hex color, use that.
</span><del>- Color parsedColor(colorString);
- if (!parsedColor.isValid())
- parsedColor.setRGB(parseColorStringWithCrazyLegacyRules(colorString));
</del><ins>+ // We can't use the default Color constructor because it accepts
+ // 4/8-digit hex, which conflict with some legacy HTML content using attributes.
</ins><span class="cx">
</span><del>- style.setProperty(propertyID, CSSValuePool::singleton().createColorValue(parsedColor.rgb()));
</del><ins>+ Color color;
+
+ if ((colorString.length() == 4 || colorString.length() == 7) && colorString[0] == '#')
+ color = Color(colorString);
+ if (!color.isValid())
+ color.setNamedColor(colorString);
+ if (!color.isValid())
+ color.setRGB(parseColorStringWithCrazyLegacyRules(colorString));
+
+ style.setProperty(propertyID, CSSValuePool::singleton().createColorValue(color.rgb()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLElement::willRespondToMouseMoveEvents()
</span></span></pre>
</div>
</div>
</body>
</html>