Changeset 293278 in webkit

Timestamp:

Apr 22, 2022, 7:15:14 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Reduce sizeof(CSSNumericType)
​https://bugs.webkit.org/show_bug.cgi?id=239680

Patch by Alex Christensen <​achristensen@webkit.org> on 2022-04-22
Reviewed by Yusuke Suzuki.

• bindings/IDLTypes.h:

(WebCore::IDLType::nullValue):
(WebCore::IDLType::isNullType):
(WebCore::IDLType::extractValueFromNullable):

• css/typedom/numeric/CSSMathProduct.cpp:

(WebCore::multiplyTypes):

• css/typedom/numeric/CSSNumericType.h:

(WebCore::CSSNumericType::valueForType):
(WebCore::CSSNumericType::valueForType const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/IDLTypes.h (modified) (2 diffs)
• css/typedom/numeric/CSSMathProduct.cpp (modified) (1 diff)
• css/typedom/numeric/CSSNumericType.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-22  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce sizeof(CSSNumericType)
+        https://bugs.webkit.org/show_bug.cgi?id=239680
+
+        Reviewed by Yusuke Suzuki.
+
+        * bindings/IDLTypes.h:
+        (WebCore::IDLType::nullValue):
+        (WebCore::IDLType::isNullType):
+        (WebCore::IDLType::extractValueFromNullable):
+        * css/typedom/numeric/CSSMathProduct.cpp:
+        (WebCore::multiplyTypes):
+        * css/typedom/numeric/CSSNumericType.h:
+        (WebCore::CSSNumericType::valueForType):
+        (WebCore::CSSNumericType::valueForType const):
+
 2022-04-22  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebCore/bindings/IDLTypes.h

@@ -31 +31 @@
 #include <variant>
 #include <wtf/Brigand.h>
+#include <wtf/Markable.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/URL.h>
@@ -76 +77 @@
     static bool isNullValue(const NullableType& value) { return !value; }
     static ImplementationType extractValueFromNullable(const NullableType& value) { return value.value(); }
+
+    template<typename Traits> using NullableTypeWithLessPadding = Markable<ImplementationType, Traits>;
+    template<typename Traits>
+    static NullableTypeWithLessPadding<Traits> nullValue() { return std::nullopt; }
+    template<typename Traits>
+    static bool isNullType(const NullableTypeWithLessPadding<Traits>& value) { return !value; }
+    template<typename Traits>
+    static ImplementationType extractValueFromNullable(const NullableTypeWithLessPadding<Traits>& value) { return value.value(); }
 };
 

trunk/Source/WebCore/css/typedom/numeric/CSSMathProduct.cpp

@@ -44 +44 @@
         return std::nullopt;
 
-    auto add = [] (auto left, auto right) -> std::optional<unsigned> {
+    auto add = [] (auto left, auto right) -> CSSNumericType::BaseTypeStorage {
         if (!left)
             return right;

trunk/Source/WebCore/css/typedom/numeric/CSSNumericType.h

@@ -30 +30 @@
 #include "CSSNumericBaseType.h"
 #include <optional>
+#include <wtf/Markable.h>
 #include <wtf/text/StringConcatenateNumbers.h>
 
@@ -36 +37 @@
 // https://drafts.css-houdini.org/css-typed-om/#dom-cssnumericvalue-type
 struct CSSNumericType {
-    std::optional<long> length;
-    std::optional<long> angle;
-    std::optional<long> time;
-    std::optional<long> frequency;
-    std::optional<long> resolution;
-    std::optional<long> flex;
-    std::optional<long> percent;
-    std::optional<CSSNumericBaseType> percentHint;
+    using BaseTypeStorage = Markable<int, IntegralMarkableTraits<int, std::numeric_limits<int>::min()>>;
+    BaseTypeStorage length;
+    BaseTypeStorage angle;
+    BaseTypeStorage time;
+    BaseTypeStorage frequency;
+    BaseTypeStorage resolution;
+    BaseTypeStorage flex;
+    BaseTypeStorage percent;
+    Markable<CSSNumericBaseType, EnumMarkableTraits<CSSNumericBaseType>> percentHint;
 
     bool operator==(const CSSNumericType& other) const
@@ -57 +59 @@
     }
 
-    std::optional<long>& valueForType(CSSNumericBaseType type)
+    BaseTypeStorage& valueForType(CSSNumericBaseType type)
     {
         switch (type) {
@@ -78 +80 @@
     }
 
-    const std::optional<long>& valueForType(CSSNumericBaseType type) const
+    const BaseTypeStorage& valueForType(CSSNumericBaseType type) const
     {
         return const_cast<CSSNumericType*>(this)->valueForType(type);