<!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>[207539] trunk/Source/WebCore</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/207539">207539</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-19 09:38:42 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix named color parsing
https://bugs.webkit.org/show_bug.cgi?id=163662
Reviewed by Zalan Bujtas.
Named color parsing in the old parser for extended colors relied on constructing a Color with the
name and doing a lookup that way.
The new parser allows the back end to hold a primitive identifier value for extended colors.
StyleColor contains a helper function for looking up the correct color.
This patch switches both the old and the new parsers over to the new StyleColor function.
Also remove some asserts from the CSSSelectorList, since the new parser allows it to be empty and
detects parsing failure that way.
* css/CSSSelectorList.cpp:
(WebCore::CSSSelectorList::CSSSelectorList):
(WebCore::CSSSelectorList::operator=):
* css/StyleColor.cpp:
(WebCore::StyleColor::isColorKeyword):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::colorFromPrimitiveValue):
(WebCore::colorForCSSValue): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorListcpp">trunk/Source/WebCore/css/CSSSelectorList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleColorcpp">trunk/Source/WebCore/css/StyleColor.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207538 => 207539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 16:33:03 UTC (rev 207538)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 16:38:42 UTC (rev 207539)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-10-19 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix named color parsing
+ https://bugs.webkit.org/show_bug.cgi?id=163662
+
+ Reviewed by Zalan Bujtas.
+
+ Named color parsing in the old parser for extended colors relied on constructing a Color with the
+ name and doing a lookup that way.
+
+ The new parser allows the back end to hold a primitive identifier value for extended colors.
+
+ StyleColor contains a helper function for looking up the correct color.
+
+ This patch switches both the old and the new parsers over to the new StyleColor function.
+
+ Also remove some asserts from the CSSSelectorList, since the new parser allows it to be empty and
+ detects parsing failure that way.
+
+ * css/CSSSelectorList.cpp:
+ (WebCore::CSSSelectorList::CSSSelectorList):
+ (WebCore::CSSSelectorList::operator=):
+ * css/StyleColor.cpp:
+ (WebCore::StyleColor::isColorKeyword):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::colorFromPrimitiveValue):
+ (WebCore::colorForCSSValue): Deleted.
+
</ins><span class="cx"> 2016-10-19 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove SecurityOrigin::taintsCanvas
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelectorList.cpp (207538 => 207539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelectorList.cpp 2016-10-19 16:33:03 UTC (rev 207538)
+++ trunk/Source/WebCore/css/CSSSelectorList.cpp 2016-10-19 16:38:42 UTC (rev 207539)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> CSSSelectorList::CSSSelectorList(CSSSelectorList&& other)
</span><span class="cx"> : m_selectorArray(other.m_selectorArray)
</span><span class="cx"> {
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(componentCount());
</del><span class="cx"> other.m_selectorArray = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +101,6 @@
</span><span class="cx"> m_selectorArray = other.m_selectorArray;
</span><span class="cx"> other.m_selectorArray = nullptr;
</span><span class="cx">
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(componentCount());
</del><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleColor.cpp (207538 => 207539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleColor.cpp 2016-10-19 16:33:03 UTC (rev 207538)
+++ trunk/Source/WebCore/css/StyleColor.cpp 2016-10-19 16:38:42 UTC (rev 207539)
</span><span class="lines">@@ -48,7 +48,9 @@
</span><span class="cx">
</span><span class="cx"> bool StyleColor::isColorKeyword(CSSValueID id)
</span><span class="cx"> {
</span><del>- return (id >= CSSValueAlpha && id <= CSSValueWebkitText) || id == CSSValueMenu;
</del><ins>+ return (id >= CSSValueAlpha && id <= CSSValueWebkitText)
+ || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)
+ || id == CSSValueMenu;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleColor::isSystemColor(CSSValueID id)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (207538 => 207539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-10-19 16:33:03 UTC (rev 207538)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-10-19 16:38:42 UTC (rev 207539)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> #include "ShadowData.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "StyleBuilder.h"
</span><ins>+#include "StyleColor.h"
</ins><span class="cx"> #include "StyleCachedImage.h"
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><span class="cx"> #include "StyleGeneratedImage.h"
</span><span class="lines">@@ -1777,43 +1778,6 @@
</span><span class="cx"> fontDescription.setComputedSize(Style::computedFontSizeFromSpecifiedSize(size, fontDescription.isAbsoluteSize(), useSVGZoomRules(), m_state.style(), document()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Color colorForCSSValue(CSSValueID cssValueId)
-{
- struct ColorValue {
- CSSValueID cssValueId;
- RGBA32 color;
- };
-
- static const ColorValue colorValues[] = {
- { CSSValueAqua, 0xFF00FFFF },
- { CSSValueBlack, 0xFF000000 },
- { CSSValueBlue, 0xFF0000FF },
- { CSSValueFuchsia, 0xFFFF00FF },
- { CSSValueGray, 0xFF808080 },
- { CSSValueGreen, 0xFF008000 },
- { CSSValueGrey, 0xFF808080 },
- { CSSValueLime, 0xFF00FF00 },
- { CSSValueMaroon, 0xFF800000 },
- { CSSValueNavy, 0xFF000080 },
- { CSSValueOlive, 0xFF808000 },
- { CSSValueOrange, 0xFFFFA500 },
- { CSSValuePurple, 0xFF800080 },
- { CSSValueRed, 0xFFFF0000 },
- { CSSValueSilver, 0xFFC0C0C0 },
- { CSSValueTeal, 0xFF008080 },
- { CSSValueTransparent, 0x00000000 },
- { CSSValueWhite, 0xFFFFFFFF },
- { CSSValueYellow, 0xFFFFFF00 },
- { CSSValueInvalid, CSSValueInvalid }
- };
-
- for (const ColorValue* col = colorValues; col->cssValueId; ++col) {
- if (col->cssValueId == cssValueId)
- return col->color;
- }
- return RenderTheme::defaultTheme()->systemColor(cssValueId);
-}
-
</del><span class="cx"> bool StyleResolver::colorFromPrimitiveValueIsDerivedFromElement(const CSSPrimitiveValue& value)
</span><span class="cx"> {
</span><span class="cx"> int ident = value.valueID();
</span><span class="lines">@@ -1848,9 +1812,10 @@
</span><span class="cx"> return RenderTheme::focusRingColor();
</span><span class="cx"> case CSSValueCurrentcolor:
</span><span class="cx"> return state.style()->color();
</span><del>- default:
- return colorForCSSValue(ident);
</del><ins>+ default: {
+ return StyleColor::colorFromKeyword(ident);
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleResolver::addViewportDependentMediaQueryResult(const MediaQueryExpression& expression, bool result)
</span></span></pre>
</div>
</div>
</body>
</html>