| 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 } | 170 } |
| 171 | 171 |
| 172 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) | 172 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
| 173 { | 173 { |
| 174 // FIXME: what about nested objects? | 174 // FIXME: what about nested objects? |
| 175 if (frame != m_pageAgent->inspectedFrame()) | 175 if (frame != m_pageAgent->inspectedFrame()) |
| 176 return; | 176 return; |
| 177 reset(); | 177 reset(); |
| 178 } | 178 } |
| 179 | 179 |
| 180 void PageDebuggerAgent::didCommitLoadForLocalFrame(LocalFrame*) | |
| 181 { | |
| 182 resetModifiedSources(); | |
| 183 } | |
| 184 | |
| 185 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 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) |
| 186 { | 181 { |
| 187 InjectedScript injectedScript = injectedScriptForEval(errorString, execution
ContextId); | 182 InjectedScript injectedScript = injectedScriptForEval(errorString, execution
ContextId); |
| 188 if (injectedScript.isEmpty()) { | 183 if (injectedScript.isEmpty()) { |
| 189 *errorString = "Inspected frame has gone"; | 184 *errorString = "Inspected frame has gone"; |
| 190 return; | 185 return; |
| 191 } | 186 } |
| 192 ExecutionContext* executionContext = injectedScript.scriptState()->execution
Context(); | 187 ExecutionContext* executionContext = injectedScript.scriptState()->execution
Context(); |
| 193 RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame()
); | 188 RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame()
); |
| 194 InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, pe
rsistScript, executionContextId, scriptId, exceptionDetails); | 189 InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, pe
rsistScript, executionContextId, scriptId, exceptionDetails); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 219 RefPtrWillBeRawPtr<LocalFrame> protect(frame); | 214 RefPtrWillBeRawPtr<LocalFrame> protect(frame); |
| 220 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); | 215 InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId,
objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails); |
| 221 | 216 |
| 222 if (frame) | 217 if (frame) |
| 223 InspectorInstrumentation::didEvaluateScript(cookie); | 218 InspectorInstrumentation::didEvaluateScript(cookie); |
| 224 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); | 219 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data(
)); |
| 225 | 220 |
| 226 } | 221 } |
| 227 | 222 |
| 228 } // namespace blink | 223 } // namespace blink |
| OLD | NEW |