<!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>[205924] 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/205924">205924</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 13:12:14 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename parseColorParameters and clean up conditional
https://bugs.webkit.org/show_bug.cgi?id=161941
<rdar://problem/28292750>
Reviewed by Dan Bates.
In preparation for adding color() support, rename the existing
parseColorParameters to parseRGBParameters.
Also clean up the logic in the parseColorFromValue function.
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseRGBParameters):
(WebCore::CSSParser::parseColorFromValue):
(WebCore::CSSParser::parseColorParameters): Deleted.
* css/parser/CSSParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserh">trunk/Source/WebCore/css/parser/CSSParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205923 => 205924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-14 19:56:03 UTC (rev 205923)
+++ trunk/Source/WebCore/ChangeLog 2016-09-14 20:12:14 UTC (rev 205924)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-09-13 Dean Jackson <dino@apple.com>
+
+ Rename parseColorParameters and clean up conditional
+ https://bugs.webkit.org/show_bug.cgi?id=161941
+ <rdar://problem/28292750>
+
+ Reviewed by Dan Bates.
+
+ In preparation for adding color() support, rename the existing
+ parseColorParameters to parseRGBParameters.
+
+ Also clean up the logic in the parseColorFromValue function.
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseRGBParameters):
+ (WebCore::CSSParser::parseColorFromValue):
+ (WebCore::CSSParser::parseColorParameters): Deleted.
+ * css/parser/CSSParser.h:
+
</ins><span class="cx"> 2016-09-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support hr.color IDL attribute
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (205923 => 205924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-14 19:56:03 UTC (rev 205923)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-14 20:12:14 UTC (rev 205924)
</span><span class="lines">@@ -7600,7 +7600,7 @@
</span><span class="cx"> return static_cast<int>(doubleValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseColorParameters(CSSParserValue& value, int* colorArray, bool parseAlpha)
</del><ins>+bool CSSParser::parseRGBParameters(CSSParserValue& value, int* colorArray, bool parseAlpha)
</ins><span class="cx"> {
</span><span class="cx"> CSSParserValueList* args = value.function->args.get();
</span><span class="cx"> ValueWithCalculation firstArgumentWithCalculation(*args->current());
</span><span class="lines">@@ -7699,37 +7699,35 @@
</span><span class="cx"> && value.function->args->size() == 5 /* rgb + two commas */
</span><span class="cx"> && equalLettersIgnoringASCIICase(value.function->name, "rgb(")) {
</span><span class="cx"> int colorValues[3];
</span><del>- if (!parseColorParameters(value, colorValues, false))
</del><ins>+ if (!parseRGBParameters(value, colorValues, false))
</ins><span class="cx"> return false;
</span><span class="cx"> c = makeRGB(colorValues[0], colorValues[1], colorValues[2]);
</span><del>- } else {
- if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 7 /* rgba + three commas */
- && equalLettersIgnoringASCIICase(value.function->name, "rgba(")) {
- int colorValues[4];
- if (!parseColorParameters(value, colorValues, true))
- return false;
- c = makeRGBA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 5 /* hsl + two commas */
- && equalLettersIgnoringASCIICase(value.function->name, "hsl(")) {
- double colorValues[3];
- if (!parseHSLParameters(value, colorValues, false))
- return false;
- c = makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], 1.0);
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 7 /* hsla + three commas */
- && equalLettersIgnoringASCIICase(value.function->name, "hsla(")) {
- double colorValues[4];
- if (!parseHSLParameters(value, colorValues, true))
- return false;
- c = makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
- } else
</del><ins>+ } else if (value.unit == CSSParserValue::Function
+ && value.function->args
+ && value.function->args->size() == 7 /* rgba + three commas */
+ && equalLettersIgnoringASCIICase(value.function->name, "rgba(")) {
+ int colorValues[4];
+ if (!parseRGBParameters(value, colorValues, true))
</ins><span class="cx"> return false;
</span><del>- }
</del><ins>+ c = makeRGBA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+ } else if (value.unit == CSSParserValue::Function
+ && value.function->args
+ && value.function->args->size() == 5 /* hsl + two commas */
+ && equalLettersIgnoringASCIICase(value.function->name, "hsl(")) {
+ double colorValues[3];
+ if (!parseHSLParameters(value, colorValues, false))
+ return false;
+ c = makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], 1.0);
+ } else if (value.unit == CSSParserValue::Function
+ && value.function->args
+ && value.function->args->size() == 7 /* hsla + three commas */
+ && equalLettersIgnoringASCIICase(value.function->name, "hsla(")) {
+ double colorValues[4];
+ if (!parseHSLParameters(value, colorValues, true))
+ return false;
+ c = makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+ } else
+ return false;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.h (205923 => 205924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.h 2016-09-14 19:56:03 UTC (rev 205923)
+++ trunk/Source/WebCore/css/parser/CSSParser.h 2016-09-14 20:12:14 UTC (rev 205924)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> bool parseCounter(CSSPropertyID, int defaultValue, bool important);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> parseCounterContent(CSSParserValueList& args, bool counters);
</span><span class="cx">
</span><del>- bool parseColorParameters(CSSParserValue&, int* colorValues, bool parseAlpha);
</del><ins>+ bool parseRGBParameters(CSSParserValue&, int* colorValues, bool parseAlpha);
</ins><span class="cx"> bool parseHSLParameters(CSSParserValue&, double* colorValues, bool parseAlpha);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = nullptr);
</span><span class="cx"> bool parseColorFromValue(CSSParserValue&, RGBA32&);
</span></span></pre>
</div>
</div>
</body>
</html>