Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: Source/core/css/CSSCalculationValue.cpp

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSBasicShapes.h ('k') | Source/core/css/CSSCanvasValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSCalculationValue.cpp
diff --git a/Source/core/css/CSSCalculationValue.cpp b/Source/core/css/CSSCalculationValue.cpp
index f7420cd9be3cfaaca6f839841e30ea78b991fe9a..00244e63127fe562b6e897f6a193d93d04d52306 100644
--- a/Source/core/css/CSSCalculationValue.cpp
+++ b/Source/core/css/CSSCalculationValue.cpp
@@ -199,17 +199,17 @@ public:
return adoptRefWillBeNoop(new CSSCalcPrimitiveValue(CSSPrimitiveValue::create(value, type).get(), isInteger));
}
- virtual bool isZero() const override
+ bool isZero() const override
{
return !m_value->getDoubleValue();
}
- virtual String customCSSText() const override
+ String customCSSText() const override
{
return m_value->cssText();
}
- virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
+ void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
{
switch (m_category) {
case CalcLength:
@@ -224,7 +224,7 @@ public:
}
}
- virtual double doubleValue() const override
+ double doubleValue() const override
{
if (hasDoubleValue(primitiveType()))
return m_value->getDoubleValue();
@@ -232,7 +232,7 @@ public:
return 0;
}
- virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
+ double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
{
switch (m_category) {
case CalcLength:
@@ -253,13 +253,13 @@ public:
return 0;
}
- virtual void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
+ void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
{
ASSERT(category() != CalcNumber);
m_value->accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
}
- virtual bool equals(const CSSCalcExpressionNode& other) const override
+ bool equals(const CSSCalcExpressionNode& other) const override
{
if (type() != other.type())
return false;
@@ -267,8 +267,8 @@ public:
return compareCSSValuePtr(m_value, static_cast<const CSSCalcPrimitiveValue&>(other).m_value);
}
- virtual Type type() const override { return CssCalcPrimitiveValue; }
- virtual CSSPrimitiveValue::UnitType primitiveType() const override
+ Type type() const override { return CssCalcPrimitiveValue; }
+ CSSPrimitiveValue::UnitType primitiveType() const override
{
return m_value->primitiveType();
}
@@ -405,12 +405,12 @@ public:
return create(leftSide, rightSide, op);
}
- virtual bool isZero() const override
+ bool isZero() const override
{
return !doubleValue();
}
- virtual void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
+ void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
{
switch (m_operator) {
case CalcAdd:
@@ -437,19 +437,19 @@ public:
}
}
- virtual double doubleValue() const override
+ double doubleValue() const override
{
return evaluate(m_leftSide->doubleValue(), m_rightSide->doubleValue());
}
- virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
+ 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, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
+ void accumulateLengthArray(CSSLengthArray& lengthArray, CSSLengthTypeArray& lengthTypeArray, double multiplier) const override
{
switch (m_operator) {
case CalcAdd:
@@ -490,12 +490,12 @@ public:
return result.toString();
}
- virtual String customCSSText() const override
+ String customCSSText() const override
{
return buildCSSText(m_leftSide->customCSSText(), m_rightSide->customCSSText(), m_operator);
}
- virtual bool equals(const CSSCalcExpressionNode& exp) const override
+ bool equals(const CSSCalcExpressionNode& exp) const override
{
if (type() != exp.type())
return false;
@@ -506,9 +506,9 @@ public:
&& m_operator == other.m_operator;
}
- virtual Type type() const override { return CssCalcBinaryOperation; }
+ Type type() const override { return CssCalcBinaryOperation; }
- virtual CSSPrimitiveValue::UnitType primitiveType() const override
+ CSSPrimitiveValue::UnitType primitiveType() const override
{
switch (m_category) {
case CalcNumber:
« no previous file with comments | « Source/core/css/CSSBasicShapes.h ('k') | Source/core/css/CSSCanvasValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698