DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CSSCalcExpressionNode)
-class CSSCalcPrimitiveValue FINAL : public CSSCalcExpressionNode {
+class CSSCalcPrimitiveValue final : public CSSCalcExpressionNode {
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
return adoptRefWillBeNoop(new CSSCalcPrimitiveValue(CSSPrimitiveValue::create(value, type).get(), isInteger));
}
- virtual bool isZero() const OVERRIDE
+ virtual bool isZero() const override
{
return !m_value->getDoubleValue();
}
- virtual String customCSSText() const OVERRIDE
+ virtual String customCSSText() const override
{
return m_value->cssText();
}
- virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const OVERRIDE
+ virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
{
switch (m_category) {
case CalcLength:
}
}
- virtual double doubleValue() const OVERRIDE
+ virtual double doubleValue() const override
{
if (hasDoubleValue(primitiveType()))
return m_value->getDoubleValue();
return 0;
}
- virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const OVERRIDE
+ virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
{
switch (m_category) {
case CalcLength:
return 0;
}
- virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const
+ virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const override
{
ASSERT(category() != CalcNumber);
m_value->accumulateLengthArray(lengthArray, multiplier);
}
- virtual bool equals(const CSSCalcExpressionNode& other) const OVERRIDE
+ virtual bool equals(const CSSCalcExpressionNode& other) const override
{
if (type() != other.type())
return false;
return compareCSSValuePtr(m_value, static_cast<const CSSCalcPrimitiveValue&>(other).m_value);
}
- virtual Type type() const OVERRIDE { return CssCalcPrimitiveValue; }
- virtual CSSPrimitiveValue::UnitType primitiveType() const OVERRIDE
+ virtual Type type() const override { return CssCalcPrimitiveValue; }
+ virtual CSSPrimitiveValue::UnitType primitiveType() const override
{
return m_value->primitiveType();
}
- virtual void trace(Visitor* visitor)
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_value);
CSSCalcExpressionNode::trace(visitor);
return op != CalcDivide && leftSide->isInteger() && rightSide->isInteger();
}
-class CSSCalcBinaryOperation FINAL : public CSSCalcExpressionNode {
+class CSSCalcBinaryOperation final : public CSSCalcExpressionNode {
public:
static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> create(PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> leftSide, PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> rightSide, CalcOperator op)
{
return create(leftSide, rightSide, op);
}
- virtual bool isZero() const OVERRIDE
+ virtual bool isZero() const override
{
return !doubleValue();
}
- virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const OVERRIDE
+ virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
{
switch (m_operator) {
case CalcAdd:
}
}
- virtual double doubleValue() const OVERRIDE
+ virtual double doubleValue() const override
{
return evaluate(m_leftSide->doubleValue(), m_rightSide->doubleValue());
}
- virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const OVERRIDE
+ virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
{
const double leftValue = m_leftSide->computeLengthPx(conversionData);
const double rightValue = m_rightSide->computeLengthPx(conversionData);
return evaluate(leftValue, rightValue);
}
- virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const
+ virtual void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const override
{
switch (m_operator) {
case CalcAdd:
return result.toString();
}
- virtual String customCSSText() const OVERRIDE
+ virtual String customCSSText() const override
{
return buildCSSText(m_leftSide->customCSSText(), m_rightSide->customCSSText(), m_operator);
}
- virtual bool equals(const CSSCalcExpressionNode& exp) const OVERRIDE
+ virtual bool equals(const CSSCalcExpressionNode& exp) const override
{
if (type() != exp.type())
return false;
&& m_operator == other.m_operator;
}
- virtual Type type() const OVERRIDE { return CssCalcBinaryOperation; }
+ virtual Type type() const override { return CssCalcBinaryOperation; }
- virtual CSSPrimitiveValue::UnitType primitiveType() const OVERRIDE
+ virtual CSSPrimitiveValue::UnitType primitiveType() const override
{
switch (m_category) {
case CalcNumber:
return CSSPrimitiveValue::CSS_UNKNOWN;
}
- virtual void trace(Visitor* visitor)
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_leftSide);
visitor->trace(m_rightSide);
CalcAdd);
}
-PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(CSSParserString name, CSSParserValueList* parserValueList, ValueRange range)
+PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(CSSParserValueList* parserValueList, ValueRange range)
{
CSSCalcExpressionNodeParser parser;
- RefPtrWillBeRawPtr<CSSCalcExpressionNode> expression = nullptr;
-
- if (equalIgnoringCase(name, "calc") || equalIgnoringCase(name, "-webkit-calc"))
- expression = parser.parseCalc(parserValueList);
- // FIXME calc (http://webkit.org/b/16662) Add parsing for min and max here
+ RefPtrWillBeRawPtr<CSSCalcExpressionNode> expression = parser.parseCalc(parserValueList);
return expression ? adoptRefWillBeNoop(new CSSCalcValue(expression, range)) : nullptr;
}