| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 return bucketSizeList[numberOfBuckets - 1]; | 130 return bucketSizeList[numberOfBuckets - 1]; |
| 131 } | 131 } |
| 132 | 132 |
| 133 | 133 |
| 134 MemoryInfo::MemoryInfo(LocalFrame* frame) | 134 MemoryInfo::MemoryInfo(LocalFrame* frame) |
| 135 { | 135 { |
| 136 ScriptWrappable::init(this); | 136 ScriptWrappable::init(this); |
| 137 if (!frame || !frame->settings()) | 137 if (!frame || !frame->settings()) |
| 138 return; | 138 return; |
| 139 | 139 |
| 140 if (frame->settings()->memoryInfoEnabled()) { | 140 if (frame->settings()->preciseMemoryInfoEnabled()) { |
| 141 ScriptGCEvent::getHeapSize(m_info); | 141 ScriptGCEvent::getHeapSize(m_info); |
| 142 } else { | 142 } else { |
| 143 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); | 143 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); |
| 144 heapSizeCache.getCachedHeapSize(m_info); | 144 heapSizeCache.getCachedHeapSize(m_info); |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace WebCore | 148 } // namespace WebCore |
| OLD | NEW |