| 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "core/timing/MemoryInfo.h" | 31 #include "core/timing/MemoryInfo.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptValue.h" |
| 34 #include "bindings/core/v8/V8ObjectBuilder.h" |
| 33 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 34 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
| 35 #include "platform/RuntimeEnabledFeatures.h" | 37 #include "platform/RuntimeEnabledFeatures.h" |
| 36 #include "wtf/CurrentTime.h" | 38 #include "wtf/CurrentTime.h" |
| 37 #include "wtf/MathExtras.h" | 39 #include "wtf/MathExtras.h" |
| 38 #include "wtf/ThreadSpecific.h" | 40 #include "wtf/ThreadSpecific.h" |
| 39 #include <limits> | 41 #include <limits> |
| 40 #include <v8.h> | 42 #include <v8.h> |
| 41 | 43 |
| 42 namespace blink { | 44 namespace blink { |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 140 } |
| 139 | 141 |
| 140 for (int i = 0; i < numberOfBuckets; ++i) { | 142 for (int i = 0; i < numberOfBuckets; ++i) { |
| 141 if (size <= bucketSizeList[i]) | 143 if (size <= bucketSizeList[i]) |
| 142 return bucketSizeList[i]; | 144 return bucketSizeList[i]; |
| 143 } | 145 } |
| 144 | 146 |
| 145 return bucketSizeList[numberOfBuckets - 1]; | 147 return bucketSizeList[numberOfBuckets - 1]; |
| 146 } | 148 } |
| 147 | 149 |
| 150 ScriptValue MemoryInfo::toJSONForBinding(ScriptState* scriptState) const { |
| 151 V8ObjectBuilder result(scriptState); |
| 152 result.addNumber("totalJSHeapSize", totalJSHeapSize()); |
| 153 result.addNumber("usedJSHeapSize", usedJSHeapSize()); |
| 154 result.addNumber("jsHeapSizeLimit", jsHeapSizeLimit()); |
| 155 return result.scriptValue(); |
| 156 } |
| 157 |
| 148 MemoryInfo::MemoryInfo() { | 158 MemoryInfo::MemoryInfo() { |
| 149 if (RuntimeEnabledFeatures::preciseMemoryInfoEnabled()) | 159 if (RuntimeEnabledFeatures::preciseMemoryInfoEnabled()) |
| 150 getHeapSize(m_info); | 160 getHeapSize(m_info); |
| 151 else | 161 else |
| 152 HeapSizeCache::forCurrentThread().getCachedHeapSize(m_info); | 162 HeapSizeCache::forCurrentThread().getCachedHeapSize(m_info); |
| 153 } | 163 } |
| 154 | 164 |
| 155 } // namespace blink | 165 } // namespace blink |
| OLD | NEW |