| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library debugger_page_element; | 5 library debugger_page_element; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:html'; | 8 import 'dart:html'; |
| 9 import 'observatory_element.dart'; | 9 import 'observatory_element.dart'; |
| 10 import 'package:observatory/app.dart'; | 10 import 'package:observatory/app.dart'; |
| (...skipping 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1651 } else { | 1651 } else { |
| 1652 console.print('The program is already running'); | 1652 console.print('The program is already running'); |
| 1653 } | 1653 } |
| 1654 } | 1654 } |
| 1655 | 1655 |
| 1656 Future syncNext() async { | 1656 Future syncNext() async { |
| 1657 if (isolatePaused()) { | 1657 if (isolatePaused()) { |
| 1658 var event = isolate.pauseEvent; | 1658 var event = isolate.pauseEvent; |
| 1659 if (event.kind == ServiceEvent.kPauseStart) { | 1659 if (event.kind == ServiceEvent.kPauseStart) { |
| 1660 console.print("Type 'continue' [F7] or 'step' [F10] to start the isolate
"); | 1660 console.print("Type 'continue' [F7] or 'step' [F10] to start the isolate
"); |
| 1661 return; | 1661 return null; |
| 1662 } | 1662 } |
| 1663 if (event.kind == ServiceEvent.kPauseExit) { | 1663 if (event.kind == ServiceEvent.kPauseExit) { |
| 1664 console.print("Type 'continue' [F7] to exit the isolate"); | 1664 console.print("Type 'continue' [F7] to exit the isolate"); |
| 1665 return; | 1665 return null; |
| 1666 } | 1666 } |
| 1667 return isolate.stepOver(); | 1667 return isolate.stepOver(); |
| 1668 } else { | 1668 } else { |
| 1669 console.print('The program is already running'); | 1669 console.print('The program is already running'); |
| 1670 return; | 1670 return null; |
| 1671 } | 1671 } |
| 1672 } | 1672 } |
| 1673 | 1673 |
| 1674 Future step() { | 1674 Future step() async { |
| 1675 if (isolatePaused()) { | 1675 if (isolatePaused()) { |
| 1676 var event = isolate.pauseEvent; | 1676 var event = isolate.pauseEvent; |
| 1677 if (event.kind == ServiceEvent.kPauseExit) { | 1677 if (event.kind == ServiceEvent.kPauseExit) { |
| 1678 console.print("Type 'continue' [F7] to exit the isolate"); | 1678 console.print("Type 'continue' [F7] to exit the isolate"); |
| 1679 return new Future.value(null); | 1679 return null; |
| 1680 } | 1680 } |
| 1681 return isolate.stepInto(); | 1681 return isolate.stepInto(); |
| 1682 } else { | 1682 } else { |
| 1683 console.print('The program is already running'); | 1683 console.print('The program is already running'); |
| 1684 return new Future.value(null); | 1684 return null; |
| 1685 } | 1685 } |
| 1686 } | 1686 } |
| 1687 } | 1687 } |
| 1688 | 1688 |
| 1689 @CustomTag('debugger-page') | 1689 @CustomTag('debugger-page') |
| 1690 class DebuggerPageElement extends ObservatoryElement { | 1690 class DebuggerPageElement extends ObservatoryElement { |
| 1691 @published Isolate isolate; | 1691 @published Isolate isolate; |
| 1692 | 1692 |
| 1693 isolateChanged(oldValue) { | 1693 isolateChanged(oldValue) { |
| 1694 if (isolate != null) { | 1694 if (isolate != null) { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1777 int fixedHeight = navbarHeight + splitterHeight + cmdHeight; | 1777 int fixedHeight = navbarHeight + splitterHeight + cmdHeight; |
| 1778 int available = windowHeight - fixedHeight; | 1778 int available = windowHeight - fixedHeight; |
| 1779 int stackHeight = available ~/ 1.6; | 1779 int stackHeight = available ~/ 1.6; |
| 1780 stackDiv.style.setProperty('height', '${stackHeight}px'); | 1780 stackDiv.style.setProperty('height', '${stackHeight}px'); |
| 1781 } | 1781 } |
| 1782 | 1782 |
| 1783 @override | 1783 @override |
| 1784 void detached() { | 1784 void detached() { |
| 1785 debugger.isolate = null; | 1785 debugger.isolate = null; |
| 1786 _resizeSubscription.cancel(); | 1786 _resizeSubscription.cancel(); |
| 1787 _resizeSubscrption = null; | 1787 _resizeSubscription = null; |
| 1788 cancelFutureSubscription(_isolateSubscriptionFuture); | 1788 cancelFutureSubscription(_isolateSubscriptionFuture); |
| 1789 _isolateSubscriptionFuture = null; | 1789 _isolateSubscriptionFuture = null; |
| 1790 cancelFutureSubscription(_debugSubscriptionFuture); | 1790 cancelFutureSubscription(_debugSubscriptionFuture); |
| 1791 _debugSubscriptionFuture = null; | 1791 _debugSubscriptionFuture = null; |
| 1792 cancelFutureSubscription(_stdoutSubscriptionFuture); | 1792 cancelFutureSubscription(_stdoutSubscriptionFuture); |
| 1793 _stdoutSubscriptionFuture = null; | 1793 _stdoutSubscriptionFuture = null; |
| 1794 cancelFutureSubscription(_stderrSubscriptionFuture); | 1794 cancelFutureSubscription(_stderrSubscriptionFuture); |
| 1795 _stderrSubscriptionFuture = null; | 1795 _stderrSubscriptionFuture = null; |
| 1796 cancelFutureSubscription(_logSubscriptionFuture); | 1796 cancelFutureSubscription(_logSubscriptionFuture); |
| 1797 _logSubscriptionFuture = null; | 1797 _logSubscriptionFuture = null; |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2359 } | 2359 } |
| 2360 }); | 2360 }); |
| 2361 } | 2361 } |
| 2362 | 2362 |
| 2363 void focus() { | 2363 void focus() { |
| 2364 $['textBox'].focus(); | 2364 $['textBox'].focus(); |
| 2365 } | 2365 } |
| 2366 | 2366 |
| 2367 DebuggerInputElement.created() : super.created(); | 2367 DebuggerInputElement.created() : super.created(); |
| 2368 } | 2368 } |
| OLD | NEW |