Changeset 126139 in webkit

Timestamp:

Aug 21, 2012 12:17:53 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: NMI: wrong size was reported for immutable StylePropertySet
​https://bugs.webkit.org/show_bug.cgi?id=94489

Reviewed by Yury Semikhatsky.

Immutable StylePropertySet is created via placement new.
The rest of the allocated buffer is used as an array of CSSProperty.
This means that we don't need to report m_properties member but have to report actual size of the buffer
used for both, the object and CSSProperty array.

• css/StylePropertySet.cpp:

(WebCore::immutableStylePropertySetSize):
(WebCore):
(WebCore::StylePropertySet::createImmutable):
(WebCore::StylePropertySet::reportMemoryUsage):

• dom/MemoryInstrumentation.h:

(WebCore::MemoryObjectInfo::reportObjectInfo):
(WebCore::MemoryClassInfo::MemoryClassInfo):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-20  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: NMI: wrong size was reported for immutable StylePropertySet
+        https://bugs.webkit.org/show_bug.cgi?id=94489
+
+        Reviewed by Yury Semikhatsky.
+
+        Immutable StylePropertySet is created via placement new.
+        The rest of the allocated buffer is used as an array of CSSProperty.
+        This means that we don't need to report m_properties member but have to report actual size of the buffer
+        used for both, the object and CSSProperty array.
+
+        * css/StylePropertySet.cpp:
+        (WebCore::immutableStylePropertySetSize):
+        (WebCore):
+        (WebCore::StylePropertySet::createImmutable):
+        (WebCore::StylePropertySet::reportMemoryUsage):
+        * dom/MemoryInstrumentation.h:
+        (WebCore::MemoryObjectInfo::reportObjectInfo):
+        (WebCore::MemoryClassInfo::MemoryClassInfo):
+
 2012-08-20  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -51 +51 @@
 }
 
+static size_t immutableStylePropertySetSize(unsigned count)
+{
+    return sizeof(StylePropertySet) - sizeof(void*) + sizeof(CSSProperty) * count;
+}
+
 PassRefPtr<StylePropertySet> StylePropertySet::createImmutable(const CSSProperty* properties, unsigned count, CSSParserMode cssParserMode)
 {
-    void* slot = WTF::fastMalloc(sizeof(StylePropertySet) - sizeof(void*) + sizeof(CSSProperty) * count);
+    void* slot = WTF::fastMalloc(immutableStylePropertySetSize(count));
     return adoptRef(new (slot) StylePropertySet(properties, count, cssParserMode, /* makeMutable */ false));
 }
@@ -1092 +1097 @@
 void StylePropertySet::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
-    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
+    size_t actualSize = m_isMutable ? sizeof(StylePropertySet) : immutableStylePropertySetSize(m_arraySize);
+    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS, actualSize);
     if (m_isMutable)
         info.addVectorPtr(m_mutablePropertyVector);
-    else
-        info.addRawBuffer(m_properties, m_arraySize * sizeof(CSSProperty));
+
     unsigned count = propertyCount();
     for (unsigned i = 0; i < count; ++i)

trunk/Source/WebCore/dom/MemoryInstrumentation.h

@@ -169 +169 @@
     friend class MemoryClassInfo;
 
-    template <typename T> void reportObjectInfo(MemoryInstrumentation::ObjectType objectType)
+    template <typename T> void reportObjectInfo(MemoryInstrumentation::ObjectType objectType, size_t actualSize)
     {
         if (!m_objectSize) {
-            m_objectSize = sizeof(T);
+            m_objectSize = actualSize ? actualSize : sizeof(T);
             if (objectType != MemoryInstrumentation::Other)
                 m_objectType = objectType;
@@ -186 +186 @@
 public:
     template <typename T>
-    MemoryClassInfo(MemoryObjectInfo* memoryObjectInfo, const T*, MemoryInstrumentation::ObjectType objectType)
+    MemoryClassInfo(MemoryObjectInfo* memoryObjectInfo, const T*, MemoryInstrumentation::ObjectType objectType, size_t actualSize = 0)
         : m_memoryObjectInfo(memoryObjectInfo)
         , m_memoryInstrumentation(memoryObjectInfo->memoryInstrumentation())
     {
-        m_memoryObjectInfo->reportObjectInfo<T>(objectType);
+        m_memoryObjectInfo->reportObjectInfo<T>(objectType, actualSize);
         m_objectType = memoryObjectInfo->objectType();
     }