X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fcss%2FCSSCalculationValue.cpp;h=eb12edea330e731aff99fb838edb5c4eee9fd8c7;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=cd6008d373694a9e274762584d58274b2ff54750;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp b/src/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
index cd6008d..eb12ede 100644
--- a/src/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
@@ -183,7 +183,7 @@ double CSSCalcValue::computeLengthPx(const CSSToLengthConversionData& conversion
 
 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:
 
@@ -199,17 +199,17 @@ 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:
@@ -224,7 +224,7 @@ public:
         }
     }
 
-    virtual double doubleValue() const OVERRIDE
+    virtual 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
+    virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
     {
         switch (m_category) {
         case CalcLength:
@@ -253,13 +253,13 @@ public:
         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;
@@ -267,14 +267,14 @@ 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
+    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);
@@ -336,7 +336,7 @@ static bool isIntegerResult(const CSSCalcExpressionNode* leftSide, const CSSCalc
     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)
     {
@@ -405,12 +405,12 @@ public:
         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:
@@ -437,19 +437,19 @@ public:
         }
     }
 
-    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:
@@ -490,12 +490,12 @@ public:
         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;
@@ -506,9 +506,9 @@ public:
             && 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:
@@ -540,7 +540,7 @@ public:
         return CSSPrimitiveValue::CSS_UNKNOWN;
     }
 
-    virtual void trace(Visitor* visitor)
+    virtual void trace(Visitor* visitor) override
     {
         visitor->trace(m_leftSide);
         visitor->trace(m_rightSide);
@@ -748,14 +748,10 @@ PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> CSSCalcValue::createExpressionNode
         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;
 }