Changeset 110129 in webkit for trunk/Source/WebCore/css/CSSCalculationValue.h

Timestamp:

Mar 7, 2012, 6:50:39 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r110126.
​http://trac.webkit.org/changeset/110126
​https://bugs.webkit.org/show_bug.cgi?id=80558

compile failed on AppleMac (Requested by ukai on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-03-07

Source/WebCore:

• WebCore.exp.in:
• css/CSSCalculationValue.cpp:
• css/CSSCalculationValue.h:

(WebCore):
(CSSCalcExpressionNode):
(CSSCalcValue):

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyLength::applyValue):

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

• css/CSSStyleSelector.h:
• platform/CalculationValue.cpp:
• platform/CalculationValue.h:
• platform/Length.cpp:

(WebCore::newLengthArray):

• platform/Length.h:

(WebCore::Length::operator*=):
(WebCore::Length::value):
(WebCore::Length::setValue):
(Length):
(WebCore::Length::calcValue):
(WebCore::Length::calcMinValue):
(WebCore::Length::calcFloatValue):
(WebCore::Length::isZero):
(WebCore::Length::isPositive):
(WebCore::Length::isNegative):
(WebCore::Length::isPercent):
(WebCore::Length::isSpecified):

LayoutTests:

• css3/calc/margin-expected.txt:
• css3/calc/padding-expected.txt:
• css3/calc/simple-calcs-expected.txt:

File:

• trunk/Source/WebCore/css/CSSCalculationValue.h (modified) (3 diffs)

trunk/Source/WebCore/css/CSSCalculationValue.h

@@ -44 +44 @@
 class CSSValueList;
 class RenderStyle;
-class CalculationValue;
+class CalcValue;
 class CalcExpressionNode;
 
@@ -59 +59 @@
 public:
     
-    virtual ~CSSCalcExpressionNode() = 0;
+    virtual ~CSSCalcExpressionNode() = 0;  
     virtual bool isZero() const = 0;
-    virtual PassOwnPtr<CalcExpressionNode> toCalcValue(RenderStyle*, RenderStyle* rootStyle, double zoom = 1.0) const = 0;    
     virtual double doubleValue() const = 0;
     virtual double computeLengthPx(RenderStyle* currentStyle, RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const = 0;
@@ -82 +81 @@
 public:
     static PassRefPtr<CSSCalcValue> create(CSSParserString name, CSSParserValueList*, CalculationPermittedValueRange);
-    static PassRefPtr<CSSCalcValue> create(CalculationValue*);
 
-    PassRefPtr<CalculationValue> toCalcValue(RenderStyle* style, RenderStyle* rootStyle, double zoom = 1.0) const
-    {
-        return CalculationValue::create(m_expression->toCalcValue(style, rootStyle, zoom), m_nonNegative ? CalculationRangeNonNegative : CalculationRangeAll);
-    }
     CalculationCategory category() const { return m_expression->category(); }
     bool isInt() const { return m_expression->isInteger(); }