summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/Node.h
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-10-27 23:38:13 -0700
committerGrace Kloba <klobag@google.com>2009-10-28 12:06:57 -0700
commit47300b36ce11d38290d3933277fc9906493505d4 (patch)
tree547355ca2a59d3541aea643c09fef8429f6b8101 /WebCore/dom/Node.h
parent4e71352fc03ff3e392a94407c2298c045b610311 (diff)
downloadexternal_webkit-47300b36ce11d38290d3933277fc9906493505d4.zip
external_webkit-47300b36ce11d38290d3933277fc9906493505d4.tar.gz
external_webkit-47300b36ce11d38290d3933277fc9906493505d4.tar.bz2
fix instrumentation. The new WebKit has CachedResourceClient
derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
Diffstat (limited to 'WebCore/dom/Node.h')
-rw-r--r--WebCore/dom/Node.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index 8a4c264..082ab16 100644
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -513,10 +513,12 @@ public:
#ifdef ANDROID_INSTRUMENT
// Overridden to prevent the normal new from being called.
- void* operator new(size_t) throw();
+ void* operator new(size_t size);
+ void* operator new[](size_t size);
// Overridden to prevent the normal delete from being called.
- void operator delete(void*, size_t);
+ void operator delete(void* p, size_t size);
+ void operator delete[](void* p, size_t size);
static size_t reportDOMNodesSize();
#endif