| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "Frame.h" | 34 #include "Frame.h" |
| 35 #include "ScriptGCEvent.h" | 35 #include "ScriptGCEvent.h" |
| 36 #include "Settings.h" | 36 #include "Settings.h" |
| 37 #include <limits> | 37 #include <limits> |
| 38 #include <wtf/CurrentTime.h> | 38 #include <wtf/CurrentTime.h> |
| 39 #include <wtf/MainThread.h> | 39 #include <wtf/MainThread.h> |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 #if ENABLE(INSPECTOR) | |
| 44 | 43 |
| 45 class HeapSizeCache { | 44 class HeapSizeCache { |
| 46 WTF_MAKE_NONCOPYABLE(HeapSizeCache); WTF_MAKE_FAST_ALLOCATED; | 45 WTF_MAKE_NONCOPYABLE(HeapSizeCache); WTF_MAKE_FAST_ALLOCATED; |
| 47 public: | 46 public: |
| 48 HeapSizeCache() | 47 HeapSizeCache() |
| 49 : m_lastUpdateTime(0) | 48 : m_lastUpdateTime(0) |
| 50 { | 49 { |
| 51 } | 50 } |
| 52 | 51 |
| 53 void getCachedHeapSize(HeapInfo& info) | 52 void getCachedHeapSize(HeapInfo& info) |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 } | 124 } |
| 126 | 125 |
| 127 for (int i = 0; i < numberOfBuckets; ++i) { | 126 for (int i = 0; i < numberOfBuckets; ++i) { |
| 128 if (size <= bucketSizeList[i]) | 127 if (size <= bucketSizeList[i]) |
| 129 return bucketSizeList[i]; | 128 return bucketSizeList[i]; |
| 130 } | 129 } |
| 131 | 130 |
| 132 return bucketSizeList[numberOfBuckets - 1]; | 131 return bucketSizeList[numberOfBuckets - 1]; |
| 133 } | 132 } |
| 134 | 133 |
| 135 #endif | |
| 136 | 134 |
| 137 MemoryInfo::MemoryInfo(Frame* frame) | 135 MemoryInfo::MemoryInfo(Frame* frame) |
| 138 { | 136 { |
| 139 if (!frame || !frame->settings()) | 137 if (!frame || !frame->settings()) |
| 140 return; | 138 return; |
| 141 | 139 |
| 142 #if ENABLE(INSPECTOR) | |
| 143 if (frame->settings()->memoryInfoEnabled()) | 140 if (frame->settings()->memoryInfoEnabled()) |
| 144 ScriptGCEvent::getHeapSize(m_info); | 141 ScriptGCEvent::getHeapSize(m_info); |
| 145 else if (true || frame->settings()->quantizedMemoryInfoEnabled()) { | 142 else if (true || frame->settings()->quantizedMemoryInfoEnabled()) { |
| 146 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); | 143 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); |
| 147 heapSizeCache.getCachedHeapSize(m_info); | 144 heapSizeCache.getCachedHeapSize(m_info); |
| 148 } | 145 } |
| 149 #endif | |
| 150 } | 146 } |
| 151 | 147 |
| 152 } // namespace WebCore | 148 } // namespace WebCore |
| OLD | NEW |