diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
| commit | 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch) | |
| tree | 8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WTF/wtf/text/StringImpl.cpp | |
| parent | 33b26980cb24288b5a9f2590ccf32a949281bb79 (diff) | |
| download | qtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz | |
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WTF/wtf/text/StringImpl.cpp')
| -rw-r--r-- | Source/WTF/wtf/text/StringImpl.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/Source/WTF/wtf/text/StringImpl.cpp b/Source/WTF/wtf/text/StringImpl.cpp index c06a966e7..a29263218 100644 --- a/Source/WTF/wtf/text/StringImpl.cpp +++ b/Source/WTF/wtf/text/StringImpl.cpp @@ -28,7 +28,6 @@ #include "AtomicString.h" #include "StringBuffer.h" #include "StringHash.h" -#include <wtf/MemoryInstrumentation.h> #include <wtf/StdLibExtras.h> #include <wtf/WTFThreadData.h> #include <wtf/unicode/CharacterNames.h> @@ -1792,24 +1791,4 @@ size_t StringImpl::sizeInBytes() const return size + sizeof(*this); } -void StringImpl::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const -{ - size_t selfSize = sizeof(StringImpl); - - // Count size used by internal buffer but skip strings that were constructed from literals. - if ((m_hashAndFlags & BufferInternal) && !hasTerminatingNullCharacter()) - // Three cases are covered here: - // 1) a normal 8-bit string with internal storage (BufferInternal) - // 2) a normal 16-bit string with internal storage (BufferInternal) - // 3) empty unique string with length = 0 (BufferInternal) - selfSize += m_length * (m_hashAndFlags & s_hashFlag8BitBuffer ? sizeof(LChar) : sizeof(UChar)); - - MemoryClassInfo info(memoryObjectInfo, this, 0, selfSize); - - if (m_hashAndFlags & BufferSubstring) - info.addMember(m_substringBuffer); - else if (m_hashAndFlags & s_hashFlagHas16BitShadow) // Substring never has its own shadow. - info.addRawBuffer(m_copyData16, (m_length + (hasTerminatingNullCharacter() ? 1 : 0)) * sizeof(UChar)); -} - } // namespace WTF |