| 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 { | 63 { |
| 64 } | 64 } |
| 65 | 65 |
| 66 PageDebuggerAgent::~PageDebuggerAgent() | 66 PageDebuggerAgent::~PageDebuggerAgent() |
| 67 { | 67 { |
| 68 } | 68 } |
| 69 | 69 |
| 70 DEFINE_TRACE(PageDebuggerAgent) | 70 DEFINE_TRACE(PageDebuggerAgent) |
| 71 { | 71 { |
| 72 visitor->trace(m_inspectedFrames); | 72 visitor->trace(m_inspectedFrames); |
| 73 visitor->trace(m_injectedScriptManager); | |
| 74 InspectorDebuggerAgent::trace(visitor); | 73 InspectorDebuggerAgent::trace(visitor); |
| 75 } | 74 } |
| 76 | 75 |
| 77 bool PageDebuggerAgent::canExecuteScripts() const | 76 bool PageDebuggerAgent::canExecuteScripts() const |
| 78 { | 77 { |
| 79 ScriptController& scriptController = m_inspectedFrames->root()->script(); | 78 ScriptController& scriptController = m_inspectedFrames->root()->script(); |
| 80 return scriptController.canExecuteScripts(NotAboutToExecuteScript); | 79 return scriptController.canExecuteScripts(NotAboutToExecuteScript); |
| 81 } | 80 } |
| 82 | 81 |
| 83 void PageDebuggerAgent::enable(ErrorString* errorString) | 82 void PageDebuggerAgent::enable(ErrorString* errorString) |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 LocalFrame* frame = toDocument(executionContext)->frame(); | 161 LocalFrame* frame = toDocument(executionContext)->frame(); |
| 163 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition())); | 162 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition())); |
| 164 | 163 |
| 165 RefPtrWillBeRawPtr<LocalFrame> protect(frame); | 164 RefPtrWillBeRawPtr<LocalFrame> protect(frame); |
| 166 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); | 165 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); |
| 167 | 166 |
| 168 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); | 167 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); |
| 169 } | 168 } |
| 170 | 169 |
| 171 } // namespace blink | 170 } // namespace blink |
| OLD | NEW |