From 47300b36ce11d38290d3933277fc9906493505d4 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Tue, 27 Oct 2009 23:38:13 -0700
Subject: fix instrumentation. The new WebKit has CachedResourceClient derived
 from FastAllocBase which has overload operator new. So we need to override it
 again to avoid ambiguous.

---
 WebCore/html/HTMLDocument.cpp    | 22 ++++++++++++++++++++++
 WebCore/html/HTMLDocument.h      |  8 ++++++++
 WebCore/html/HTMLLinkElement.cpp | 22 ++++++++++++++++++++++
 WebCore/html/HTMLLinkElement.h   |  8 ++++++++
 4 files changed, 60 insertions(+)

(limited to 'WebCore/html')

diff --git a/WebCore/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp
index fd939c8..d00fc6c 100644
--- a/WebCore/html/HTMLDocument.cpp
+++ b/WebCore/html/HTMLDocument.cpp
@@ -416,4 +416,26 @@ bool HTMLDocument::isFrameSet() const
     return bodyElement && bodyElement->renderer() && bodyElement->hasTagName(framesetTag);
 }
 
+#ifdef ANDROID_INSTRUMENT
+void* HTMLDocument::operator new(size_t size)
+{
+    return Node::operator new(size);
+}
+
+void* HTMLDocument::operator new[](size_t size)
+{
+    return Node::operator new[](size);
+}
+
+void HTMLDocument::operator delete(void* p, size_t size)
+{
+    Node::operator delete(p, size);
+}
+
+void HTMLDocument::operator delete[](void* p, size_t size)
+{
+    Node::operator delete[](p, size);
+}
+#endif
+
 }
diff --git a/WebCore/html/HTMLDocument.h b/WebCore/html/HTMLDocument.h
index 4b14d0c..f4bdaec 100644
--- a/WebCore/html/HTMLDocument.h
+++ b/WebCore/html/HTMLDocument.h
@@ -82,6 +82,14 @@ public:
 protected:
     HTMLDocument(Frame*);
 
+#ifdef ANDROID_INSTRUMENT
+    // Overridden to resolve the ambiguous
+    void* operator new(size_t size);
+    void* operator new[](size_t size);
+    void operator delete(void* p, size_t size);
+    void operator delete[](void* p, size_t size);
+#endif
+
 private:
     virtual bool childAllowed(Node*);
 
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index 57b0b5d..47bcca8 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -453,4 +453,26 @@ void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
         styleSheet->addSubresourceStyleURLs(urls);
 }
 
+#ifdef ANDROID_INSTRUMENT
+void* HTMLLinkElement::operator new(size_t size)
+{
+    return Node::operator new(size);
+}
+
+void* HTMLLinkElement::operator new[](size_t size)
+{
+    return Node::operator new[](size);
+}
+
+void HTMLLinkElement::operator delete(void* p, size_t size)
+{
+    Node::operator delete(p, size);
+}
+
+void HTMLLinkElement::operator delete[](void* p, size_t size)
+{
+    Node::operator delete[](p, size);
+}
+#endif
+
 }
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index cc597ea..e1b5171 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -103,6 +103,14 @@ public:
 
     virtual void finishParsingChildren();
 
+#ifdef ANDROID_INSTRUMENT
+    // Overridden to resolve the ambiguous
+    void* operator new(size_t size);
+    void* operator new[](size_t size);
+    void operator delete(void* p, size_t size);
+    void operator delete[](void* p, size_t size);
+#endif
+
 protected:
     CachedResourceHandle<CachedCSSStyleSheet> m_cachedSheet;
     RefPtr<CSSStyleSheet> m_sheet;
-- 
cgit v1.1