<!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>[207759] 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/207759">207759</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 08:07:27 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix -webkit-box-reflect parsing
https://bugs.webkit.org/show_bug.cgi?id=163890
Reviewed by Zalan Bujtas.
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeReflect):
Do a WTFMove on the mask instead of a .releaseNonNull(), since mask can be a nullptr.
Exactly matches the old parser.
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::CalcParser::consumeValue):
(WebCore::CSSPropertyParserHelpers::CalcParser::consumeNumber):
(WebCore::CSSPropertyParserHelpers::consumeInteger):
(WebCore::CSSPropertyParserHelpers::consumeNumber):
(WebCore::CSSPropertyParserHelpers::consumeLength):
(WebCore::CSSPropertyParserHelpers::consumePercent):
(WebCore::CSSPropertyParserHelpers::consumeAngle):
(WebCore::CSSPropertyParserHelpers::consumeTime):
(WebCore::CSSPropertyParserHelpers::consumeUrl):
(WebCore::CSSPropertyParserHelpers::consumeColor):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientPoint):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientColorStop):
(WebCore::CSSPropertyParserHelpers::consumeCrossFade):
(WebCore::CSSPropertyParserHelpers::consumeImageSet):
Clean up all instances of CSSPrimitiveValue::create to use the CSSValuePool.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207758 => 207759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-24 14:58:05 UTC (rev 207758)
+++ trunk/Source/WebCore/ChangeLog        2016-10-24 15:07:27 UTC (rev 207759)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-10-24 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix -webkit-box-reflect parsing
+ https://bugs.webkit.org/show_bug.cgi?id=163890
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeReflect):
+ Do a WTFMove on the mask instead of a .releaseNonNull(), since mask can be a nullptr.
+ Exactly matches the old parser.
+
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::CalcParser::consumeValue):
+ (WebCore::CSSPropertyParserHelpers::CalcParser::consumeNumber):
+ (WebCore::CSSPropertyParserHelpers::consumeInteger):
+ (WebCore::CSSPropertyParserHelpers::consumeNumber):
+ (WebCore::CSSPropertyParserHelpers::consumeLength):
+ (WebCore::CSSPropertyParserHelpers::consumePercent):
+ (WebCore::CSSPropertyParserHelpers::consumeAngle):
+ (WebCore::CSSPropertyParserHelpers::consumeTime):
+ (WebCore::CSSPropertyParserHelpers::consumeUrl):
+ (WebCore::CSSPropertyParserHelpers::consumeColor):
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientPoint):
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientColorStop):
+ (WebCore::CSSPropertyParserHelpers::consumeCrossFade):
+ (WebCore::CSSPropertyParserHelpers::consumeImageSet):
+ Clean up all instances of CSSPrimitiveValue::create to use the CSSValuePool.
+
</ins><span class="cx"> 2016-10-21 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Concatenate JS and CSS files into a single JS and CSS resources
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (207758 => 207759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2016-10-24 14:58:05 UTC (rev 207758)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2016-10-24 15:07:27 UTC (rev 207759)
</span><span class="lines">@@ -2445,7 +2445,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> offset;
</span><span class="cx"> if (range.atEnd())
</span><del>- offset = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ offset = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
</ins><span class="cx"> else {
</span><span class="cx"> offset = consumeLengthOrPercent(range, context.mode, ValueRangeAll, UnitlessQuirk::Forbid);
</span><span class="cx"> if (!offset)
</span><span class="lines">@@ -2458,7 +2458,7 @@
</span><span class="cx"> if (!mask)
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- return CSSReflectValue::create(direction.releaseNonNull(), offset.releaseNonNull(), mask.releaseNonNull());
</del><ins>+ return CSSReflectValue::create(direction.releaseNonNull(), offset.releaseNonNull(), WTFMove(mask));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (207758 => 207759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp        2016-10-24 14:58:05 UTC (rev 207758)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp        2016-10-24 15:07:27 UTC (rev 207759)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> if (!m_calcValue)
</span><span class="cx"> return nullptr;
</span><span class="cx"> m_sourceRange = m_range;
</span><del>- return CSSPrimitiveValue::create(m_calcValue.release());
</del><ins>+ return CSSValuePool::singleton().createValue(m_calcValue.release());
</ins><span class="cx"> }
</span><span class="cx"> RefPtr<CSSPrimitiveValue> consumeNumber()
</span><span class="cx"> {
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> m_sourceRange = m_range;
</span><span class="cx"> CSSPrimitiveValue::UnitTypes unitType = m_calcValue->isInt() ? CSSPrimitiveValue::UnitTypes::CSS_PARSER_INTEGER : CSSPrimitiveValue::UnitTypes::CSS_NUMBER;
</span><del>- return CSSPrimitiveValue::create(m_calcValue->doubleValue(), unitType);
</del><ins>+ return CSSValuePool::singleton().createValue(m_calcValue->doubleValue(), unitType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool consumeNumberRaw(double& result)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> if (token.type() == NumberToken) {
</span><span class="cx"> if (token.numericValueType() == NumberValueType || token.numericValue() < minimumValue)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> if (token.type() == NumberToken) {
</span><span class="cx"> if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range, ValueRangeAll);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</ins><span class="cx"> }
</span><span class="cx"> if (token.type() == NumberToken) {
</span><span class="cx"> if (!shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> || (valueRange == ValueRangeNonNegative && token.numericValue() < 0))
</span><span class="cx"> return nullptr;
</span><span class="cx"> CSSPrimitiveValue::UnitTypes unitType = CSSPrimitiveValue::UnitTypes::CSS_PX;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), unitType);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unitType);
</ins><span class="cx"> }
</span><span class="cx"> if (cssParserMode == SVGAttributeMode)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> if (token.type() == PercentageToken) {
</span><span class="cx"> if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range, valueRange);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> case CSSPrimitiveValue::UnitTypes::CSS_RAD:
</span><span class="cx"> case CSSPrimitiveValue::UnitTypes::CSS_GRAD:
</span><span class="cx"> case CSSPrimitiveValue::UnitTypes::CSS_TURN:
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</ins><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)) {
</span><span class="cx"> range.consumeIncludingWhitespace();
</span><del>- return CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_DEG);
</del><ins>+ return CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_DEG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CalcParser calcParser(range, ValueRangeAll);
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (unit == CSSPrimitiveValue::UnitTypes::CSS_MS || unit == CSSPrimitiveValue::UnitTypes::CSS_S)
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range, valueRange);
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> StringView url = consumeUrlAsStringView(range);
</span><span class="cx"> if (url.isNull())
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(url.toString(), CSSPrimitiveValue::UnitTypes::CSS_URI);
</del><ins>+ return CSSValuePool::singleton().createValue(url.toString(), CSSPrimitiveValue::UnitTypes::CSS_URI);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int clampRGBComponent(const CSSPrimitiveValue& value)
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> RGBA32 color = Color::transparent;
</span><span class="cx"> if (!parseHexColor(range, color, acceptQuirkyColors) && !parseColorFunction(range, color))
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(Color(color));
</del><ins>+ return CSSValuePool::singleton().createValue(Color(color));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RefPtr<CSSPrimitiveValue> consumePositionComponent(CSSParserTokenRange& range, CSSParserMode cssParserMode, UnitlessQuirk unitless)
</span><span class="lines">@@ -666,11 +666,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (args.peek().type() == IdentToken) {
</span><span class="cx"> if ((horizontal && consumeIdent<CSSValueLeft>(args)) || (!horizontal && consumeIdent<CSSValueTop>(args)))
</span><del>- return CSSPrimitiveValue::create(0., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(0., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</ins><span class="cx"> if ((horizontal && consumeIdent<CSSValueRight>(args)) || (!horizontal && consumeIdent<CSSValueBottom>(args)))
</span><del>- return CSSPrimitiveValue::create(100., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(100., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</ins><span class="cx"> if (consumeIdent<CSSValueCenter>(args))
</span><del>- return CSSPrimitiveValue::create(50., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(50., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> RefPtr<CSSPrimitiveValue> result = consumePercent(args, ValueRangeAll);
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- stop.m_position = CSSPrimitiveValue::create(position, CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ stop.m_position = CSSValuePool::singleton().createValue(position, CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</ins><span class="cx"> stop.m_color = consumeDeprecatedGradientStopColor(args, cssParserMode);
</span><span class="cx"> return stop.m_color && args.atEnd();
</span><span class="cx"> }
</span><span class="lines">@@ -984,9 +984,9 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> percentage;
</span><span class="cx"> const CSSParserToken& percentageArg = args.consumeIncludingWhitespace();
</span><span class="cx"> if (percentageArg.type() == PercentageToken)
</span><del>- percentage = CSSPrimitiveValue::create(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</ins><span class="cx"> else if (percentageArg.type() == NumberToken)
</span><del>- percentage = CSSPrimitiveValue::create(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</ins><span class="cx">
</span><span class="cx"> if (!percentage)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1048,7 +1048,7 @@
</span><span class="cx"> double imageScaleFactor = token.numericValue();
</span><span class="cx"> if (imageScaleFactor <= 0)
</span><span class="cx"> return nullptr;
</span><del>- imageSet->append(CSSPrimitiveValue::create(imageScaleFactor, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
</del><ins>+ imageSet->append(CSSValuePool::singleton().createValue(imageScaleFactor, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
</ins><span class="cx"> } while (consumeCommaIncludingWhitespace(args));
</span><span class="cx"> if (!args.atEnd())
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>