diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-05-26 10:43:12 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-05-26 10:43:12 -0700 |
| commit | 9c5d29908efab71c0c545f5fdeff610e2fd4573c (patch) | |
| tree | fecf2e219c2d56f2996a76c53e9d5aaf213cd924 /WebCore/html | |
| parent | 61f4e2b44e5fee639fb4e97b6d54acfa313925f7 (diff) | |
| download | external_webkit-9c5d29908efab71c0c545f5fdeff610e2fd4573c.zip external_webkit-9c5d29908efab71c0c545f5fdeff610e2fd4573c.tar.gz external_webkit-9c5d29908efab71c0c545f5fdeff610e2fd4573c.tar.bz2 | |
Choose right operator new/delete in case of multiple inheritance.
Change-Id: I5ae0c7ad9e06021a8149b5b70fdb20a0f0a8f4d8
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLCanvasElement.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/WebCore/html/HTMLCanvasElement.h b/WebCore/html/HTMLCanvasElement.h index b2a76a1..1968ed6 100644 --- a/WebCore/html/HTMLCanvasElement.h +++ b/WebCore/html/HTMLCanvasElement.h @@ -88,6 +88,22 @@ public: bool is3D() const; #endif +#ifdef ANDROID_INSTRUMENT + void* operator new(size_t size) { + return HTMLElement::operator new(size); + } + void* operator new[](size_t size) { + return HTMLElement::operator new[](size); + } + + void operator delete(void* p, size_t size) { + return HTMLElement::operator delete(p, size); + } + void operator delete[](void* p, size_t size) { + return HTMLElement::operator delete[](p, size); + } +#endif + private: #if ENABLE(DASHBOARD_SUPPORT) virtual HTMLTagStatus endTagRequirement() const; |