Chromium Code Reviews| 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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 578 * @param {Array.<DebuggerAgent.CallFrame>=} newCallFrames | 578 * @param {Array.<DebuggerAgent.CallFrame>=} newCallFrames |
| 579 * @param {Object=} details | 579 * @param {Object=} details |
| 580 */ | 580 */ |
| 581 callStackModified: function(newCallFrames, details) | 581 callStackModified: function(newCallFrames, details) |
| 582 { | 582 { |
| 583 // FIXME: declare this property in protocol and in JavaScript. | 583 // FIXME: declare this property in protocol and in JavaScript. |
| 584 if (details && details["stack_update_needs_step_in"]) | 584 if (details && details["stack_update_needs_step_in"]) |
| 585 DebuggerAgent.stepInto(); | 585 DebuggerAgent.stepInto(); |
| 586 else { | 586 else { |
| 587 if (newCallFrames && newCallFrames.length) | 587 if (newCallFrames && newCallFrames.length) |
| 588 this._pausedScript(newCallFrames, this._debuggerPausedDetails.re ason, this._debuggerPausedDetails.auxData); | 588 this._pausedScript(newCallFrames, this._debuggerPausedDetails.re ason, this._debuggerPausedDetails.auxData, this._debuggerPausedDetails.breakpoin tIds); |
| 589 | 589 |
| 590 } | 590 } |
| 591 }, | 591 }, |
| 592 | 592 |
| 593 __proto__: WebInspector.Object.prototype | 593 __proto__: WebInspector.Object.prototype |
| 594 } | 594 } |
| 595 | 595 |
| 596 WebInspector.DebuggerEventTypes = { | 596 WebInspector.DebuggerEventTypes = { |
| 597 JavaScriptPause: 0, | 597 JavaScriptPause: 0, |
| 598 JavaScriptBreakpoint: 1, | 598 JavaScriptBreakpoint: 1, |
| 599 NativeBreakpoint: 2 | 599 NativeBreakpoint: 2 |
| 600 }; | 600 }; |
| 601 | 601 |
| 602 /** | 602 /** |
| 603 * @constructor | 603 * @constructor |
| 604 * @implements {DebuggerAgent.Dispatcher} | 604 * @implements {DebuggerAgent.Dispatcher} |
| 605 * @param {WebInspector.DebuggerModel} debuggerModel | 605 * @param {WebInspector.DebuggerModel} debuggerModel |
| 606 */ | 606 */ |
| 607 WebInspector.DebuggerDispatcher = function(debuggerModel) | 607 WebInspector.DebuggerDispatcher = function(debuggerModel) |
| 608 { | 608 { |
| 609 this._debuggerModel = debuggerModel; | 609 this._debuggerModel = debuggerModel; |
| 610 } | 610 } |
| 611 | 611 |
| 612 WebInspector.DebuggerDispatcher.prototype = { | 612 WebInspector.DebuggerDispatcher.prototype = { |
| 613 /** | 613 /** |
| 614 * @param {Array.<DebuggerAgent.CallFrame>} callFrames | 614 * @param {Array.<DebuggerAgent.CallFrame>} callFrames |
| 615 * @param {string} reason | 615 * @param {string} reason |
| 616 * @param {Object=} auxData | 616 * @param {Object=} opt_auxData |
|
apavlov
2013/06/06 11:03:49
We don't use the "opt_" prefix, other than in the
SeRya
2013/06/06 11:25:54
Done.
| |
| 617 * @param {Array.<string>} breakointsIds | 617 * @param {Array.<string>=} opt_breakpointIds |
| 618 */ | 618 */ |
| 619 paused: function(callFrames, reason, auxData, breakointsIds) | 619 paused: function(callFrames, reason, opt_auxData, opt_breakpointIds) |
| 620 { | 620 { |
| 621 this._debuggerModel._pausedScript(callFrames, reason, auxData, breakoint sIds); | 621 this._debuggerModel._pausedScript(callFrames, reason, opt_auxData, opt_b reakpointIds || []); |
| 622 }, | 622 }, |
| 623 | 623 |
| 624 resumed: function() | 624 resumed: function() |
| 625 { | 625 { |
| 626 this._debuggerModel._resumedScript(); | 626 this._debuggerModel._resumedScript(); |
| 627 }, | 627 }, |
| 628 | 628 |
| 629 globalObjectCleared: function() | 629 globalObjectCleared: function() |
| 630 { | 630 { |
| 631 this._debuggerModel._globalObjectCleared(); | 631 this._debuggerModel._globalObjectCleared(); |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 835 var callFrame = this.callFrames[i]; | 835 var callFrame = this.callFrames[i]; |
| 836 callFrame.dispose(); | 836 callFrame.dispose(); |
| 837 } | 837 } |
| 838 } | 838 } |
| 839 } | 839 } |
| 840 | 840 |
| 841 /** | 841 /** |
| 842 * @type {?WebInspector.DebuggerModel} | 842 * @type {?WebInspector.DebuggerModel} |
| 843 */ | 843 */ |
| 844 WebInspector.debuggerModel = null; | 844 WebInspector.debuggerModel = null; |
| OLD | NEW |