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

1 files changed, 16 insertions, 0 deletions

diff --git a/WebCore/svg/SVGFontFaceUriElement.h b/WebCore/svg/SVGFontFaceUriElement.h
index 1d880e5..5f9d219 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();