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/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);