Change Rect and Quad to be CSSValues

Source/core/css/parser/CSSPropertyParser.cpp

Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index 3800340654cf97a7ff909a178623ac0fd2bd54c2..fa08c7dac91dab79f481fc12dac936e9005a45b6 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -46,6 +46,7 @@
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSProperty.h"
 #include "core/css/CSSPropertyMetadata.h"
+#include "core/css/CSSQuadValue.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSShadowValue.h"
@@ -54,7 +55,6 @@
 #include "core/css/CSSValuePool.h"
 #include "core/css/HashTools.h"
 #include "core/css/Pair.h"
-#include "core/css/Rect.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserValues.h"
 #include "core/frame/UseCounter.h"
@@ -933,7 +933,7 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
 
     case CSSPropertyBorderImageOutset:
     case CSSPropertyWebkitMaskBoxImageOutset: {
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> result = nullptr;
+        RefPtrWillBeRawPtr<CSSQuadValue> result = nullptr;
         if (parseBorderImageOutset(result)) {
             addProperty(propId, result, important);
             return true;
@@ -960,7 +960,7 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
     }
     case CSSPropertyBorderImageWidth:
     case CSSPropertyWebkitMaskBoxImageWidth: {
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> result = nullptr;
+        RefPtrWillBeRawPtr<CSSQuadValue> result = nullptr;
         if (parseBorderImageWidth(result)) {
             addProperty(propId, result, important);
             return true;
@@ -3985,7 +3985,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseCounterContent(CSSParse
     return CSSCounterValue::create(identifier.release(), listStyle.release(), separator.release());
 }
 
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape()
+PassRefPtrWillBeRawPtr<CSSQuadValue> CSSPropertyParser::parseClipShape()
 {
     CSSParserValue* value = m_valueList->current();
     CSSParserValueList* args = value->function->args.get();
@@ -3996,9 +3996,13 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape()
     // rect(t, r, b, l) || rect(t r b l)
     if (args->size() != 4 && args->size() != 7)
         return nullptr;
-    RefPtrWillBeRawPtr<Rect> rect = Rect::create();
     int i = 0;
     CSSParserValue* a = args->current();
+
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr;
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr;
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr;
+    RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr;
     while (a) {
         if (a->id != CSSValueAuto && !validUnit(a, FLength | FUnitlessQuirk))
             return nullptr;
@@ -4006,13 +4010,13 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape()
             cssValuePool().createIdentifierValue(CSSValueAuto) :
             createPrimitiveNumericValue(a);
         if (i == 0)
-            rect->setTop(length);
+            top = length;
         else if (i == 1)
-            rect->setRight(length);
+            right = length;
         else if (i == 2)
-            rect->setBottom(length);
+            bottom = length;
         else
-            rect->setLeft(length);
+            left = length;
         a = args->next();
         if (a && args->size() == 7) {
             if (!consumeComma(args))
@@ -4022,7 +4026,7 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape()
         i++;
     }
     m_valueList->next();
-    return cssValuePool().createValue(rect.release());
+    return CSSQuadValue::createRect(top, right, bottom, left);

[Timothy Loh, 2015/08/24 03:18:04]

top.release() and so on (here and everywhere else)

[sashab, 2015/08/24 05:43:58]

So much code...

 }
 
 static void completeBorderRadii(RefPtrWillBeRawPtr<CSSPrimitiveValue> radii[4])
@@ -5502,7 +5506,7 @@ public:
             m_allowWidth = false;
         }
     }
-    void commitBorderWidth(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> width)
+    void commitBorderWidth(PassRefPtrWillBeRawPtr<CSSQuadValue> width)
     {
         m_borderWidth = width;
         m_canAdvance = true;
@@ -5514,7 +5518,7 @@ public:
         m_allowImage = !m_image;
         m_allowRepeat = !m_repeat;
     }
-    void commitBorderOutset(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> outset)
+    void commitBorderOutset(PassRefPtrWillBeRawPtr<CSSQuadValue> outset)
     {
         m_outset = outset;
         m_canAdvance = true;
@@ -5557,8 +5561,8 @@ public:
 
     RefPtrWillBeMember<CSSValue> m_image;
     RefPtrWillBeMember<CSSBorderImageSliceValue> m_imageSlice;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_borderWidth;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_outset;
+    RefPtrWillBeMember<CSSQuadValue> m_borderWidth;
+    RefPtrWillBeMember<CSSQuadValue> m_outset;
 
     RefPtrWillBeMember<CSSValue> m_repeat;
 };
@@ -5604,13 +5608,13 @@ bool CSSPropertyParser::buildBorderImageParseContext(CSSPropertyID propId, Borde
         }
 
         if (!context.canAdvance() && context.allowWidth()) {
-            RefPtrWillBeRawPtr<CSSPrimitiveValue> borderWidth = nullptr;
+            RefPtrWillBeRawPtr<CSSQuadValue> borderWidth = nullptr;
             if (parseBorderImageWidth(borderWidth))
                 context.commitBorderWidth(borderWidth.release());
         }
 
         if (!context.canAdvance() && context.requireOutset()) {
-            RefPtrWillBeRawPtr<CSSPrimitiveValue> borderOutset = nullptr;
+            RefPtrWillBeRawPtr<CSSQuadValue> borderOutset = nullptr;
             if (parseBorderImageOutset(borderOutset))
                 context.commitBorderOutset(borderOutset.release());
         }
@@ -5755,15 +5759,7 @@ public:
         if (!m_left)
             m_left = m_right;
 
-        // Now build a rect value to hold all four of our primitive values.
-        RefPtrWillBeRawPtr<Quad> quad = Quad::create();
-        quad->setTop(m_top);
-        quad->setRight(m_right);
-        quad->setBottom(m_bottom);
-        quad->setLeft(m_left);
-
-        // Make our new border image value now.
-        return CSSBorderImageSliceValue::create(cssValuePool().createValue(quad.release()), m_fill);
+        return CSSBorderImageSliceValue::create(CSSQuadValue::createQuad(m_top, m_right, m_bottom, m_left), m_fill);
     }
 
 private:
@@ -5845,7 +5841,7 @@ public:
 
     void setTop(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_top = val; }
 
-    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> commitBorderImageQuad()
+    PassRefPtrWillBeRawPtr<CSSQuadValue> commitBorderImageQuad()
     {
         // We need to clone and repeat values for any omissions.
         ASSERT(m_top);
@@ -5861,15 +5857,7 @@ public:
         if (!m_left)
             m_left = m_right;
 
-        // Now build a quad value to hold all four of our primitive values.
-        RefPtrWillBeRawPtr<Quad> quad = Quad::create();
-        quad->setTop(m_top);
-        quad->setRight(m_right);
-        quad->setBottom(m_bottom);
-        quad->setLeft(m_left);
-
-        // Make our new value now.
-        return cssValuePool().createValue(quad.release());
+        return CSSQuadValue::createQuad(m_top, m_right, m_bottom, m_left);
     }
 
 private:
@@ -5882,7 +5870,7 @@ private:
     RefPtrWillBeMember<CSSPrimitiveValue> m_left;
 };
 
-bool CSSPropertyParser::parseBorderImageQuad(Units validUnits, RefPtrWillBeRawPtr<CSSPrimitiveValue>& result)
+bool CSSPropertyParser::parseBorderImageQuad(Units validUnits, RefPtrWillBeRawPtr<CSSQuadValue>& result)
 {
     BorderImageQuadParseContext context;
     for (CSSParserValue* val = m_valueList->current(); val; val = m_valueList->next()) {
@@ -5909,12 +5897,12 @@ bool CSSPropertyParser::parseBorderImageQuad(Units validUnits, RefPtrWillBeRawPt
     return false;
 }
 
-bool CSSPropertyParser::parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>& result)
+bool CSSPropertyParser::parseBorderImageWidth(RefPtrWillBeRawPtr<CSSQuadValue>& result)
 {
     return parseBorderImageQuad(FLength | FNumber | FNonNeg | FPercent, result);
 }
 
-bool CSSPropertyParser::parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>& result)
+bool CSSPropertyParser::parseBorderImageOutset(RefPtrWillBeRawPtr<CSSQuadValue>& result)
 {
     return parseBorderImageQuad(FLength | FNumber | FNonNeg, result);
 }