Chromium Code Reviews| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 #include "core/inspector/InspectorResourceAgent.h" | 63 #include "core/inspector/InspectorResourceAgent.h" |
| 64 #include "core/inspector/InspectorState.h" | 64 #include "core/inspector/InspectorState.h" |
| 65 #include "core/inspector/InspectorTimelineAgent.h" | 65 #include "core/inspector/InspectorTimelineAgent.h" |
| 66 #include "core/inspector/InspectorWorkerAgent.h" | 66 #include "core/inspector/InspectorWorkerAgent.h" |
| 67 #include "core/inspector/InstrumentingAgents.h" | 67 #include "core/inspector/InstrumentingAgents.h" |
| 68 #include "core/inspector/PageConsoleAgent.h" | 68 #include "core/inspector/PageConsoleAgent.h" |
| 69 #include "core/inspector/PageDebuggerAgent.h" | 69 #include "core/inspector/PageDebuggerAgent.h" |
| 70 #include "core/inspector/PageRuntimeAgent.h" | 70 #include "core/inspector/PageRuntimeAgent.h" |
| 71 #include "core/page/Page.h" | 71 #include "core/page/Page.h" |
| 72 #include "core/platform/PlatformMouseEvent.h" | 72 #include "core/platform/PlatformMouseEvent.h" |
| 73 #include <wtf/MemoryInstrumentationVector.h> | |
|
yurys
2013/06/24 15:00:44
This one should be preserved to provide access to
| |
| 74 #include <wtf/UnusedParam.h> | |
| 75 | 73 |
| 76 namespace WebCore { | 74 namespace WebCore { |
| 77 | 75 |
| 78 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC lient) | 76 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC lient) |
| 79 : m_instrumentingAgents(InstrumentingAgents::create()) | 77 : m_instrumentingAgents(InstrumentingAgents::create()) |
| 80 , m_injectedScriptManager(InjectedScriptManager::createForPage()) | 78 , m_injectedScriptManager(InjectedScriptManager::createForPage()) |
| 81 , m_state(adoptPtr(new InspectorCompositeState(inspectorClient))) | 79 , m_state(adoptPtr(new InspectorCompositeState(inspectorClient))) |
| 82 , m_overlay(InspectorOverlay::create(page, inspectorClient)) | 80 , m_overlay(InspectorOverlay::create(page, inspectorClient)) |
| 83 , m_page(page) | 81 , m_page(page) |
| 84 , m_inspectorClient(inspectorClient) | 82 , m_inspectorClient(inspectorClient) |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 419 } | 417 } |
| 420 | 418 |
| 421 HashMap<String, size_t> InspectorController::processMemoryDistribution() const | 419 HashMap<String, size_t> InspectorController::processMemoryDistribution() const |
| 422 { | 420 { |
| 423 HashMap<String, size_t> memoryInfo; | 421 HashMap<String, size_t> memoryInfo; |
| 424 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); | 422 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); |
| 425 return memoryInfo; | 423 return memoryInfo; |
| 426 } | 424 } |
| 427 | 425 |
| 428 } // namespace WebCore | 426 } // namespace WebCore |
| OLD | NEW |