| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/inspector/InspectorProfilerAgent.h" | 31 #include "core/inspector/InspectorProfilerAgent.h" |
| 32 | 32 |
| 33 #include "InspectorFrontend.h" | 33 #include "InspectorFrontend.h" |
| 34 #include "bindings/v8/PageScriptDebugServer.h" | |
| 35 #include "bindings/v8/ScriptObject.h" | |
| 36 #include "bindings/v8/ScriptProfiler.h" | 34 #include "bindings/v8/ScriptProfiler.h" |
| 37 #include "bindings/v8/WorkerScriptDebugServer.h" | |
| 38 #include "core/dom/WebCoreMemoryInstrumentation.h" | 35 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 39 #include "core/inspector/ConsoleAPITypes.h" | 36 #include "core/inspector/ConsoleAPITypes.h" |
| 40 #include "core/inspector/InjectedScript.h" | 37 #include "core/inspector/InjectedScript.h" |
| 41 #include "core/inspector/InjectedScriptHost.h" | 38 #include "core/inspector/InjectedScriptHost.h" |
| 42 #include "core/inspector/InspectorConsoleAgent.h" | 39 #include "core/inspector/InspectorConsoleAgent.h" |
| 43 #include "core/inspector/InspectorState.h" | 40 #include "core/inspector/InspectorState.h" |
| 44 #include "core/inspector/InstrumentingAgents.h" | 41 #include "core/inspector/InstrumentingAgents.h" |
| 45 #include "core/inspector/ScriptCallStack.h" | 42 #include "core/inspector/ScriptCallStack.h" |
| 46 #include "core/inspector/ScriptProfile.h" | 43 #include "core/inspector/ScriptProfile.h" |
| 47 #include "core/page/Console.h" | |
| 48 #include "core/page/ConsoleTypes.h" | 44 #include "core/page/ConsoleTypes.h" |
| 49 #include "core/page/Page.h" | |
| 50 #include "core/platform/JSONValues.h" | |
| 51 #include "wtf/CurrentTime.h" | 45 #include "wtf/CurrentTime.h" |
| 52 #include "wtf/MemoryInstrumentationHashMap.h" | 46 #include "wtf/MemoryInstrumentationHashMap.h" |
| 53 #include "wtf/OwnPtr.h" | |
| 54 #include "wtf/text/StringConcatenate.h" | 47 #include "wtf/text/StringConcatenate.h" |
| 55 | 48 |
| 56 namespace WebCore { | 49 namespace WebCore { |
| 57 | 50 |
| 58 namespace ProfilerAgentState { | 51 namespace ProfilerAgentState { |
| 59 static const char userInitiatedProfiling[] = "userInitiatedProfiling"; | 52 static const char userInitiatedProfiling[] = "userInitiatedProfiling"; |
| 60 static const char profilerEnabled[] = "profilerEnabled"; | 53 static const char profilerEnabled[] = "profilerEnabled"; |
| 61 static const char profileHeadersRequested[] = "profileHeadersRequested"; | 54 static const char profileHeadersRequested[] = "profileHeadersRequested"; |
| 62 } | 55 } |
| 63 | 56 |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 | 293 |
| 301 void InspectorProfilerAgent::didProcessTask() | 294 void InspectorProfilerAgent::didProcessTask() |
| 302 { | 295 { |
| 303 if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size()) | 296 if (!m_profileNameIdleTimeMap || !m_profileNameIdleTimeMap->size()) |
| 304 return; | 297 return; |
| 305 m_previousTaskEndTime = WTF::monotonicallyIncreasingTime(); | 298 m_previousTaskEndTime = WTF::monotonicallyIncreasingTime(); |
| 306 } | 299 } |
| 307 | 300 |
| 308 } // namespace WebCore | 301 } // namespace WebCore |
| 309 | 302 |
| OLD | NEW |