| 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 29 matching lines...) Expand all  Loading... | 
|   40 #include "core/inspector/HeapGraphSerializer.h" |   40 #include "core/inspector/HeapGraphSerializer.h" | 
|   41 #include "core/inspector/InspectorClient.h" |   41 #include "core/inspector/InspectorClient.h" | 
|   42 #include "core/inspector/InspectorDOMStorageAgent.h" |   42 #include "core/inspector/InspectorDOMStorageAgent.h" | 
|   43 #include "core/inspector/MemoryInstrumentationImpl.h" |   43 #include "core/inspector/MemoryInstrumentationImpl.h" | 
|   44 #include "core/loader/cache/MemoryCache.h" |   44 #include "core/loader/cache/MemoryCache.h" | 
|   45 #include "core/page/Frame.h" |   45 #include "core/page/Frame.h" | 
|   46 #include "core/page/Page.h" |   46 #include "core/page/Page.h" | 
|   47 #include "core/platform/JSONValues.h" |   47 #include "core/platform/JSONValues.h" | 
|   48 #include "core/platform/MemoryUsageSupport.h" |   48 #include "core/platform/MemoryUsageSupport.h" | 
|   49 #include "wtf/ArrayBufferView.h" |   49 #include "wtf/ArrayBufferView.h" | 
|   50 #include "wtf/HashSet.h" |  | 
|   51 #include "wtf/MemoryInstrumentationArrayBufferView.h" |   50 #include "wtf/MemoryInstrumentationArrayBufferView.h" | 
|   52 #include "wtf/NonCopyingSort.h" |   51 #include "wtf/NonCopyingSort.h" | 
|   53 #include "wtf/OwnPtr.h" |   52 #include "wtf/OwnPtr.h" | 
|   54 #include "wtf/PassOwnPtr.h" |   53 #include "wtf/PassOwnPtr.h" | 
|   55 #include "wtf/Vector.h" |   54 #include "wtf/Vector.h" | 
|   56 #include "wtf/text/StringBuilder.h" |  | 
|   57 #include "wtf/text/StringImpl.h" |   55 #include "wtf/text/StringImpl.h" | 
|   58 #include "wtf/text/WTFString.h" |   56 #include "wtf/text/WTFString.h" | 
|   59  |   57  | 
|   60 // Use a type alias instead of 'using' here which would cause a conflict on Mac. |   58 // Use a type alias instead of 'using' here which would cause a conflict on Mac. | 
|   61 typedef WebCore::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock; |   59 typedef WebCore::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock; | 
|   62 typedef WebCore::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks; |   60 typedef WebCore::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks; | 
|   63  |   61  | 
|   64 namespace WebCore { |   62 namespace WebCore { | 
|   65  |   63  | 
|   66 namespace { |   64 namespace { | 
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  392     m_frontend = frontend->memory(); |  390     m_frontend = frontend->memory(); | 
|  393 } |  391 } | 
|  394  |  392  | 
|  395 void InspectorMemoryAgent::clearFrontend() |  393 void InspectorMemoryAgent::clearFrontend() | 
|  396 { |  394 { | 
|  397     m_frontend = 0; |  395     m_frontend = 0; | 
|  398 } |  396 } | 
|  399  |  397  | 
|  400 } // namespace WebCore |  398 } // namespace WebCore | 
|  401  |  399  | 
| OLD | NEW |