OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
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 "config.h" | 31 #include "config.h" |
32 #include "MemoryUsageSupport.h" | 32 #include "core/platform/MemoryUsageSupport.h" |
33 | 33 |
34 #include <SkGraphics.h> | 34 #include <SkGraphics.h> |
35 #include <public/Platform.h> | 35 #include <public/Platform.h> |
36 #include <wtf/OwnPtr.h> | 36 #include <wtf/OwnPtr.h> |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 int MemoryUsageSupport::memoryUsageMB() | 40 int MemoryUsageSupport::memoryUsageMB() |
41 { | 41 { |
42 return WebKit::Platform::current()->memoryUsageMB(); | 42 return WebKit::Platform::current()->memoryUsageMB(); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>& componen
ts) | 87 void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>& componen
ts) |
88 { | 88 { |
89 size_t size = SkGraphics::GetFontCacheUsed(); | 89 size_t size = SkGraphics::GetFontCacheUsed(); |
90 components.append(ComponentInfo("GlyphCache", size)); | 90 components.append(ComponentInfo("GlyphCache", size)); |
91 | 91 |
92 if (WebKit::Platform::current()->memoryAllocatorWasteInBytes(&size)) | 92 if (WebKit::Platform::current()->memoryAllocatorWasteInBytes(&size)) |
93 components.append(ComponentInfo("MallocWaste", size)); | 93 components.append(ComponentInfo("MallocWaste", size)); |
94 } | 94 } |
95 | 95 |
96 } // namespace WebCore | 96 } // namespace WebCore |
OLD | NEW |