Diff
Modified: trunk/Source/WTF/ChangeLog (136598 => 136599)
--- trunk/Source/WTF/ChangeLog 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/ChangeLog 2012-12-05 01:11:04 UTC (rev 136599)
@@ -1,3 +1,38 @@
+2012-12-04 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r136597.
+ http://trac.webkit.org/changeset/136597
+ https://bugs.webkit.org/show_bug.cgi?id=104065
+
+ broke Windows compilation (Requested by yurys on #webkit).
+
+ * wtf/MemoryInstrumentation.cpp:
+ (WTF::MemoryClassInfo::addRawBuffer):
+ * wtf/MemoryInstrumentation.h:
+ (MemoryInstrumentation):
+ (WTF::MemoryInstrumentation::selectInstrumentationMethod):
+ (WTF::MemoryInstrumentation::reportObjectMemoryUsage):
+ (MemoryClassInfo):
+ (WTF::reportMemoryUsage):
+ (WTF::MemoryInstrumentation::addObjectImpl):
+ (WTF):
+ * wtf/MemoryInstrumentationArrayBufferView.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationHashCountedSet.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationHashMap.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationHashSet.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationListHashSet.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationParsedURL.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationString.h:
+ (WTF::reportMemoryUsage):
+ * wtf/MemoryInstrumentationVector.h:
+ (WTF::reportMemoryUsage):
+
2012-12-04 Yury Semikhatsky <yu...@chromium.org>
Web Inspector: simplify reportMemoryUsage signature
Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.cpp (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentation.cpp 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.cpp 2012-12-05 01:11:04 UTC (rev 136599)
@@ -111,7 +111,7 @@
m_objectType = m_memoryObjectInfo->objectType();
}
-void MemoryClassInfo::addRawBuffer(const void* buffer, size_t size, const char* nodeName, const char* edgeName)
+void MemoryClassInfo::addRawBuffer(const void* const& buffer, size_t size, const char* nodeName, const char* edgeName)
{
m_memoryInstrumentation->addRawBuffer(m_memoryObjectInfo->reportedPointer(), buffer, m_objectType, size, nodeName, edgeName);
}
Modified: trunk/Source/WTF/wtf/MemoryInstrumentation.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentation.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentation.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -50,7 +50,7 @@
byReference
};
-template<typename T> void reportMemoryUsage(const T*, MemoryObjectInfo*);
+template<typename T> void reportMemoryUsage(const T* const&, MemoryObjectInfo*);
class MemoryInstrumentationClient {
public:
@@ -108,9 +108,9 @@
WTF_EXPORT_PRIVATE static MemoryObjectType getObjectType(MemoryObjectInfo*);
friend class MemoryClassInfo;
- template<typename T> friend void reportMemoryUsage(const T*, MemoryObjectInfo*);
+ template<typename T> friend void reportMemoryUsage(const T* const&, MemoryObjectInfo*);
- template<typename T> static void selectInstrumentationMethod(const T* object, MemoryObjectInfo* memoryObjectInfo)
+ template<typename T> static void selectInstrumentationMethod(const T* const& object, MemoryObjectInfo* memoryObjectInfo)
{
// If there is reportMemoryUsage method on the object, call it.
// Otherwise count only object's self size.
@@ -119,13 +119,13 @@
template<typename Type, Type Ptr> struct MemberHelperStruct;
template<typename T, typename Type>
- static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, MemberHelperStruct<Type, &T::reportMemoryUsage>*)
+ static void reportObjectMemoryUsage(const T* const& object, MemoryObjectInfo* memoryObjectInfo, MemberHelperStruct<Type, &T::reportMemoryUsage>*)
{
object->reportMemoryUsage(memoryObjectInfo);
}
template<typename T, typename Type>
- static void reportObjectMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo, ...)
+ static void reportObjectMemoryUsage(const T* const& object, MemoryObjectInfo* memoryObjectInfo, ...)
{
callReportObjectInfo(memoryObjectInfo, object, 0, sizeof(T));
}
@@ -168,9 +168,9 @@
}
};
- template<typename T> void addObjectImpl(const T*, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
- template<typename T> void addObjectImpl(const OwnPtr<T>*, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
- template<typename T> void addObjectImpl(const RefPtr<T>*, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
+ template<typename T> void addObjectImpl(const T* const&, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
+ template<typename T> void addObjectImpl(const OwnPtr<T>* const&, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
+ template<typename T> void addObjectImpl(const RefPtr<T>* const&, MemoryObjectInfo*, MemoryOwningType, const char* edgeName);
MemoryInstrumentationClient* m_client;
OwnPtr<MemoryObjectInfo> m_rootObjectInfo;
@@ -191,7 +191,7 @@
{
m_memoryInstrumentation->addObject(member, m_memoryObjectInfo, edgeName);
}
- WTF_EXPORT_PRIVATE void addRawBuffer(const void* buffer, size_t, const char* nodeName = 0, const char* edgeName = 0);
+ WTF_EXPORT_PRIVATE void addRawBuffer(const void* const& buffer, size_t, const char* nodeName = 0, const char* edgeName = 0);
WTF_EXPORT_PRIVATE void addPrivateBuffer(size_t, MemoryObjectType ownerObjectType = 0, const char* nodeName = 0, const char* edgeName = 0);
void addWeakPointer(void*) { }
@@ -205,13 +205,13 @@
};
template<typename T>
-void reportMemoryUsage(const T* object, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const T* const& object, MemoryObjectInfo* memoryObjectInfo)
{
MemoryInstrumentation::selectInstrumentationMethod<T>(object, memoryObjectInfo);
}
template<typename T>
-void MemoryInstrumentation::addObjectImpl(const T* object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
+void MemoryInstrumentation::addObjectImpl(const T* const& object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
{
if (owningType == byReference)
reportMemoryUsage(object, ownerObjectInfo);
@@ -224,7 +224,7 @@
}
template<typename T>
-void MemoryInstrumentation::addObjectImpl(const OwnPtr<T>* object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
+void MemoryInstrumentation::addObjectImpl(const OwnPtr<T>* const& object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
{
if (owningType == byPointer && !visited(object))
countObjectSize(object, getObjectType(ownerObjectInfo), sizeof(*object));
@@ -232,7 +232,7 @@
}
template<typename T>
-void MemoryInstrumentation::addObjectImpl(const RefPtr<T>* object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
+void MemoryInstrumentation::addObjectImpl(const RefPtr<T>* const& object, MemoryObjectInfo* ownerObjectInfo, MemoryOwningType owningType, const char* edgeName)
{
if (owningType == byPointer && !visited(object))
countObjectSize(object, getObjectType(ownerObjectInfo), sizeof(*object));
@@ -255,37 +255,37 @@
// Link time guard for classes with external memory instrumentation.
template<typename T, size_t inlineCapacity> class Vector;
-template<typename T, size_t inlineCapacity> void reportMemoryUsage(const Vector<T, inlineCapacity>*, MemoryObjectInfo*);
+template<typename T, size_t inlineCapacity> void reportMemoryUsage(const Vector<T, inlineCapacity>* const&, MemoryObjectInfo*);
template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> class HashMap;
-template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> void reportMemoryUsage(const HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>*, MemoryObjectInfo*);
+template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> void reportMemoryUsage(const HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>* const&, MemoryObjectInfo*);
template<typename ValueArg, typename HashArg, typename TraitsArg> class HashCountedSet;
-template<typename ValueArg, typename HashArg, typename TraitsArg> void reportMemoryUsage(const HashCountedSet<ValueArg, HashArg, TraitsArg>*, MemoryObjectInfo*);
+template<typename ValueArg, typename HashArg, typename TraitsArg> void reportMemoryUsage(const HashCountedSet<ValueArg, HashArg, TraitsArg>* const&, MemoryObjectInfo*);
template<typename ValueArg, size_t inlineCapacity, typename HashArg> class ListHashSet;
-template<typename ValueArg, size_t inlineCapacity, typename HashArg> void reportMemoryUsage(const ListHashSet<ValueArg, inlineCapacity, HashArg>*, MemoryObjectInfo*);
+template<typename ValueArg, size_t inlineCapacity, typename HashArg> void reportMemoryUsage(const ListHashSet<ValueArg, inlineCapacity, HashArg>* const&, MemoryObjectInfo*);
class String;
-void reportMemoryUsage(const String*, MemoryObjectInfo*);
+void reportMemoryUsage(const String* const&, MemoryObjectInfo*);
class StringImpl;
-void reportMemoryUsage(const StringImpl*, MemoryObjectInfo*);
+void reportMemoryUsage(const StringImpl* const&, MemoryObjectInfo*);
class AtomicString;
-void reportMemoryUsage(const AtomicString*, MemoryObjectInfo*);
+void reportMemoryUsage(const AtomicString* const&, MemoryObjectInfo*);
class CString;
-void reportMemoryUsage(const CString*, MemoryObjectInfo*);
+void reportMemoryUsage(const CString* const&, MemoryObjectInfo*);
class CStringBuffer;
-void reportMemoryUsage(const CStringBuffer*, MemoryObjectInfo*);
+void reportMemoryUsage(const CStringBuffer* const&, MemoryObjectInfo*);
class ParsedURL;
-void reportMemoryUsage(const ParsedURL*, MemoryObjectInfo*);
+void reportMemoryUsage(const ParsedURL* const&, MemoryObjectInfo*);
class URLString;
-void reportMemoryUsage(const URLString*, MemoryObjectInfo*);
+void reportMemoryUsage(const URLString* const&, MemoryObjectInfo*);
} // namespace WTF
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationArrayBufferView.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -36,13 +36,13 @@
namespace WTF {
-inline void reportMemoryUsage(const ArrayBufferView* arrayBufferView, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const ArrayBufferView* const& arrayBufferView, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, arrayBufferView);
info.addMember(arrayBufferView->buffer().get());
}
-inline void reportMemoryUsage(const ArrayBuffer* arrayBuffer, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const ArrayBuffer* const& arrayBuffer, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, arrayBuffer);
info.addRawBuffer(arrayBuffer->data(), arrayBuffer->byteLength());
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,7 +37,7 @@
namespace WTF {
template<typename ValueArg, typename HashArg, typename TraitsArg>
-void reportMemoryUsage(const HashCountedSet<ValueArg, HashArg, TraitsArg>* hashSet, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const HashCountedSet<ValueArg, HashArg, TraitsArg>* const& hashSet, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, hashSet);
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationHashMap.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,7 +37,7 @@
namespace WTF {
template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
-void reportMemoryUsage(const HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>* hashMap, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>* const& hashMap, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, hashMap);
typedef HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg> HashMapType;
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationHashSet.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationHashSet.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationHashSet.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,7 +37,7 @@
namespace WTF {
template<typename ValueArg, typename HashArg, typename TraitsArg>
-void reportMemoryUsage(const HashSet<ValueArg, HashArg, TraitsArg>* hashSet, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const HashSet<ValueArg, HashArg, TraitsArg>* const& hashSet, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, hashSet);
info.addPrivateBuffer(sizeof(typename HashTable<ValueArg, ValueArg, IdentityExtractor, HashArg, TraitsArg, TraitsArg>::ValueType) * hashSet->capacity());
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationListHashSet.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationListHashSet.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationListHashSet.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,7 +37,7 @@
namespace WTF {
template<typename ValueArg, size_t inlineCapacity, typename HashArg>
-void reportMemoryUsage(const ListHashSet<ValueArg, inlineCapacity, HashArg>* set, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const ListHashSet<ValueArg, inlineCapacity, HashArg>* const& set, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, set);
info.addPrivateBuffer(set->sizeInBytes() - sizeof(*set));
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationParsedURL.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationParsedURL.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationParsedURL.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,13 +37,13 @@
namespace WTF {
-inline void reportMemoryUsage(const URLString* urlString, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const URLString* const& urlString, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, urlString);
info.addMember(urlString->string());
}
-inline void reportMemoryUsage(const ParsedURL* parsedURL, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const ParsedURL* const& parsedURL, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, parsedURL);
info.addMember(parsedURL->spec());
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationString.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationString.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationString.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -39,7 +39,7 @@
namespace WTF {
-inline void reportMemoryUsage(const StringImpl* stringImpl, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const StringImpl* const& stringImpl, MemoryObjectInfo* memoryObjectInfo)
{
size_t selfSize = sizeof(StringImpl);
@@ -64,24 +64,24 @@
}
}
-inline void reportMemoryUsage(const String* string, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const String* const& string, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, string);
info.addMember(string->impl());
}
-inline void reportMemoryUsage(const AtomicString* atomicString, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const AtomicString* const& atomicString, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, atomicString);
info.addMember(atomicString->string());
}
-inline void reportMemoryUsage(const CStringBuffer* cStringBuffer, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const CStringBuffer* const& cStringBuffer, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, cStringBuffer, 0, sizeof(*cStringBuffer) + cStringBuffer->length());
}
-inline void reportMemoryUsage(const CString* cString, MemoryObjectInfo* memoryObjectInfo)
+inline void reportMemoryUsage(const CString* const& cString, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, cString);
info.addMember(cString->buffer());
Modified: trunk/Source/WTF/wtf/MemoryInstrumentationVector.h (136598 => 136599)
--- trunk/Source/WTF/wtf/MemoryInstrumentationVector.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WTF/wtf/MemoryInstrumentationVector.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -37,7 +37,7 @@
namespace WTF {
template<typename T, size_t inlineCapacity>
-void reportMemoryUsage(const Vector<T, inlineCapacity>* vector, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const Vector<T, inlineCapacity>* const& vector, MemoryObjectInfo* memoryObjectInfo)
{
MemoryClassInfo info(memoryObjectInfo, vector);
if (inlineCapacity < vector->capacity())
Modified: trunk/Source/WebCore/ChangeLog (136598 => 136599)
--- trunk/Source/WebCore/ChangeLog 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WebCore/ChangeLog 2012-12-05 01:11:04 UTC (rev 136599)
@@ -1,3 +1,16 @@
+2012-12-04 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r136597.
+ http://trac.webkit.org/changeset/136597
+ https://bugs.webkit.org/show_bug.cgi?id=104065
+
+ broke Windows compilation (Requested by yurys on #webkit).
+
+ * platform/graphics/NativeImagePtr.h:
+ (WebCore):
+ * platform/graphics/skia/NativeImageSkia.cpp:
+ (WebCore::reportMemoryUsage):
+
2012-12-04 Yury Semikhatsky <yu...@chromium.org>
Web Inspector: simplify reportMemoryUsage signature
Modified: trunk/Source/WebCore/platform/graphics/NativeImagePtr.h (136598 => 136599)
--- trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WebCore/platform/graphics/NativeImagePtr.h 2012-12-05 01:11:04 UTC (rev 136599)
@@ -73,7 +73,7 @@
typedef WebCore::NativeImageCairo* NativeImagePtr;
#elif USE(SKIA)
typedef WebCore::NativeImageSkia* NativeImagePtr;
-void reportMemoryUsage(const NativeImageSkia*, WTF::MemoryObjectInfo*);
+void reportMemoryUsage(const NativeImageSkia* const&, WTF::MemoryObjectInfo*);
#elif OS(WINCE)
typedef RefPtr<SharedBitmap> NativeImagePtr;
#elif PLATFORM(BLACKBERRY)
Modified: trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp (136598 => 136599)
--- trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp 2012-12-05 01:05:53 UTC (rev 136598)
+++ trunk/Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp 2012-12-05 01:11:04 UTC (rev 136599)
@@ -183,7 +183,7 @@
info.addMember(m_resizedImage);
}
-void reportMemoryUsage(const NativeImageSkia* image, MemoryObjectInfo* memoryObjectInfo)
+void reportMemoryUsage(const NativeImageSkia* const& image, MemoryObjectInfo* memoryObjectInfo)
{
image->reportMemoryUsage(memoryObjectInfo);
}
