Changeset 285714 in webkit

Timestamp:

Nov 12, 2021, 4:48:43 AM (5 years ago)

Author:

ntim@apple.com

Message:

Re-use isCSSWideKeyword in CSSCustomPropertyValue::createWithID
​https://bugs.webkit.org/show_bug.cgi?id=233035

Reviewed by Antti Koivisto.

• css/CSSCustomPropertyValue.cpp:

(WebCore::CSSCustomPropertyValue::createWithID):

• css/CSSCustomPropertyValue.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSCustomPropertyValue.cpp (modified) (2 diffs)
• css/CSSCustomPropertyValue.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Tim Nguyen  <ntim@apple.com>
+
+        Re-use isCSSWideKeyword in CSSCustomPropertyValue::createWithID
+        https://bugs.webkit.org/show_bug.cgi?id=233035
+
+        Reviewed by Antti Koivisto.
+
+        * css/CSSCustomPropertyValue.cpp:
+        (WebCore::CSSCustomPropertyValue::createWithID):
+        * css/CSSCustomPropertyValue.h:
+
 2021-11-12  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp

@@ -27 +27 @@
 #include "CSSCustomPropertyValue.h"
 
+#include "CSSParserIdioms.h"
 #include "CSSTokenizer.h"
 
@@ -34 +35 @@
 {
     return adoptRef(*new CSSCustomPropertyValue(name, std::monostate { }));
+}
+
+Ref<CSSCustomPropertyValue> CSSCustomPropertyValue::createWithID(const AtomString& name, CSSValueID id)
+{
+    ASSERT(WebCore::isCSSWideKeyword(id) || id == CSSValueInvalid);
+    return adoptRef(*new CSSCustomPropertyValue(name, { id }));
 }
 

trunk/Source/WebCore/css/CSSCustomPropertyValue.h

@@ -53 +53 @@
     }
 
-    static Ref<CSSCustomPropertyValue> createWithID(const AtomString& name, CSSValueID id)
-    {
-        ASSERT(id == CSSValueInherit || id == CSSValueInitial || id == CSSValueUnset || id == CSSValueRevert || id == CSSValueInvalid);
-        return adoptRef(*new CSSCustomPropertyValue(name, { id }));
-    }
+    static Ref<CSSCustomPropertyValue> createWithID(const AtomString& name, CSSValueID);
 
     static Ref<CSSCustomPropertyValue> createSyntaxAll(const AtomString& name, Ref<CSSVariableData>&& value)
@@ -63 +59 @@
         return adoptRef(*new CSSCustomPropertyValue(name, { WTFMove(value) }));
     }
-    
+
     static Ref<CSSCustomPropertyValue> createSyntaxLength(const AtomString& name, Length value)
     {