Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1085)

Side by Side Diff: Source/core/inspector/PageDebuggerAgent.cpp

Issue 1307363006: DevTools: move instrumentation of v8 calls into V8ScriptRunner (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merged willCall and willEvaluate on V8DebuggerAgent Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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; 188 InspectorInstrumentation::willEvaluateScript(executionContext);
dgozman 2015/08/29 00:04:39 Remove this.
yurys 2015/08/29 00:14:24 Done.
189 if (frame)
190 cookie = InspectorInstrumentation::willEvaluateScript(frame);
191 189
192 RefPtrWillBeRawPtr<LocalFrame> protect(frame); 190 RefPtrWillBeRawPtr<LocalFrame> protect(frame);
193 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); 191 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails);
194 192
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( )); 193 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data( ));
198 194
199 } 195 }
200 196
201 } // namespace blink 197 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698