summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/css/CSSImportRule.cpp22
-rw-r--r--WebCore/css/CSSImportRule.h8
-rw-r--r--WebCore/css/StyleBase.cpp24
-rw-r--r--WebCore/css/StyleBase.h6
-rw-r--r--WebCore/dom/Node.cpp24
-rw-r--r--WebCore/dom/Node.h6
-rw-r--r--WebCore/dom/ProcessingInstruction.cpp22
-rw-r--r--WebCore/dom/ProcessingInstruction.h8
-rw-r--r--WebCore/html/HTMLDocument.cpp22
-rw-r--r--WebCore/html/HTMLDocument.h8
-rw-r--r--WebCore/html/HTMLLinkElement.cpp22
-rw-r--r--WebCore/html/HTMLLinkElement.h8
12 files changed, 164 insertions, 16 deletions
diff --git a/WebCore/css/CSSImportRule.cpp b/WebCore/css/CSSImportRule.cpp
index 6e62f6d..2fe7abf 100644
--- a/WebCore/css/CSSImportRule.cpp
+++ b/WebCore/css/CSSImportRule.cpp
@@ -147,4 +147,26 @@ void CSSImportRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
addSubresourceURL(urls, m_styleSheet->baseURL());
}
+#ifdef ANDROID_INSTRUMENT
+void* CSSImportRule::operator new(size_t size)
+{
+ return StyleBase::operator new(size);
+}
+
+void* CSSImportRule::operator new[](size_t size)
+{
+ return StyleBase::operator new[](size);
+}
+
+void CSSImportRule::operator delete(void* p, size_t size)
+{
+ StyleBase::operator delete(p, size);
+}
+
+void CSSImportRule::operator delete[](void* p, size_t size)
+{
+ StyleBase::operator delete[](p, size);
+}
+#endif
+
} // namespace WebCore
diff --git a/WebCore/css/CSSImportRule.h b/WebCore/css/CSSImportRule.h
index f546006..c58088c 100644
--- a/WebCore/css/CSSImportRule.h
+++ b/WebCore/css/CSSImportRule.h
@@ -65,6 +65,14 @@ private:
// from CachedResourceClient
virtual void setCSSStyleSheet(const String& url, const String& charset, const CachedCSSStyleSheet*);
+#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
+
String m_strHref;
RefPtr<MediaList> m_lstMedia;
RefPtr<CSSStyleSheet> m_styleSheet;
diff --git a/WebCore/css/StyleBase.cpp b/WebCore/css/StyleBase.cpp
index aaa7626..23a60ee 100644
--- a/WebCore/css/StyleBase.cpp
+++ b/WebCore/css/StyleBase.cpp
@@ -68,16 +68,28 @@ KURL StyleBase::baseURL() const
#ifdef ANDROID_INSTRUMENT
static size_t styleSize = 0;
-void* StyleBase::operator new(size_t s) throw()
+void* StyleBase::operator new(size_t size)
{
- styleSize += s;
- return ::operator new(s);
+ styleSize += size;
+ return ::operator new(size);
}
-void StyleBase::operator delete(void* ptr, size_t s)
+void* StyleBase::operator new[](size_t size)
{
- styleSize -= s;
- ::operator delete(ptr);
+ styleSize += size;
+ return ::operator new[](size);
+}
+
+void StyleBase::operator delete(void* p, size_t size)
+{
+ styleSize -= size;
+ ::operator delete(p);
+}
+
+void StyleBase::operator delete[](void* p, size_t size)
+{
+ styleSize -= size;
+ ::operator delete[](p);
}
size_t StyleBase::reportStyleSize()
diff --git a/WebCore/css/StyleBase.h b/WebCore/css/StyleBase.h
index a1660ab..5f9124d 100644
--- a/WebCore/css/StyleBase.h
+++ b/WebCore/css/StyleBase.h
@@ -74,10 +74,12 @@ namespace WebCore {
#ifdef ANDROID_INSTRUMENT
// Overridden to prevent the normal new from being called.
- void* operator new(size_t) throw();
+ void* operator new(size_t size);
+ void* operator new[](size_t size);
// Overridden to prevent the normal delete from being called.
- void operator delete(void*, size_t);
+ void operator delete(void* p, size_t size);
+ void operator delete[](void* p, size_t size);
static size_t reportStyleSize();
#endif
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index c1861cc..4b91a40 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -2333,16 +2333,28 @@ ContainerNode* Node::eventParentNode()
#ifdef ANDROID_INSTRUMENT
static size_t nodeSize = 0;
-void* Node::operator new(size_t s) throw()
+void* Node::operator new(size_t size)
{
- nodeSize += s;
- return ::operator new(s);
+ nodeSize += size;
+ return ::operator new(size);
}
-void Node::operator delete(void* ptr, size_t s)
+void* Node::operator new[](size_t size)
{
- nodeSize -= s;
- ::operator delete(ptr);
+ nodeSize += size;
+ return ::operator new[](size);
+}
+
+void Node::operator delete(void* p, size_t size)
+{
+ nodeSize -= size;
+ ::operator delete(p);
+}
+
+void Node::operator delete[](void* p, size_t size)
+{
+ nodeSize -= size;
+ ::operator delete[](p);
}
size_t Node::reportDOMNodesSize()
diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h
index 8a4c264..082ab16 100644
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -513,10 +513,12 @@ public:
#ifdef ANDROID_INSTRUMENT
// Overridden to prevent the normal new from being called.
- void* operator new(size_t) throw();
+ void* operator new(size_t size);
+ void* operator new[](size_t size);
// Overridden to prevent the normal delete from being called.
- void operator delete(void*, size_t);
+ void operator delete(void* p, size_t size);
+ void operator delete[](void* p, size_t size);
static size_t reportDOMNodesSize();
#endif
diff --git a/WebCore/dom/ProcessingInstruction.cpp b/WebCore/dom/ProcessingInstruction.cpp
index 72993dd..8a94864 100644
--- a/WebCore/dom/ProcessingInstruction.cpp
+++ b/WebCore/dom/ProcessingInstruction.cpp
@@ -280,4 +280,26 @@ void ProcessingInstruction::finishParsingChildren()
ContainerNode::finishParsingChildren();
}
+#ifdef ANDROID_INSTRUMENT
+void* ProcessingInstruction::operator new(size_t size)
+{
+ return Node::operator new(size);
+}
+
+void* ProcessingInstruction::operator new[](size_t size)
+{
+ return Node::operator new[](size);
+}
+
+void ProcessingInstruction::operator delete(void* p, size_t size)
+{
+ Node::operator delete(p, size);
+}
+
+void ProcessingInstruction::operator delete[](void* p, size_t size)
+{
+ Node::operator delete[](p, size);
+}
+#endif
+
} // namespace
diff --git a/WebCore/dom/ProcessingInstruction.h b/WebCore/dom/ProcessingInstruction.h
index 4b7dc86..61af9cf 100644
--- a/WebCore/dom/ProcessingInstruction.h
+++ b/WebCore/dom/ProcessingInstruction.h
@@ -55,6 +55,14 @@ public:
private:
ProcessingInstruction(Document*, const String& target, const String& data);
+#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
+
virtual String nodeName() const;
virtual NodeType nodeType() const;
virtual String nodeValue() const;
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;
generated by cgit v1.1 at 2025-05-19 00:21:09 +0000