Merge "Choose correct new/delete in case of multiple inheritance."

2 files changed, 32 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();
 
diff --git a/WebCore/xml/XSLImportRule.h b/WebCore/xml/XSLImportRule.h
index f3a9318..f00d05d 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);