Reduce CSSProperty's StylePropertyMetadata memory footprint by half when used inside a ImmutableSty…

Source/core/css/CSSProperty.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef CSSProperty_h
 #define CSSProperty_h
 
 #include "CSSPropertyNames.h"
 #include "core/css/CSSValue.h"
 #include "core/platform/text/TextDirection.h"
 #include "core/platform/text/WritingMode.h"
 #include "core/rendering/style/RenderStyleConstants.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
+#include "wtf/PassRefPtr.h"
+#include "wtf/RefPtr.h"
 
 namespace WebCore {
 
-union StylePropertyMetadata {
-    StylePropertyMetadata(CSSPropertyID propertyID, CSSPropertyID shorthandID, bool important, bool implicit, bool inherited)
+struct StylePropertyMetadata {
+    StylePropertyMetadata(CSSPropertyID propertyID, bool isSetFromShorthand, int shorthandID, bool important, bool implicit, bool inherited)
         : m_propertyID(propertyID)
+        , m_isSetFromShorthand(isSetFromShorthand)
         , m_shorthandID(shorthandID)
         , m_important(important)
         , m_implicit(implicit)
         , m_inherited(inherited)
     {
     }
 
-    unsigned m_bits;
-    struct {
-        unsigned m_propertyID : 14;
-        unsigned m_shorthandID : 14; // If this property was set as part of a shorthand, gives the shorthand.
-        unsigned m_important : 1;
-        unsigned m_implicit : 1; // Whether or not the property was set implicitly as the result of a shorthand.
-        unsigned m_inherited : 1;
-    };
+    CSSPropertyID shorthandID() const;
+
+    unsigned m_propertyID : 10;
+    unsigned m_isSetFromShorthand : 1;
+    unsigned m_shorthandID : 2; // If this property was set as part of an ambiguous shorthand, gives the shorthand.
+    unsigned m_important : 1;
+    unsigned m_implicit : 1; // Whether or not the property was set implicitly as the result of a shorthand.
+    unsigned m_inherited : 1;
 };
 
 class CSSProperty {
 public:
-    CSSProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> value, bool important = false, CSSPropertyID shorthandID = CSSPropertyInvalid, bool implicit = false)
-        : m_metadata(propertyID, shorthandID, important, implicit, isInheritedProperty(propertyID))
+    CSSProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> value, bool important = false, bool isSetFromShorthand = false, int shorthandID = 0, bool implicit = false)
+        : m_metadata(propertyID, isSetFromShorthand, shorthandID, important, implicit, isInheritedProperty(propertyID))
         , m_value(value)
     {
     ASSERT((propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
     }
 
     // FIXME: Remove this.
     CSSProperty(StylePropertyMetadata metadata, CSSValue* value)
         : m_metadata(metadata)
         , m_value(value)
     {
     ASSERT((metadata.m_propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
     }
 
     CSSPropertyID id() const { return static_cast<CSSPropertyID>(m_metadata.m_propertyID); }
-    CSSPropertyID shorthandID() const { return static_cast<CSSPropertyID>(m_metadata.m_shorthandID); }
+    bool isSetFromShorthand() const { return m_metadata.m_isSetFromShorthand; };
+    CSSPropertyID shorthandID() const { return m_metadata.shorthandID(); };
     bool isImportant() const { return m_metadata.m_important; }
 
     CSSValue* value() const { return m_value.get(); }
 
     void wrapValueInCommaSeparatedList();
 
     static CSSPropertyID resolveDirectionAwareProperty(CSSPropertyID, TextDirection, WritingMode);
     static bool isInheritedProperty(CSSPropertyID);
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
@@ skipping 50 matching lines @@
 } // namespace WebCore
 
 namespace WTF {
 template <> struct VectorTraits<WebCore::CSSProperty> : VectorTraitsBase<false, WebCore::CSSProperty> {
     static const bool canInitializeWithMemset = true;
     static const bool canMoveWithMemcpy = true;
 };
 }
 
 #endif // CSSProperty_h