diff options
author | Grace Kloba <klobag@google.com> | 2009-10-27 23:38:13 -0700 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-10-28 12:06:57 -0700 |
commit | 47300b36ce11d38290d3933277fc9906493505d4 (patch) | |
tree | 547355ca2a59d3541aea643c09fef8429f6b8101 /WebCore/dom/ProcessingInstruction.h | |
parent | 4e71352fc03ff3e392a94407c2298c045b610311 (diff) | |
download | external_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/ProcessingInstruction.h')
-rw-r--r-- | WebCore/dom/ProcessingInstruction.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/dom/ProcessingInstruction.h b/WebCore/dom/ProcessingInstruction.h index 4b7dc86..61af9cf 100644 --- a/WebCore/dom/ProcessingInstruction.h +++ b/WebCore/dom/ProcessingInstruction.h @@ -55,6 +55,14 @@ public: private: ProcessingInstruction(Document*, const String& target, const String& data); +#ifdef ANDROID_INSTRUMENT + // Overridden to resolve the ambiguous + void* operator new(size_t size); + void* operator new[](size_t size); + void operator delete(void* p, size_t size); + void operator delete[](void* p, size_t size); +#endif + virtual String nodeName() const; virtual NodeType nodeType() const; virtual String nodeValue() const; |