| 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 15 matching lines...) Expand all Loading... |
| 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 "core/platform/MemoryUsageSupport.h" | 32 #include "core/platform/MemoryUsageSupport.h" |
| 33 | 33 |
| 34 #include <SkGraphics.h> | 34 #include <SkGraphics.h> |
| 35 #include "public/platform/Platform.h" | 35 #include "public/platform/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(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 int MemoryUsageSupport::actualMemoryUsageMB() | 45 int MemoryUsageSupport::actualMemoryUsageMB() |
| 46 { | 46 { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 63 m_callback->dataReceived(privateBytes, sharedBytes); | 63 m_callback->dataReceived(privateBytes, sharedBytes); |
| 64 } | 64 } |
| 65 private: | 65 private: |
| 66 OwnPtr<WebCore::MemoryUsageSupport::ProcessMemorySizesCallback> m_callba
ck; | 66 OwnPtr<WebCore::MemoryUsageSupport::ProcessMemorySizesCallback> m_callba
ck; |
| 67 }; | 67 }; |
| 68 WebKit::Platform::ProcessMemorySizesCallback* callback = new ProcessMemorySi
zesCallbackImpl(requestCallback); | 68 WebKit::Platform::ProcessMemorySizesCallback* callback = new ProcessMemorySi
zesCallbackImpl(requestCallback); |
| 69 WebKit::Platform::current()->requestProcessMemorySizes(callback); | 69 WebKit::Platform::current()->requestProcessMemorySizes(callback); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace WebCore | 72 } // namespace WebCore |
| OLD | NEW |