summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-07-01 09:59:08 -0700
committerGrace Kloba <klobag@google.com>2009-07-01 09:59:08 -0700
commitb9e110b536fec5900ef1ea3ea99789d937eba5b8 (patch)
treef8712458f1d3244a0450dd83a8905247c71defd5 /JavaScriptCore
parentd2d04a14cf7fade0c772520daf5bbdfb61d60473 (diff)
downloadexternal_webkit-b9e110b536fec5900ef1ea3ea99789d937eba5b8.zip
external_webkit-b9e110b536fec5900ef1ea3ea99789d937eba5b8.tar.gz
external_webkit-b9e110b536fec5900ef1ea3ea99789d937eba5b8.tar.bz2
Remove JavaScript node size in the instrumentation as it is using arena now. Added JSC namespace for the TimeCounter.
Diffstat (limited to 'JavaScriptCore')
-rw-r--r--JavaScriptCore/parser/Nodes.cpp21
-rw-r--r--JavaScriptCore/parser/Nodes.h10
2 files changed, 0 insertions, 31 deletions
diff --git a/JavaScriptCore/parser/Nodes.cpp b/JavaScriptCore/parser/Nodes.cpp
index 38e842a..4ddf13a 100644
--- a/JavaScriptCore/parser/Nodes.cpp
+++ b/JavaScriptCore/parser/Nodes.cpp
@@ -2180,25 +2180,4 @@ JSFunction* FuncExprNode::makeFunction(ExecState* exec, ScopeChainNode* scopeCha
return func;
}
-#ifdef ANDROID_INSTRUMENT
-static size_t nodesSize = 0;
-
-void* Node::operator new(size_t s) throw()
-{
- nodesSize += s;
- return ::operator new(s);
-}
-
-void Node::operator delete(void* ptr, size_t s)
-{
- nodesSize -= s;
- ::operator delete(ptr);
-}
-
-size_t Node::reportJavaScriptNodesSize()
-{
- return nodesSize;
-}
-#endif
-
} // namespace JSC
diff --git a/JavaScriptCore/parser/Nodes.h b/JavaScriptCore/parser/Nodes.h
index ec4fdb4..cda1ee4 100644
--- a/JavaScriptCore/parser/Nodes.h
+++ b/JavaScriptCore/parser/Nodes.h
@@ -153,16 +153,6 @@ namespace JSC {
int lineNo() const { return m_line; }
-#ifdef ANDROID_INSTRUMENT
- // Overridden to prevent the normal new from being called.
- void* operator new(size_t) throw();
-
- // Overridden to prevent the normal delete from being called.
- void operator delete(void*, size_t);
-
- static size_t reportJavaScriptNodesSize();
-#endif
-
protected:
int m_line;
};