Changeset 137741 in webkit

Timestamp:

Dec 14, 2012, 5:54:22 AM (13 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: Native Memory Instrumentation: do not validate InlineFlowBox objects against tcmalloc data.
​https://bugs.webkit.org/show_bug.cgi?id=105001

Reviewed by Yury Semikhatsky.

This is a follow-up change for r137589.

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::reportMemoryUsage):
(WebCore):

• rendering/InlineFlowBox.h:

(InlineFlowBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/InlineFlowBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: Native Memory Instrumentation: do not validate InlineFlowBox objects against tcmalloc data.
+        https://bugs.webkit.org/show_bug.cgi?id=105001
+
+        Reviewed by Yury Semikhatsky.
+
+        This is a follow-up change for r137589.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::reportMemoryUsage):
+        (WebCore):
+        * rendering/InlineFlowBox.h:
+        (InlineFlowBox):
+
 2012-12-14  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -40 +40 @@
 #include "RootInlineBox.h"
 #include "Text.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #include <math.h>
@@ -1636 +1637 @@
 #endif
 
+void InlineFlowBox::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Rendering);
+    InlineBox::reportMemoryUsage(memoryObjectInfo);
+    info.addMember(m_overflow);
+    info.addMember(m_firstChild);
+    info.addMember(m_lastChild);
+    info.addMember(m_prevLineBox);
+    info.addMember(m_nextLineBox);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -300 +300 @@
     }
 
+    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+
 private:
     void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);