summaryrefslogtreecommitdiffstats
path: root/WebCore/css/StyleBase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/css/StyleBase.cpp')
-rw-r--r--WebCore/css/StyleBase.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/WebCore/css/StyleBase.cpp b/WebCore/css/StyleBase.cpp
index 4d5c9c8..23a60ee 100644
--- a/WebCore/css/StyleBase.cpp
+++ b/WebCore/css/StyleBase.cpp
@@ -57,7 +57,7 @@ KURL StyleBase::baseURL() const
if (!sheet)
return KURL();
if (!sheet->href().isNull())
- return KURL(sheet->href());
+ return KURL(ParsedURLString, sheet->href());
if (sheet->parent())
return sheet->parent()->baseURL();
if (!sheet->ownerNode())
@@ -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()