Diff
Modified: trunk/Source/WebCore/ChangeLog (124622 => 124623)
--- trunk/Source/WebCore/ChangeLog 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/ChangeLog 2012-08-03 16:44:40 UTC (rev 124623)
@@ -1,3 +1,25 @@
+2012-08-03 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: eliminate visitBaseClass method from NMI. It introduces unnecessary complexity.
+ https://bugs.webkit.org/show_bug.cgi?id=93129
+
+ Reviewed by Yury Semikhatsky.
+
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::StyleRuleCSSStyleDeclaration::reportMemoryUsage):
+ (WebCore::InlineCSSStyleDeclaration::reportMemoryUsage):
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::reportMemoryUsage):
+ * dom/ContainerNode.h:
+ (WebCore::ContainerNode::reportMemoryUsage):
+ * dom/Document.cpp:
+ (WebCore::Document::reportMemoryUsage):
+ * dom/Element.h:
+ (WebCore::Element::reportMemoryUsage):
+ * dom/MemoryInstrumentation.h:
+ * dom/Node.cpp:
+ (WebCore::Node::reportMemoryUsage):
+
2012-08-03 Alexandre Elias <[email protected]>
[chromium] Move ubercomp quads back into CC
Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (124622 => 124623)
--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2012-08-03 16:44:40 UTC (rev 124623)
@@ -391,14 +391,14 @@
void StyleRuleCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<StyleRuleCSSStyleDeclaration> info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
- info.visitBaseClass<PropertySetCSSStyleDeclaration>(this);
+ PropertySetCSSStyleDeclaration::reportMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_parentRule);
}
void InlineCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<InlineCSSStyleDeclaration> info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
- info.visitBaseClass<PropertySetCSSStyleDeclaration>(this);
+ PropertySetCSSStyleDeclaration::reportMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_parentElement);
}
Modified: trunk/Source/WebCore/dom/CharacterData.cpp (124622 => 124623)
--- trunk/Source/WebCore/dom/CharacterData.cpp 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2012-08-03 16:44:40 UTC (rev 124623)
@@ -95,7 +95,7 @@
void CharacterData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<CharacterData> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
- info.visitBaseClass<Node>(this);
+ Node::reportMemoryUsage(memoryObjectInfo);
info.addString(m_data);
}
Modified: trunk/Source/WebCore/dom/ContainerNode.h (124622 => 124623)
--- trunk/Source/WebCore/dom/ContainerNode.h 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2012-08-03 16:44:40 UTC (rev 124623)
@@ -102,7 +102,7 @@
virtual void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<ContainerNode> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
- info.visitBaseClass<Node>(this);
+ Node::reportMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_firstChild);
info.addInstrumentedMember(m_lastChild);
}
Modified: trunk/Source/WebCore/dom/Document.cpp (124622 => 124623)
--- trunk/Source/WebCore/dom/Document.cpp 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-08-03 16:44:40 UTC (rev 124623)
@@ -6093,7 +6093,7 @@
{
MemoryClassInfo<Document> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
info.addInstrumentedMember(m_styleResolver);
- info.visitBaseClass<ContainerNode>(this);
+ ContainerNode::reportMemoryUsage(memoryObjectInfo);
info.addVector(m_customFonts);
info.addString(m_documentURI);
info.addString(m_baseTarget);
Modified: trunk/Source/WebCore/dom/Element.h (124622 => 124623)
--- trunk/Source/WebCore/dom/Element.h 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/Element.h 2012-08-03 16:44:40 UTC (rev 124623)
@@ -437,7 +437,7 @@
virtual void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<Element> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
- info.visitBaseClass<ContainerNode>(this);
+ ContainerNode::reportMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_tagName);
info.addInstrumentedMember(attributeData());
}
Modified: trunk/Source/WebCore/dom/MemoryInstrumentation.h (124622 => 124623)
--- trunk/Source/WebCore/dom/MemoryInstrumentation.h 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/MemoryInstrumentation.h 2012-08-03 16:44:40 UTC (rev 124623)
@@ -175,8 +175,6 @@
m_objectType = memoryObjectInfo->objectType();
}
- template <typename P> void visitBaseClass(const P* ptr) { ptr->P::reportMemoryUsage(m_memoryObjectInfo); }
-
template <typename M> void addInstrumentedMember(const M& member) { m_memoryInstrumentation->addInstrumentedObject(member, m_objectType); }
template <typename M> void addMember(const M& member) { m_memoryInstrumentation->addObject(member, m_objectType); }
Modified: trunk/Source/WebCore/dom/Node.cpp (124622 => 124623)
--- trunk/Source/WebCore/dom/Node.cpp 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebCore/dom/Node.cpp 2012-08-03 16:44:40 UTC (rev 124623)
@@ -2815,8 +2815,8 @@
void Node::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<Node> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
- info.visitBaseClass<TreeShared<Node, ContainerNode> >(this);
- info.visitBaseClass<ScriptWrappable>(this);
+ TreeShared<Node, ContainerNode>::reportMemoryUsage(memoryObjectInfo);
+ ScriptWrappable::reportMemoryUsage(memoryObjectInfo);
info.addInstrumentedMember(m_document);
info.addInstrumentedMember(m_next);
info.addInstrumentedMember(m_previous);
Modified: trunk/Source/WebKit/chromium/ChangeLog (124622 => 124623)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 16:44:40 UTC (rev 124623)
@@ -1,3 +1,13 @@
+2012-08-03 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: eliminate visitBaseClass method from NMI. It introduces unnecessary complexity.
+ https://bugs.webkit.org/show_bug.cgi?id=93129
+
+ Reviewed by Yury Semikhatsky.
+
+ * tests/MemoryInstrumentationTest.cpp:
+ (WebCore::InstrumentedWithOwnPtr::reportMemoryUsage):
+
2012-08-03 Adam Barth <[email protected]>
V8Proxy::retrieve(*) leads to really obfuscated code and should be removed
Modified: trunk/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp (124622 => 124623)
--- trunk/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp 2012-08-03 16:41:21 UTC (rev 124622)
+++ trunk/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp 2012-08-03 16:44:40 UTC (rev 124623)
@@ -39,7 +39,6 @@
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
-
using namespace WebCore;
namespace {
@@ -154,7 +153,7 @@
virtual void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo<InstrumentedWithOwnPtr> info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
- info.visitBaseClass<Instrumented>(this);
+ Instrumented::reportMemoryUsage(memoryObjectInfo);
info.addMember(m_notInstrumentedOwnPtr);
}
OwnPtr<NotInstrumented> m_notInstrumentedOwnPtr;
