diff options
Diffstat (limited to 'WebCore/page/MemoryInfo.cpp')
| -rw-r--r-- | WebCore/page/MemoryInfo.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/page/MemoryInfo.cpp b/WebCore/page/MemoryInfo.cpp index 010a19c..c2247b9 100644 --- a/WebCore/page/MemoryInfo.cpp +++ b/WebCore/page/MemoryInfo.cpp @@ -31,17 +31,21 @@ #include "config.h" #include "MemoryInfo.h" +#include "Frame.h" #include "ScriptGCEvent.h" +#include "Settings.h" namespace WebCore { -MemoryInfo::MemoryInfo() +MemoryInfo::MemoryInfo(Frame* frame) : m_totalJSHeapSize(0), m_usedJSHeapSize(0) { + if (frame && frame->settings() && frame->settings()->memoryInfoEnabled()) { #if ENABLE(INSPECTOR) - ScriptGCEvent::getHeapSize(m_usedJSHeapSize, m_totalJSHeapSize); + ScriptGCEvent::getHeapSize(m_usedJSHeapSize, m_totalJSHeapSize); #endif + } } } // namespace WebCore |