OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
950 | 950 |
951 function MakeExecutionState(break_id) { | 951 function MakeExecutionState(break_id) { |
952 return new ExecutionState(break_id); | 952 return new ExecutionState(break_id); |
953 } | 953 } |
954 | 954 |
955 function ExecutionState(break_id) { | 955 function ExecutionState(break_id) { |
956 this.break_id = break_id; | 956 this.break_id = break_id; |
957 this.selected_frame = 0; | 957 this.selected_frame = 0; |
958 } | 958 } |
959 | 959 |
960 ExecutionState.prototype.prepareStep = function(opt_action, opt_count) { | 960 ExecutionState.prototype.prepareStep = function(opt_action, opt_count, |
| 961 opt_callframe) { |
961 var action = Debug.StepAction.StepIn; | 962 var action = Debug.StepAction.StepIn; |
962 if (!IS_UNDEFINED(opt_action)) action = %ToNumber(opt_action); | 963 if (!IS_UNDEFINED(opt_action)) action = %ToNumber(opt_action); |
963 var count = opt_count ? %ToNumber(opt_count) : 1; | 964 var count = opt_count ? %ToNumber(opt_count) : 1; |
| 965 var callFrameId = 0; |
| 966 if (!IS_UNDEFINED(opt_callframe)) { |
| 967 callFrameId = opt_callframe.details_.frameId(); |
| 968 } |
964 | 969 |
965 return %PrepareStep(this.break_id, action, count); | 970 return %PrepareStep(this.break_id, action, count, callFrameId); |
966 }; | 971 }; |
967 | 972 |
968 ExecutionState.prototype.evaluateGlobal = function(source, disable_break, | 973 ExecutionState.prototype.evaluateGlobal = function(source, disable_break, |
969 opt_additional_context) { | 974 opt_additional_context) { |
970 return MakeMirror(%DebugEvaluateGlobal(this.break_id, source, | 975 return MakeMirror(%DebugEvaluateGlobal(this.break_id, source, |
971 Boolean(disable_break), | 976 Boolean(disable_break), |
972 opt_additional_context)); | 977 opt_additional_context)); |
973 }; | 978 }; |
974 | 979 |
975 ExecutionState.prototype.frameCount = function() { | 980 ExecutionState.prototype.frameCount = function() { |
(...skipping 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2629 | 2634 |
2630 default: | 2635 default: |
2631 json = null; | 2636 json = null; |
2632 } | 2637 } |
2633 return json; | 2638 return json; |
2634 } | 2639 } |
2635 | 2640 |
2636 Debug.TestApi = { | 2641 Debug.TestApi = { |
2637 CommandProcessorResolveValue: DebugCommandProcessor.resolveValue_ | 2642 CommandProcessorResolveValue: DebugCommandProcessor.resolveValue_ |
2638 }; | 2643 }; |
OLD | NEW |