OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 return topFrame; | 226 return topFrame; |
227 } | 227 } |
228 | 228 |
229 DebuggerScript.stepIntoStatement = function(execState) | 229 DebuggerScript.stepIntoStatement = function(execState) |
230 { | 230 { |
231 execState.prepareStep(Debug.StepAction.StepIn, 1); | 231 execState.prepareStep(Debug.StepAction.StepIn, 1); |
232 } | 232 } |
233 | 233 |
234 DebuggerScript.stepOverStatement = function(execState, callFrame) | 234 DebuggerScript.stepOverStatement = function(execState, callFrame) |
235 { | 235 { |
236 var frameMirror = callFrame ? callFrame.frameMirror : undefined; | 236 execState.prepareStep(Debug.StepAction.StepNext, 1); |
237 execState.prepareStep(Debug.StepAction.StepNext, 1, frameMirror); | |
238 } | 237 } |
239 | 238 |
240 DebuggerScript.stepOutOfFunction = function(execState, callFrame) | 239 DebuggerScript.stepOutOfFunction = function(execState, callFrame) |
241 { | 240 { |
242 var frameMirror = callFrame ? callFrame.frameMirror : undefined; | 241 execState.prepareStep(Debug.StepAction.StepOut, 1); |
243 execState.prepareStep(Debug.StepAction.StepOut, 1, frameMirror); | |
244 } | 242 } |
245 | 243 |
246 // Returns array in form: | 244 // Returns array in form: |
247 // [ 0, <v8_result_report> ] in case of success | 245 // [ 0, <v8_result_report> ] in case of success |
248 // or [ 1, <general_error_message>, <compiler_message>, <line_number>, <column
_number> ] in case of compile error, numbers are 1-based. | 246 // or [ 1, <general_error_message>, <compiler_message>, <line_number>, <column
_number> ] in case of compile error, numbers are 1-based. |
249 // or throws exception with message. | 247 // or throws exception with message. |
250 DebuggerScript.liveEditScriptSource = function(scriptId, newSource, preview) | 248 DebuggerScript.liveEditScriptSource = function(scriptId, newSource, preview) |
251 { | 249 { |
252 var scripts = Debug.scripts(); | 250 var scripts = Debug.scripts(); |
253 var scriptToEdit = null; | 251 var scriptToEdit = null; |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 "functionName": functionName, | 457 "functionName": functionName, |
460 "thisObject": thisObject, | 458 "thisObject": thisObject, |
461 "scopeChain": lazyScopeChain, | 459 "scopeChain": lazyScopeChain, |
462 "scopeType": scopeTypes, | 460 "scopeType": scopeTypes, |
463 "evaluate": evaluate, | 461 "evaluate": evaluate, |
464 "caller": callerFrame, | 462 "caller": callerFrame, |
465 "restart": restart, | 463 "restart": restart, |
466 "setVariableValue": setVariableValue, | 464 "setVariableValue": setVariableValue, |
467 "stepInPositions": stepInPositions, | 465 "stepInPositions": stepInPositions, |
468 "isAtReturn": isAtReturn, | 466 "isAtReturn": isAtReturn, |
469 "returnValue": returnValue, | 467 "returnValue": returnValue |
470 "frameMirror": frameMirror | |
471 }; | 468 }; |
472 } | 469 } |
473 | 470 |
474 DebuggerScript._buildScopeObject = function(scopeType, scopeObject) | 471 DebuggerScript._buildScopeObject = function(scopeType, scopeObject) |
475 { | 472 { |
476 var result; | 473 var result; |
477 switch (scopeType) { | 474 switch (scopeType) { |
478 case ScopeType.Local: | 475 case ScopeType.Local: |
479 case ScopeType.Closure: | 476 case ScopeType.Closure: |
480 case ScopeType.Catch: | 477 case ScopeType.Catch: |
(...skipping 19 matching lines...) Expand all Loading... |
500 break; | 497 break; |
501 } | 498 } |
502 return result; | 499 return result; |
503 } | 500 } |
504 | 501 |
505 // We never resolve Mirror by its handle so to avoid memory leaks caused by Mirr
ors in the cache we disable it. | 502 // We never resolve Mirror by its handle so to avoid memory leaks caused by Mirr
ors in the cache we disable it. |
506 ToggleMirrorCache(false); | 503 ToggleMirrorCache(false); |
507 | 504 |
508 return DebuggerScript; | 505 return DebuggerScript; |
509 })(); | 506 })(); |
OLD | NEW |