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