Changeset 108750 in webkit

Timestamp:

Feb 24, 2012 1:33:28 AM (12 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc(): handle non-negative values
​https://bugs.webkit.org/show_bug.cgi?id=79188

Reviewed by Daniel Bates.

Source/WebCore:

Some CSS properties (e.g. padding) are required to be non-negative. These
are now restricted to the correct range.

Tests: css3/calc/negative-padding-expected.html

css3/calc/negative-padding.html

• css/CSSCalculationValue.cpp:

(WebCore):
(WebCore::CSSCalcValue::clampToPermittedRange): Added
(WebCore::CSSCalcValue::doubleValue):
(WebCore::CSSCalcValue::isNegative): Added
(WebCore::CSSCalcValue::computeLengthPx):
(WebCore::CSSCalcValue::create):

• css/CSSCalculationValue.h:

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

• css/CSSParser.cpp:

(WebCore::CSSParser::validCalculationUnit):
(WebCore::CSSParser::parseCalculation):

• css/CSSParser.h:
• platform/CalculationValue.h:

LayoutTests:

• css3/calc/negative-padding-expected.html: Added.
• css3/calc/negative-padding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/negative-padding-expected.html (added)
• LayoutTests/css3/calc/negative-padding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSCalculationValue.cpp (modified) (3 diffs)
• Source/WebCore/css/CSSCalculationValue.h (modified) (3 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (5 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)
• Source/WebCore/platform/CalculationValue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-24  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc(): handle non-negative values
+        https://bugs.webkit.org/show_bug.cgi?id=79188
+
+        Reviewed by Daniel Bates.
+
+        * css3/calc/negative-padding-expected.html: Added.
+        * css3/calc/negative-padding.html: Added.
+
 2012-02-22  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-24  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc(): handle non-negative values
+        https://bugs.webkit.org/show_bug.cgi?id=79188
+
+        Reviewed by Daniel Bates.
+
+        Some CSS properties (e.g. padding) are required to be non-negative. These
+        are now restricted to the correct range.
+
+        Tests: css3/calc/negative-padding-expected.html
+               css3/calc/negative-padding.html
+
+        * css/CSSCalculationValue.cpp:
+        (WebCore):
+        (WebCore::CSSCalcValue::clampToPermittedRange): Added
+        (WebCore::CSSCalcValue::doubleValue):
+        (WebCore::CSSCalcValue::isNegative): Added
+        (WebCore::CSSCalcValue::computeLengthPx):
+        (WebCore::CSSCalcValue::create):
+        * css/CSSCalculationValue.h:
+        (CSSCalcValue):
+        (WebCore::CSSCalcValue::CSSCalcValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::validCalculationUnit):
+        (WebCore::CSSParser::parseCalculation):
+        * css/CSSParser.h:
+        * platform/CalculationValue.h:
+
 2012-02-22  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/css/CSSCalculationValue.cpp

@@ -77 +77 @@
     return "";
 }
-
+    
+double CSSCalcValue::clampToPermittedRange(double value) const
+{
+    return m_nonNegative && value < 0 ? 0 : value;
+}    
+    
 double CSSCalcValue::doubleValue() const 
 { 
-    return m_expression->doubleValue();
-}
-    
+    return clampToPermittedRange(m_expression->doubleValue());
+}
+
 double CSSCalcValue::computeLengthPx(RenderStyle* currentStyle, RenderStyle* rootStyle, double multiplier, bool computingFontSize) const
 {
-    return m_expression->computeLengthPx(currentStyle, rootStyle, multiplier, computingFontSize);
+    return clampToPermittedRange(m_expression->computeLengthPx(currentStyle, rootStyle, multiplier, computingFontSize));
 }
     
@@ -382 +387 @@
 };
 
-PassRefPtr<CSSCalcValue> CSSCalcValue::create(CSSParserString name, CSSParserValueList* parserValueList)
+PassRefPtr<CSSCalcValue> CSSCalcValue::create(CSSParserString name, CSSParserValueList* parserValueList, CalculationPermittedValueRange range)
 {    
     CSSCalcExpressionNodeParser parser;    
@@ -391 +396 @@
     // FIXME calc (http://webkit.org/b/16662) Add parsing for min and max here
 
-    return expression ? adoptRef(new CSSCalcValue(expression)) : 0;
+    return expression ? adoptRef(new CSSCalcValue(expression, range)) : 0;
 }
 

trunk/Source/WebCore/css/CSSCalculationValue.h

@@ -61 +61 @@
     virtual ~CSSCalcExpressionNode() = 0;  
     virtual bool isZero() const = 0;
-    virtual double doubleValue() const = 0;  
+    virtual double doubleValue() const = 0;
     virtual double computeLengthPx(RenderStyle* currentStyle, RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const = 0;
     
@@ -80 +80 @@
 class CSSCalcValue : public CSSValue {
 public:
-    static PassRefPtr<CSSCalcValue> create(CSSParserString name, CSSParserValueList*);
+    static PassRefPtr<CSSCalcValue> create(CSSParserString name, CSSParserValueList*, CalculationPermittedValueRange);
 
     CalculationCategory category() const { return m_expression->category(); }
     bool isInt() const { return m_expression->isInteger(); }    
     double doubleValue() const;
+    bool isNegative() const { return m_expression->doubleValue() < 0; }
     double computeLengthPx(RenderStyle* currentStyle, RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const;
         
@@ -90 +91 @@
     
 private:    
-    CSSCalcValue(PassRefPtr<CSSCalcExpressionNode> expression)
+    CSSCalcValue(PassRefPtr<CSSCalcExpressionNode> expression, CalculationPermittedValueRange range)
         : CSSValue(CalculationClass)
         , m_expression(expression)
+        , m_nonNegative(range == CalculationRangeNonNegative)
     {
     }
     
+    double clampToPermittedRange(double) const;
+
     const RefPtr<CSSCalcExpressionNode> m_expression;
+    const bool m_nonNegative;
 };
     

trunk/Source/WebCore/css/CSSParser.cpp

@@ -712 +712 @@
 bool CSSParser::validCalculationUnit(CSSParserValue* value, Units unitflags)
 {
-    if (!parseCalculation(value))
+    bool mustBeNonNegative = unitflags & FNonNeg;
+
+    if (!parseCalculation(value, mustBeNonNegative ? CalculationRangeNonNegative : CalculationRangeAll))
         return false;
 
@@ -722 +724 @@
     case CalcPercent:
         b = (unitflags & FPercent);
-        // FIXME calc (http://webkit.org/b/16662): test FNonNeg here, eg
-        // if (b && (unitflags & FNonNeg) && m_parsedCalculation->doubleValue() < 0)
-        //    b = false;
+        if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
+            b = false;
         break;
     case CalcNumber:
@@ -730 +731 @@
         if (!b && (unitflags & FInteger) && m_parsedCalculation->isInt())
             b = true;
-        // FIXME calc (http://webkit.org/b/16662): test FNonNeg here, eg
-        // if (b && (unitflags & FNonNeg) && m_parsedCalculation->doubleValue() < 0)
-        //    b = false;
+        if (b && mustBeNonNegative && m_parsedCalculation->isNegative())
+            b = false;
         break;
     case CalcPercentLength:
@@ -7420 +7420 @@
 }
 
-bool CSSParser::parseCalculation(CSSParserValue* value) 
+bool CSSParser::parseCalculation(CSSParserValue* value, CalculationPermittedValueRange range) 
 {
     ASSERT(isCalculation(value));
@@ -7429 +7429 @@
 
     ASSERT(!m_parsedCalculation);
-    m_parsedCalculation = CSSCalcValue::create(value->function->name, args);
+    m_parsedCalculation = CSSCalcValue::create(value->function->name, args, range);
     
     if (!m_parsedCalculation)

trunk/Source/WebCore/css/CSSParser.h

@@ -210 +210 @@
 
     bool parseLineBoxContain(bool important);
-    bool parseCalculation(CSSParserValue*);
+    bool parseCalculation(CSSParserValue*, CalculationPermittedValueRange);
 
     bool parseFontFeatureTag(CSSValueList*);

trunk/Source/WebCore/platform/CalculationValue.h

@@ -44 +44 @@
     CalcSubtract = '-',
     CalcMultiply = '*',
-    CalcDivide = '/',
+    CalcDivide = '/'
+};
+
+enum CalculationPermittedValueRange {
+    CalculationRangeAll,
+    CalculationRangeNonNegative
 };