From 9f91dd338061945b0999e93d3c34d214f5b2f3db Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Fri, 7 May 2010 13:17:34 -0700 Subject: [PATCH] Choose correct new/delete in case of multiple inheritance. The compilation issue happens when android webcore instrumentation is turned on. issue: 2582105 Change-Id: I403b43c69a0561ee52baf4265831dca185264ced --- WebCore/svg/SVGFontFaceUriElement.h | 16 ++++++++++++++++ WebCore/xml/XSLImportRule.h | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/WebCore/svg/SVGFontFaceUriElement.h b/WebCore/svg/SVGFontFaceUriElement.h index 1d880e556..5f9d2193a 100644 --- a/WebCore/svg/SVGFontFaceUriElement.h +++ b/WebCore/svg/SVGFontFaceUriElement.h @@ -41,6 +41,22 @@ namespace WebCore { virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0); virtual void insertedIntoDocument(); +#ifdef ANDROID_INSTRUMENT + void* operator new(size_t size) { + return SVGElement::operator new(size); + } + void* operator new[](size_t size) { + return SVGElement::operator new[](size); + } + + void operator delete(void* p, size_t size) { + return SVGElement::operator delete(p, size); + } + void operator delete[](void* p, size_t size) { + return SVGElement::operator delete[](p, size); + } +#endif + private: void loadFont(); diff --git a/WebCore/xml/XSLImportRule.h b/WebCore/xml/XSLImportRule.h index f3a931867..f00d05dab 100644 --- a/WebCore/xml/XSLImportRule.h +++ b/WebCore/xml/XSLImportRule.h @@ -51,6 +51,22 @@ public: bool isLoading(); void loadSheet(); +#ifdef ANDROID_INSTRUMENT + void* operator new(size_t size) { + return StyleBase::operator new(size); + } + void* operator new[](size_t size) { + return StyleBase::operator new[](size); + } + + void operator delete(void* p, size_t size) { + return StyleBase::operator delete(p, size); + } + void operator delete[](void* p, size_t size) { + return StyleBase::operator delete[](p, size); + } +#endif + private: XSLImportRule(XSLStyleSheet* parentSheet, const String& href); -- 2.11.0