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

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

Issue 1240373002: Revert of [DevTools] Remove edited scripts from debugger agent, move knowledge to frontend. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 170
171 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) 171 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
172 { 172 {
173 // FIXME: what about nested objects? 173 // FIXME: what about nested objects?
174 if (frame != m_pageAgent->inspectedFrame()) 174 if (frame != m_pageAgent->inspectedFrame())
175 return; 175 return;
176 reset(); 176 reset();
177 } 177 }
178 178
179 void PageDebuggerAgent::didCommitLoadForLocalFrame(LocalFrame*)
180 {
181 resetModifiedSources();
182 }
183
179 void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& ex pression, const String& sourceURL, bool persistScript, const int* executionConte xtId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>& exce ptionDetails) 184 void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& ex pression, const String& sourceURL, bool persistScript, const int* executionConte xtId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>& exce ptionDetails)
180 { 185 {
181 InjectedScript injectedScript = injectedScriptForEval(errorString, execution ContextId); 186 InjectedScript injectedScript = injectedScriptForEval(errorString, execution ContextId);
182 if (injectedScript.isEmpty()) { 187 if (injectedScript.isEmpty()) {
183 *errorString = "Inspected frame has gone"; 188 *errorString = "Inspected frame has gone";
184 return; 189 return;
185 } 190 }
186 ExecutionContext* executionContext = injectedScript.scriptState()->execution Context(); 191 ExecutionContext* executionContext = injectedScript.scriptState()->execution Context();
187 RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame() ); 192 RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame() );
188 InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, pe rsistScript, executionContextId, scriptId, exceptionDetails); 193 InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, pe rsistScript, executionContextId, scriptId, exceptionDetails);
(...skipping 24 matching lines...) Expand all
213 RefPtrWillBeRawPtr<LocalFrame> protect(frame); 218 RefPtrWillBeRawPtr<LocalFrame> protect(frame);
214 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); 219 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails);
215 220
216 if (frame) 221 if (frame)
217 InspectorInstrumentation::didEvaluateScript(cookie); 222 InspectorInstrumentation::didEvaluateScript(cookie);
218 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data( )); 223 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data( ));
219 224
220 } 225 }
221 226
222 } // namespace blink 227 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/PageDebuggerAgent.h ('k') | Source/devtools/front_end/bindings/NetworkProject.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698