Changeset 181320 in webkit

Timestamp:

Mar 10, 2015 2:21:20 AM (9 years ago)

Author:

zandobersek@gmail.com

Message:

Shrink the CSSPropertyID enum type
​https://bugs.webkit.org/show_bug.cgi?id=142456

Reviewed by Sam Weinig.

Specify uint16_t as the base type for the CSSPropertyID enum.
This is enough to cover all of the CSS properties (429 at this moment,
with static_assert covering future changes). It halves the enum type size,
from 4 bytes to 2, reducing the size of various CSSPropertyID containers.

No new tests -- no change in behavior.

• css/CSSPrimitiveValue.cpp:

(WebCore::propertyName): Remove the unnecessary propertyID < 0 check.

• css/makeprop.pl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValue.cpp (modified) (1 diff)
• css/makeprop.pl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-10  Zan Dobersek  <zdobersek@igalia.com>
+
+        Shrink the CSSPropertyID enum type
+        https://bugs.webkit.org/show_bug.cgi?id=142456
+
+        Reviewed by Sam Weinig.
+
+        Specify uint16_t as the base type for the CSSPropertyID enum.
+        This is enough to cover all of the CSS properties (429 at this moment,
+        with static_assert covering future changes). It halves the enum type size,
+        from 4 bytes to 2, reducing the size of various CSSPropertyID containers.
+
+        No new tests -- no change in behavior.
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::propertyName): Remove the unnecessary propertyID < 0 check.
+        * css/makeprop.pl:
+
 2015-03-10  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -220 +220 @@
     ASSERT_ARG(propertyID, propertyID >= 0);
     ASSERT_ARG(propertyID, (propertyID >= firstCSSProperty && propertyID < firstCSSProperty + numCSSProperties));
-
-    if (propertyID < 0)
-        return nullAtom;
 
     return getPropertyNameAtomicString(propertyID);

trunk/Source/WebCore/css/makeprop.pl

@@ -133 +133 @@
 
 namespace WebCore {
+
+// Using std::numeric_limits<uint16_t>::max() here would be cleaner,
+// but is not possible due to missing constexpr support in MSVC 2013.
+static_assert(numCSSProperties + 1 <= 65535, "CSSPropertyID should fit into uint16_t.");
+
 EOF
 
@@ -277 +282 @@
 namespace WebCore {
 
-enum CSSPropertyID {
+enum CSSPropertyID : uint16_t {
     CSSPropertyInvalid = 0,
 EOF