Title: [137741] trunk/Source/WebCore
- Revision
- 137741
- Author
- [email protected]
- Date
- 2012-12-14 05:54:22 -0800 (Fri, 14 Dec 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137740 => 137741)
--- trunk/Source/WebCore/ChangeLog 2012-12-14 13:49:49 UTC (rev 137740)
+++ trunk/Source/WebCore/ChangeLog 2012-12-14 13:54:22 UTC (rev 137741)
@@ -1,3 +1,18 @@
+2012-12-14 Ilya Tikhonovsky <[email protected]>
+
+ 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 <[email protected]>
ChildNodesLazySnapshot::nextNode() can crash in Debug builds
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (137740 => 137741)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2012-12-14 13:49:49 UTC (rev 137740)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2012-12-14 13:54:22 UTC (rev 137741)
@@ -39,6 +39,7 @@
#include "RenderView.h"
#include "RootInlineBox.h"
#include "Text.h"
+#include "WebCoreMemoryInstrumentation.h"
#include <math.h>
@@ -1635,4 +1636,15 @@
#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
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (137740 => 137741)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2012-12-14 13:49:49 UTC (rev 137740)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2012-12-14 13:54:22 UTC (rev 137741)
@@ -299,6 +299,8 @@
parent()->clearDescendantsHaveSameLineHeightAndBaseline();
}
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+
private:
void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);
void addBorderOutsetVisualOverflow(LayoutRect& logicalVisualOverflow);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
