Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (207758 => 207759)
--- 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)
@@ -2445,7 +2445,7 @@
RefPtr<CSSPrimitiveValue> offset;
if (range.atEnd())
- offset = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
+ offset = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
else {
offset = consumeLengthOrPercent(range, context.mode, ValueRangeAll, UnitlessQuirk::Forbid);
if (!offset)
@@ -2458,7 +2458,7 @@
if (!mask)
return nullptr;
}
- return CSSReflectValue::create(direction.releaseNonNull(), offset.releaseNonNull(), mask.releaseNonNull());
+ return CSSReflectValue::create(direction.releaseNonNull(), offset.releaseNonNull(), WTFMove(mask));
}
#if ENABLE(CSS_IMAGE_ORIENTATION)
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (207758 => 207759)
--- 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)
@@ -90,7 +90,7 @@
if (!m_calcValue)
return nullptr;
m_sourceRange = m_range;
- return CSSPrimitiveValue::create(m_calcValue.release());
+ return CSSValuePool::singleton().createValue(m_calcValue.release());
}
RefPtr<CSSPrimitiveValue> consumeNumber()
{
@@ -98,7 +98,7 @@
return nullptr;
m_sourceRange = m_range;
CSSPrimitiveValue::UnitTypes unitType = m_calcValue->isInt() ? CSSPrimitiveValue::UnitTypes::CSS_PARSER_INTEGER : CSSPrimitiveValue::UnitTypes::CSS_NUMBER;
- return CSSPrimitiveValue::create(m_calcValue->doubleValue(), unitType);
+ return CSSValuePool::singleton().createValue(m_calcValue->doubleValue(), unitType);
}
bool consumeNumberRaw(double& result)
@@ -122,7 +122,7 @@
if (token.type() == NumberToken) {
if (token.numericValueType() == NumberValueType || token.numericValue() < minimumValue)
return nullptr;
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
}
CalcParser calcParser(range);
if (const CSSCalcValue* calculation = calcParser.value()) {
@@ -158,7 +158,7 @@
if (token.type() == NumberToken) {
if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
return nullptr;
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
}
CalcParser calcParser(range, ValueRangeAll);
if (const CSSCalcValue* calculation = calcParser.value()) {
@@ -208,7 +208,7 @@
}
if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
return nullptr;
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
}
if (token.type() == NumberToken) {
if (!shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)
@@ -215,7 +215,7 @@
|| (valueRange == ValueRangeNonNegative && token.numericValue() < 0))
return nullptr;
CSSPrimitiveValue::UnitTypes unitType = CSSPrimitiveValue::UnitTypes::CSS_PX;
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), unitType);
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unitType);
}
if (cssParserMode == SVGAttributeMode)
return nullptr;
@@ -231,7 +231,7 @@
if (token.type() == PercentageToken) {
if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
return nullptr;
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
}
CalcParser calcParser(range, valueRange);
if (const CSSCalcValue* calculation = calcParser.value()) {
@@ -279,7 +279,7 @@
case CSSPrimitiveValue::UnitTypes::CSS_RAD:
case CSSPrimitiveValue::UnitTypes::CSS_GRAD:
case CSSPrimitiveValue::UnitTypes::CSS_TURN:
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
default:
return nullptr;
}
@@ -286,7 +286,7 @@
}
if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)) {
range.consumeIncludingWhitespace();
- return CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_DEG);
+ return CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_DEG);
}
CalcParser calcParser(range, ValueRangeAll);
@@ -308,7 +308,7 @@
if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
return nullptr;
if (unit == CSSPrimitiveValue::UnitTypes::CSS_MS || unit == CSSPrimitiveValue::UnitTypes::CSS_S)
- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), token.unitType());
+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
return nullptr;
}
CalcParser calcParser(range, valueRange);
@@ -377,7 +377,7 @@
StringView url = ""
if (url.isNull())
return nullptr;
- return CSSPrimitiveValue::create(url.toString(), CSSPrimitiveValue::UnitTypes::CSS_URI);
+ return CSSValuePool::singleton().createValue(url.toString(), CSSPrimitiveValue::UnitTypes::CSS_URI);
}
static int clampRGBComponent(const CSSPrimitiveValue& value)
@@ -512,7 +512,7 @@
RGBA32 color = Color::transparent;
if (!parseHexColor(range, color, acceptQuirkyColors) && !parseColorFunction(range, color))
return nullptr;
- return CSSPrimitiveValue::create(Color(color));
+ return CSSValuePool::singleton().createValue(Color(color));
}
static RefPtr<CSSPrimitiveValue> consumePositionComponent(CSSParserTokenRange& range, CSSParserMode cssParserMode, UnitlessQuirk unitless)
@@ -666,11 +666,11 @@
{
if (args.peek().type() == IdentToken) {
if ((horizontal && consumeIdent<CSSValueLeft>(args)) || (!horizontal && consumeIdent<CSSValueTop>(args)))
- return CSSPrimitiveValue::create(0., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
+ return CSSValuePool::singleton().createValue(0., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
if ((horizontal && consumeIdent<CSSValueRight>(args)) || (!horizontal && consumeIdent<CSSValueBottom>(args)))
- return CSSPrimitiveValue::create(100., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
+ return CSSValuePool::singleton().createValue(100., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
if (consumeIdent<CSSValueCenter>(args))
- return CSSPrimitiveValue::create(50., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
+ return CSSValuePool::singleton().createValue(50., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
return nullptr;
}
RefPtr<CSSPrimitiveValue> result = consumePercent(args, ValueRangeAll);
@@ -711,7 +711,7 @@
return false;
}
- stop.m_position = CSSPrimitiveValue::create(position, CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
+ stop.m_position = CSSValuePool::singleton().createValue(position, CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
stop.m_color = consumeDeprecatedGradientStopColor(args, cssParserMode);
return stop.m_color && args.atEnd();
}
@@ -984,9 +984,9 @@
RefPtr<CSSPrimitiveValue> percentage;
const CSSParserToken& percentageArg = args.consumeIncludingWhitespace();
if (percentageArg.type() == PercentageToken)
- percentage = CSSPrimitiveValue::create(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
else if (percentageArg.type() == NumberToken)
- percentage = CSSPrimitiveValue::create(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
if (!percentage)
return nullptr;
@@ -1048,7 +1048,7 @@
double imageScaleFactor = token.numericValue();
if (imageScaleFactor <= 0)
return nullptr;
- imageSet->append(CSSPrimitiveValue::create(imageScaleFactor, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
+ imageSet->append(CSSValuePool::singleton().createValue(imageScaleFactor, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
} while (consumeCommaIncludingWhitespace(args));
if (!args.atEnd())
return nullptr;