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 18 matching lines...) Expand all Loading... |
29 */ | 29 */ |
30 | 30 |
31 #include "core/inspector/PageDebuggerAgent.h" | 31 #include "core/inspector/PageDebuggerAgent.h" |
32 | 32 |
33 #include "bindings/core/v8/DOMWrapperWorld.h" | 33 #include "bindings/core/v8/DOMWrapperWorld.h" |
34 #include "bindings/core/v8/ScriptController.h" | 34 #include "bindings/core/v8/ScriptController.h" |
35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
36 #include "core/frame/FrameConsole.h" | 36 #include "core/frame/FrameConsole.h" |
37 #include "core/frame/LocalFrame.h" | 37 #include "core/frame/LocalFrame.h" |
38 #include "core/inspector/AsyncCallTracker.h" | 38 #include "core/inspector/AsyncCallTracker.h" |
39 #include "core/inspector/InjectedScript.h" | |
40 #include "core/inspector/InspectedFrames.h" | 39 #include "core/inspector/InspectedFrames.h" |
41 #include "core/inspector/InspectorInstrumentation.h" | 40 #include "core/inspector/InspectorInstrumentation.h" |
42 #include "core/inspector/InspectorTraceEvents.h" | 41 #include "core/inspector/InspectorTraceEvents.h" |
43 #include "core/inspector/InstrumentingAgents.h" | 42 #include "core/inspector/InstrumentingAgents.h" |
44 #include "core/inspector/MainThreadDebugger.h" | 43 #include "core/inspector/MainThreadDebugger.h" |
| 44 #include "core/inspector/v8/InjectedScript.h" |
45 #include "core/loader/DocumentLoader.h" | 45 #include "core/loader/DocumentLoader.h" |
46 #include "core/page/Page.h" | 46 #include "core/page/Page.h" |
47 | 47 |
48 using blink::TypeBuilder::Debugger::ExceptionDetails; | 48 using blink::TypeBuilder::Debugger::ExceptionDetails; |
49 using blink::TypeBuilder::Debugger::ScriptId; | 49 using blink::TypeBuilder::Debugger::ScriptId; |
50 using blink::TypeBuilder::Runtime::RemoteObject; | 50 using blink::TypeBuilder::Runtime::RemoteObject; |
51 | 51 |
52 namespace blink { | 52 namespace blink { |
53 | 53 |
54 PassOwnPtrWillBeRawPtr<PageDebuggerAgent> PageDebuggerAgent::create(MainThreadDe
bugger* mainThreadDebugger, InspectedFrames* inspectedFrames, InjectedScriptMana
ger* injectedScriptManager) | 54 PassOwnPtrWillBeRawPtr<PageDebuggerAgent> PageDebuggerAgent::create(MainThreadDe
bugger* mainThreadDebugger, InspectedFrames* inspectedFrames, InjectedScriptMana
ger* injectedScriptManager) |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 LocalFrame* frame = toDocument(executionContext)->frame(); | 172 LocalFrame* frame = toDocument(executionContext)->frame(); |
173 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition())); | 173 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition())); |
174 | 174 |
175 RefPtrWillBeRawPtr<LocalFrame> protect(frame); | 175 RefPtrWillBeRawPtr<LocalFrame> protect(frame); |
176 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); | 176 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); |
177 | 177 |
178 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); | 178 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); |
179 } | 179 } |
180 | 180 |
181 } // namespace blink | 181 } // namespace blink |
OLD | NEW |