Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 638 } | 638 } |
| 639 | 639 |
| 640 /** | 640 /** |
| 641 * @param {!Workspace.UILocation} uiLocation | 641 * @param {!Workspace.UILocation} uiLocation |
| 642 */ | 642 */ |
| 643 _continueToLocation(uiLocation) { | 643 _continueToLocation(uiLocation) { |
| 644 var executionContext = UI.context.flavor(SDK.ExecutionContext); | 644 var executionContext = UI.context.flavor(SDK.ExecutionContext); |
| 645 if (!executionContext) | 645 if (!executionContext) |
| 646 return; | 646 return; |
| 647 // Always use 0 column. | 647 // Always use 0 column. |
| 648 var rawLocation = | 648 var rawLocations = |
| 649 Bindings.debuggerWorkspaceBinding.uiLocationToRawLocation(uiLocation.uiS ourceCode, uiLocation.lineNumber, 0); | 649 Bindings.debuggerWorkspaceBinding.uiLocationToRawLocations(uiLocation.ui SourceCode, uiLocation.lineNumber, 0); |
| 650 if (!rawLocation || rawLocation.debuggerModel !== executionContext.debuggerM odel) | 650 if (!rawLocations.length || rawLocations[0].debuggerModel !== executionConte xt.debuggerModel) |
|
dgozman
2017/05/02 19:47:41
TODO(kozyatinskiy): make it possible to continue t
| |
| 651 return; | 651 return; |
| 652 if (!this._prepareToResume()) | 652 if (!this._prepareToResume()) |
| 653 return; | 653 return; |
| 654 | 654 |
| 655 rawLocation.continueToLocation(); | 655 rawLocations[0].continueToLocation(); |
| 656 } | 656 } |
| 657 | 657 |
| 658 _toggleBreakpointsActive() { | 658 _toggleBreakpointsActive() { |
| 659 Bindings.breakpointManager.setBreakpointsActive(!Bindings.breakpointManager. breakpointsActive()); | 659 Bindings.breakpointManager.setBreakpointsActive(!Bindings.breakpointManager. breakpointsActive()); |
| 660 } | 660 } |
| 661 | 661 |
| 662 _breakpointsActiveStateChanged(event) { | 662 _breakpointsActiveStateChanged(event) { |
| 663 var active = event.data; | 663 var active = event.data; |
| 664 this._toggleBreakpointsActiveAction.setToggled(!active); | 664 this._toggleBreakpointsActiveAction.setToggled(!active); |
| 665 this._sourcesView.toggleBreakpointsActiveState(active); | 665 this._sourcesView.toggleBreakpointsActiveState(active); |
| (...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1295 */ | 1295 */ |
| 1296 willHide() { | 1296 willHide() { |
| 1297 UI.inspectorView.setDrawerMinimized(false); | 1297 UI.inspectorView.setDrawerMinimized(false); |
| 1298 setImmediate(() => Sources.SourcesPanel.updateResizerAndSidebarButtons(Sourc es.SourcesPanel.instance())); | 1298 setImmediate(() => Sources.SourcesPanel.updateResizerAndSidebarButtons(Sourc es.SourcesPanel.instance())); |
| 1299 } | 1299 } |
| 1300 | 1300 |
| 1301 _showViewInWrapper() { | 1301 _showViewInWrapper() { |
| 1302 this._view.show(this.element); | 1302 this._view.show(this.element); |
| 1303 } | 1303 } |
| 1304 }; | 1304 }; |
| OLD | NEW |