[webkit-changes] [126156] trunk/Source/WebCore

[loislo]

Title: [126156] trunk/Source/WebCore

Revision

126156

Author

loi...@chromium.org

Date

2012-08-21 07:50:54 -0700 (Tue, 21 Aug 2012)

Log Message

Web Inspector: NMI: OwnPtr<T> was counted as RefPtr<T>
https://bugs.webkit.org/show_bug.cgi?id=94599

Reviewed by Yury Semikhatsky.

* dom/MemoryInstrumentation.h:
(WebCore::MemoryObjectInfo::MemoryObjectInfo):
(WebCore::MemoryInstrumentation::addInstrumentedObjectImpl):
(WebCore::MemoryInstrumentation::addObjectImpl):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/dom/MemoryInstrumentation.h

Diff

Modified: trunk/Source/WebCore/ChangeLog (126155 => 126156)

--- trunk/Source/WebCore/ChangeLog	2012-08-21 13:44:29 UTC (rev 126155)
+++ trunk/Source/WebCore/ChangeLog	2012-08-21 14:50:54 UTC (rev 126156)
@@ -1,5 +1,17 @@
 2012-08-21  Ilya Tikhonovsky  <loi...@chromium.org>
 
+        Web Inspector: NMI: OwnPtr<T> was counted as RefPtr<T>
+        https://bugs.webkit.org/show_bug.cgi?id=94599
+
+        Reviewed by Yury Semikhatsky.
+
+        * dom/MemoryInstrumentation.h:
+        (WebCore::MemoryObjectInfo::MemoryObjectInfo):
+        (WebCore::MemoryInstrumentation::addInstrumentedObjectImpl):
+        (WebCore::MemoryInstrumentation::addObjectImpl):
+
+2012-08-21  Ilya Tikhonovsky  <loi...@chromium.org>
+
         Web Inspector: NMI: rename addMember for strings and KURL to addInstrumentedMember.
         https://bugs.webkit.org/show_bug.cgi?id=94580
 

Modified: trunk/Source/WebCore/dom/MemoryInstrumentation.h (126155 => 126156)

--- trunk/Source/WebCore/dom/MemoryInstrumentation.h	2012-08-21 13:44:29 UTC (rev 126155)
+++ trunk/Source/WebCore/dom/MemoryInstrumentation.h	2012-08-21 14:50:54 UTC (rev 126156)
@@ -237,7 +237,7 @@
 void MemoryInstrumentation::addInstrumentedObjectImpl(const DataRef<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(DataRef<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addInstrumentedObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 
@@ -245,7 +245,7 @@
 void MemoryInstrumentation::addInstrumentedObjectImpl(const OwnPtr<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(OwnPtr<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addInstrumentedObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 
@@ -253,7 +253,7 @@
 void MemoryInstrumentation::addInstrumentedObjectImpl(const RefPtr<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(RefPtr<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addInstrumentedObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 
@@ -261,7 +261,7 @@
 void MemoryInstrumentation::addObjectImpl(const DataRef<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(DataRef<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 
@@ -269,7 +269,7 @@
 void MemoryInstrumentation::addObjectImpl(const OwnPtr<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(RefPtr<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 
@@ -277,7 +277,7 @@
 void MemoryInstrumentation::addObjectImpl(const RefPtr<T>* const& object, ObjectType ownerObjectType, OwningType owningType)
 {
     if (owningType == byPointer)
-        countObjectSize(ownerObjectType, sizeof(RefPtr<T>));
+        countObjectSize(ownerObjectType, sizeof(*object));
     addObjectImpl(object->get(), ownerObjectType, byPointer);
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes