| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 InjectedScript injectedScript = m_v8DebuggerAgent->injectedScriptForEval(err
orString, executionContextId); | 178 InjectedScript injectedScript = m_v8DebuggerAgent->injectedScriptForEval(err
orString, executionContextId); |
| 179 if (injectedScript.isEmpty()) { | 179 if (injectedScript.isEmpty()) { |
| 180 *errorString = "Inspected frame has gone"; | 180 *errorString = "Inspected frame has gone"; |
| 181 return; | 181 return; |
| 182 } | 182 } |
| 183 ExecutionContext* executionContext = injectedScript.scriptState()->execution
Context(); | 183 ExecutionContext* executionContext = injectedScript.scriptState()->execution
Context(); |
| 184 | 184 |
| 185 String sourceURL = m_compiledScriptURLs.take(scriptId); | 185 String sourceURL = m_compiledScriptURLs.take(scriptId); |
| 186 LocalFrame* frame = toDocument(executionContext)->frame(); | 186 LocalFrame* frame = toDocument(executionContext)->frame(); |
| 187 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition().m_line.oneB
asedInt())); | 187 TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluat
eScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition().m_line.oneB
asedInt())); |
| 188 InspectorInstrumentationCookie cookie; | |
| 189 if (frame) | |
| 190 cookie = InspectorInstrumentation::willEvaluateScript(frame); | |
| 191 | 188 |
| 192 RefPtrWillBeRawPtr<LocalFrame> protect(frame); | 189 RefPtrWillBeRawPtr<LocalFrame> protect(frame); |
| 193 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); | 190 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); |
| 194 | 191 |
| 195 if (frame) | |
| 196 InspectorInstrumentation::didEvaluateScript(cookie); | |
| 197 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); | 192 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); |
| 198 | 193 |
| 199 } | 194 } |
| 200 | 195 |
| 201 } // namespace blink | 196 } // namespace blink |
| OLD | NEW |