Make sure ImmutableStylePropertySet uses the new 16 bits size of StylePropertyMetadata.

Source/core/css/StylePropertySet.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * 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.
@@ skipping 133 matching lines @@
     // ImmutableStylePropertySet plus following properties, as a performance
     // tweak.
     NEW_DELETE_SAME_AS_MALLOC_FREE;
 public:
     ~ImmutableStylePropertySet();
     static PassRefPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
 
     const CSSValue** valueArray() const;
-    const StylePropertyMetadata* metadataArray() const;
+    const uint16_t* metadataArray() const;
 
     void* m_storage;
 
 private:
     ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
 };
 
 inline const CSSValue** ImmutableStylePropertySet::valueArray() const
 {
     return reinterpret_cast<const CSSValue**>(const_cast<const void**>((&static_cast<const ImmutableStylePropertySet*>(this)->m_storage)));
 }
 
-inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
+inline const uint16_t* ImmutableStylePropertySet::metadataArray() const
 {
-    return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>((&static_cast<const ImmutableStylePropertySet*>(this)->m_storage))[m_arraySize * sizeof(CSSValue*)]);
+    return reinterpret_cast<const uint16_t*>(&reinterpret_cast<const char*>((&static_cast<const ImmutableStylePropertySet*>(this)->m_storage))[m_arraySize * sizeof(CSSValue*)]);

[Jeffrey Yasskin, 2013/06/21 19:56:27]

Do you actually need all these casts? 'this' should already be a "const
ImmutableStylePropertySet*". You only need a static_cast to go from void* to
const char*. Only the char*->uint16_t needs a reinterpret_cast.

 }
 
 class MutableStylePropertySet : public StylePropertySet {
 public:
     ~MutableStylePropertySet();
 
     static PassRefPtr<MutableStylePropertySet> create(CSSParserMode = CSSQuirksMode);
     static PassRefPtr<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
 
     MutableStylePropertySet(const StylePropertySet&);
@@ skipping 40 matching lines @@
     MutableStylePropertySet(const CSSProperty* properties, unsigned count);
 
     bool removeShorthandProperty(CSSPropertyID);
     CSSProperty* findCSSPropertyWithID(CSSPropertyID);
 };
 
 inline StylePropertyMetadata StylePropertySet::PropertyReference::propertyMetadata() const
 {
     if (m_propertySet.isMutable())
         return static_cast<const MutableStylePropertySet&>(m_propertySet).m_propertyVector.at(m_index).metadata();
-    return static_cast<const ImmutableStylePropertySet&>(m_propertySet).metadataArray()[m_index];
+    return StylePropertyMetadata(static_cast<const ImmutableStylePropertySet&>(m_propertySet).metadataArray()[m_index]);
 }
 
 inline const CSSValue* StylePropertySet::PropertyReference::propertyValue() const
 {
     if (m_propertySet.isMutable())
         return static_cast<const MutableStylePropertySet&>(m_propertySet).m_propertyVector.at(m_index).value();
     return static_cast<const ImmutableStylePropertySet&>(m_propertySet).valueArray()[m_index];
 }
 
 inline unsigned StylePropertySet::propertyCount() const
@@ skipping 15 matching lines @@
 
     if (m_isMutable)
         delete static_cast<MutableStylePropertySet*>(this);
     else
         delete static_cast<ImmutableStylePropertySet*>(this);
 }
 
 } // namespace WebCore
 
 #endif // StylePropertySet_h