| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 27 matching lines...) Expand all Loading... |
| 38 #include "Frame.h" | 38 #include "Frame.h" |
| 39 #include "HeapGraphSerializer.h" | 39 #include "HeapGraphSerializer.h" |
| 40 #include "InspectorClient.h" | 40 #include "InspectorClient.h" |
| 41 #include "InspectorDOMStorageAgent.h" | 41 #include "InspectorDOMStorageAgent.h" |
| 42 #include "InspectorFrontend.h" | 42 #include "InspectorFrontend.h" |
| 43 #include "InspectorState.h" | 43 #include "InspectorState.h" |
| 44 #include "InspectorValues.h" | 44 #include "InspectorValues.h" |
| 45 #include "InstrumentingAgents.h" | 45 #include "InstrumentingAgents.h" |
| 46 #include "MemoryCache.h" | 46 #include "MemoryCache.h" |
| 47 #include "MemoryInstrumentationImpl.h" | 47 #include "MemoryInstrumentationImpl.h" |
| 48 #include "MemoryUsageSupport.h" | |
| 49 #include "Node.h" | 48 #include "Node.h" |
| 50 #include "NodeTraversal.h" | 49 #include "NodeTraversal.h" |
| 51 #include "Page.h" | 50 #include "Page.h" |
| 52 #include "ScriptGCEvent.h" | 51 #include "ScriptGCEvent.h" |
| 53 #include "ScriptProfiler.h" | 52 #include "ScriptProfiler.h" |
| 54 #include "StyledElement.h" | 53 #include "StyledElement.h" |
| 54 #include "core/platform/MemoryUsageSupport.h" |
| 55 #include <wtf/ArrayBufferView.h> | 55 #include <wtf/ArrayBufferView.h> |
| 56 #include <wtf/HashSet.h> | 56 #include <wtf/HashSet.h> |
| 57 #include <wtf/MemoryInstrumentationArrayBufferView.h> | 57 #include <wtf/MemoryInstrumentationArrayBufferView.h> |
| 58 #include <wtf/NonCopyingSort.h> | 58 #include <wtf/NonCopyingSort.h> |
| 59 #include <wtf/OwnPtr.h> | 59 #include <wtf/OwnPtr.h> |
| 60 #include <wtf/PassOwnPtr.h> | 60 #include <wtf/PassOwnPtr.h> |
| 61 #include <wtf/Vector.h> | |
| 62 #include <wtf/text/StringBuilder.h> | 61 #include <wtf/text/StringBuilder.h> |
| 63 #include <wtf/text/StringImpl.h> | 62 #include <wtf/text/StringImpl.h> |
| 64 #include <wtf/text/WTFString.h> | 63 #include <wtf/text/WTFString.h> |
| 64 #include <wtf/Vector.h> |
| 65 | 65 |
| 66 // Use a type alias instead of 'using' here which would cause a conflict on Mac. | 66 // Use a type alias instead of 'using' here which would cause a conflict on Mac. |
| 67 typedef WebCore::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock; | 67 typedef WebCore::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock; |
| 68 typedef WebCore::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks; | 68 typedef WebCore::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks; |
| 69 | 69 |
| 70 namespace WebCore { | 70 namespace WebCore { |
| 71 | 71 |
| 72 namespace { | 72 namespace { |
| 73 | 73 |
| 74 class MemoryUsageStatsGenerator { | 74 class MemoryUsageStatsGenerator { |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 m_frontend = frontend->memory(); | 399 m_frontend = frontend->memory(); |
| 400 } | 400 } |
| 401 | 401 |
| 402 void InspectorMemoryAgent::clearFrontend() | 402 void InspectorMemoryAgent::clearFrontend() |
| 403 { | 403 { |
| 404 m_frontend = 0; | 404 m_frontend = 0; |
| 405 } | 405 } |
| 406 | 406 |
| 407 } // namespace WebCore | 407 } // namespace WebCore |
| 408 | 408 |
| OLD | NEW |