Changeset 133160 in webkit

Timestamp:

Nov 1, 2012 7:10:37 AM (11 years ago)

Author:

rakuco@webkit.org

Message:

Fix StylePropertySet/ElementAttributeData custom allocation in debug builds.
<​http://webkit.org/b/100753>

Unreviewed debug bot crash fix after r133138.

There's additional padding after StylePropertySet and ElementAttributeData
in 64-bit debug builds since there are additional members in RefCountedBase.
Use 'sizeof(ImmutableFoo) - sizeof(void*)' as the base size of ImmutableFoo.

Patch by Andreas Kling <​kling@webkit.org> on 2012-11-01

• css/StylePropertySet.cpp:

(WebCore::sizeForImmutableStylePropertySetWithPropertyCount):

• dom/ElementAttributeData.cpp:

(WebCore::sizeForImmutableElementAttributeDataWithAttributeCount):
(WebCore::ElementAttributeData::createImmutable):
(WebCore::ElementAttributeData::reportMemoryUsage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StylePropertySet.cpp (modified) (1 diff)
• dom/ElementAttributeData.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-01  Andreas Kling  <kling@webkit.org>
+
+        Fix StylePropertySet/ElementAttributeData custom allocation in debug builds.
+        <http://webkit.org/b/100753>
+
+        Unreviewed debug bot crash fix after r133138.
+
+        There's additional padding after StylePropertySet and ElementAttributeData
+        in 64-bit debug builds since there are additional members in RefCountedBase.
+        Use 'sizeof(ImmutableFoo) - sizeof(void*)' as the base size of ImmutableFoo.
+
+        * css/StylePropertySet.cpp:
+        (WebCore::sizeForImmutableStylePropertySetWithPropertyCount):
+        * dom/ElementAttributeData.cpp:
+        (WebCore::sizeForImmutableElementAttributeDataWithAttributeCount):
+        (WebCore::ElementAttributeData::createImmutable):
+        (WebCore::ElementAttributeData::reportMemoryUsage):
+
 2012-11-01  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -58 +58 @@
 static size_t sizeForImmutableStylePropertySetWithPropertyCount(unsigned count)
 {
-    return sizeof(StylePropertySet) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
+    return sizeof(ImmutableStylePropertySet) - sizeof(void*) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
 }
 

trunk/Source/WebCore/dom/ElementAttributeData.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-static size_t immutableElementAttributeDataSize(unsigned count)
-{
-    return sizeof(ElementAttributeData) + sizeof(Attribute) * count;
+static size_t sizeForImmutableElementAttributeDataWithAttributeCount(unsigned count)
+{
+    return sizeof(ImmutableElementAttributeData) - sizeof(void*) + sizeof(Attribute) * count;
 }
 
 PassRefPtr<ElementAttributeData> ElementAttributeData::createImmutable(const Vector<Attribute>& attributes)
 {
-    void* slot = WTF::fastMalloc(immutableElementAttributeDataSize(attributes.size()));
+    void* slot = WTF::fastMalloc(sizeForImmutableElementAttributeDataWithAttributeCount(attributes.size()));
     return adoptRef(new (slot) ImmutableElementAttributeData(attributes));
 }
@@ -275 +275 @@
 void ElementAttributeData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
-    size_t actualSize = m_isMutable ? sizeof(ElementAttributeData) : immutableElementAttributeDataSize(m_arraySize);
+    size_t actualSize = m_isMutable ? sizeof(ElementAttributeData) : sizeForImmutableElementAttributeDataWithAttributeCount(m_arraySize);
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM, actualSize);
     info.addMember(m_inlineStyleDecl);