Changeset 118900 in webkit for trunk/Source/WebCore/css/CSSCalculationValue.cpp

Timestamp:

May 30, 2012, 12:01:08 AM (13 years ago)

Author:

[email protected]

Message:

CSS3 calc: Implement CSSOM support
​https://bugs.webkit.org/show_bug.cgi?id=84551

Reviewed by Ryosuke Niwa.

Source/WebCore:

Adds a pretty printer for the calc expression tree.

Test: css3/calc/cssom.html

• css/CSSCalculationValue.cpp:

(WebCore::CSSCalcValue::customCssText):
(WebCore::CSSCalcPrimitiveValue::customCssText):
(WebCore::CSSCalcBinaryOperation::customCssText):
(CSSCalcBinaryOperation):

• css/CSSCalculationValue.h:

(CSSCalcExpressionNode):

LayoutTests:

• css3/calc/cssom-expected.txt: Added.
• css3/calc/cssom.html: Added.

File:

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

trunk/Source/WebCore/css/CSSCalculationValue.cpp

@@ -75 +75 @@
 String CSSCalcValue::customCssText() const
 {
-    return "";
+    StringBuilder result;
+    
+    result.append("-webkit-calc");
+    String expression = m_expression->customCssText();
+    bool expressionHasSingleTerm = expression[0] != '(';
+    if (expressionHasSingleTerm)
+        result.append('(');
+    result.append(expression);
+    if (expressionHasSingleTerm)
+        result.append(')');
+    return result.toString(); 
 }
     
@@ -110 +120 @@
     }
 
-    virtual String cssText() const
+    virtual String customCssText() const
     {
         return m_value->cssText();
@@ -251 +261 @@
     }
 
+    virtual String customCssText() const
+    {
+        StringBuilder result;
+        result.append('(');
+        result.append(m_leftSide->customCssText());
+        result.append(' ');
+        result.append(static_cast<char>(m_operator));
+        result.append(' ');
+        result.append(m_rightSide->customCssText());
+        result.append(')');
+    
+        return result.toString();    
+    }
+
 private:
     CSSCalcBinaryOperation(PassRefPtr<CSSCalcExpressionNode> leftSide, PassRefPtr<CSSCalcExpressionNode> rightSide, CalcOperator op, CalculationCategory category)