Changeset 274546 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Mar 16, 2021, 7:12:13 PM (4 years ago)

Author:

[email protected]

Message:

Add CSSValuePair.h in preparation for Pair.h refactor
​https://bugs.webkit.org/show_bug.cgi?id=223205

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-03-16
Reviewed by Simon Fraser.

Add new CSSValuePair class, which is intended to replace Pair.h.
Pair.h has some problems, namely:

1. It's not a sub-class of CSSValue, making it awkward to use.
2. It can only contain CSSPrimitiveValues.

CSSValuePair will fix both of these shortcomings.

• Sources.txt:

Add CSSValuePair.cpp.

• css/CSSValue.cpp:

(WebCore::CSSValue::cssText const):
Handle new ValuePairClass value.
(WebCore::CSSValue::separatorCssText const):
Added.
(WebCore::CSSValue::destroy):
Handle new ValuePairClass value.

• css/CSSValue.h:

(WebCore::CSSValue::isValuePair const):
Added.
(WebCore::CSSValue::CSSValue):
Add new ValuePairClass value. Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

• css/CSSValueList.cpp:

(WebCore::CSSValueList::CSSValueList):
(WebCore::CSSValueList::copy):
(WebCore::CSSValueList::customCSSText const):
Refactor to use new separatorCssText() function.
(WebCore::CSSValueList::equals const):
Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

• css/CSSValueList.h:

(WebCore::CSSValueList::separator const):
Rename m_valueListSeparator to m_valueSeparator.

• css/CSSValuePair.cpp:

(WebCore::CSSValuePair::customCSSText const):
(WebCore::CSSValuePair::equals const):
Added.

• css/CSSValuePair.h:

(WebCore::CSSValuePair::create):
(WebCore::CSSValuePair::first const):
(WebCore::CSSValuePair::second const):
(WebCore::CSSValuePair::CSSValuePair):
Added.

• css/DeprecatedCSSOMValue.h:
• css/DeprecatedCSSOMValueList.cpp:

(WebCore::DeprecatedCSSOMValueList::cssText const):

• css/DeprecatedCSSOMValueList.h:

(WebCore::DeprecatedCSSOMValueList::DeprecatedCSSOMValueList):
Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -63 +63 @@
 #include "CSSUnsetValue.h"
 #include "CSSValueList.h"
+#include "CSSValuePair.h"
 #include "CSSVariableReferenceValue.h"
 
@@ -313 +314 @@
     case ValueListClass:
         return downcast<CSSValueList>(*this).customCSSText();
+    case ValuePairClass:
+        return downcast<CSSValuePair>(*this).customCSSText();
     case LineBoxContainClass:
         return downcast<CSSLineBoxContainValue>(*this).customCSSText();
@@ -339 +342 @@
 }
 
+String CSSValue::separatorCssText() const
+{
+    switch (m_valueSeparator) {
+    case SpaceSeparator:
+        return " "_s;
+    case CommaSeparator:
+        return ", "_s;
+    case SlashSeparator:
+        return " / "_s;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+    return " "_s;
+}
+
 void CSSValue::destroy()
 {
@@ -434 +452 @@
     case ValueListClass:
         delete downcast<CSSValueList>(this);
+        return;
+    case ValuePairClass:
+        delete downcast<CSSValuePair>(this);
         return;
     case LineBoxContainClass: