diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp index 599e4cead..31e95eaf0 100644 --- a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp +++ b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp @@ -32,6 +32,7 @@ #include <JavaScriptCore/MemoryStatistics.h> #include <WebCore/JSDOMWindow.h> #include <runtime/JSLock.h> +#include <runtime/Operations.h> #include <string.h> #include <sys/sysinfo.h> #include <wtf/CurrentTime.h> @@ -153,9 +154,8 @@ WebMemoryStatistics WebMemorySampler::sampleWebKit() const appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Fast Malloc Committed Memory"), fastMallocBytesCommitted); #endif -#if USE(JSC) - size_t jscHeapBytesInUse = JSDOMWindow::commonJSGlobalData()->heap.size(); - size_t jscHeapBytesCommitted = JSDOMWindow::commonJSGlobalData()->heap.capacity(); + size_t jscHeapBytesInUse = JSDOMWindow::commonVM()->heap.size(); + size_t jscHeapBytesCommitted = JSDOMWindow::commonVM()->heap.capacity(); totalBytesInUse += jscHeapBytesInUse; totalBytesCommitted += jscHeapBytesCommitted; @@ -168,7 +168,6 @@ WebMemoryStatistics WebMemorySampler::sampleWebKit() const appendKeyValuePair(webKitMemoryStats, ASCIILiteral("JavaScript Stack Bytes"), globalMemoryStats.stackBytes); appendKeyValuePair(webKitMemoryStats, ASCIILiteral("JavaScript JIT Bytes"), globalMemoryStats.JITBytes); -#endif appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Memory In Use"), totalBytesInUse); appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Committed Memory"), totalBytesCommitted); |