| 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 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1223 @observable bool hasStack = false; | 1223 @observable bool hasStack = false; |
| 1224 @observable bool hasMessages = false; | 1224 @observable bool hasMessages = false; |
| 1225 @observable bool isSampled = false; | 1225 @observable bool isSampled = false; |
| 1226 @observable int currentFrame; | 1226 @observable int currentFrame; |
| 1227 ObservatoryDebugger debugger; | 1227 ObservatoryDebugger debugger; |
| 1228 | 1228 |
| 1229 _addFrame(List frameList, ObservableMap frameInfo) { | 1229 _addFrame(List frameList, ObservableMap frameInfo) { |
| 1230 DebuggerFrameElement frameElement = new Element.tag('debugger-frame'); | 1230 DebuggerFrameElement frameElement = new Element.tag('debugger-frame'); |
| 1231 frameElement.frame = frameInfo; | 1231 frameElement.frame = frameInfo; |
| 1232 | 1232 |
| 1233 if (frameInfo['depth'] == currentFrame) { | 1233 if (frameInfo['index'] == currentFrame) { |
| 1234 frameElement.setCurrent(true); | 1234 frameElement.setCurrent(true); |
| 1235 } else { | 1235 } else { |
| 1236 frameElement.setCurrent(false); | 1236 frameElement.setCurrent(false); |
| 1237 } | 1237 } |
| 1238 | 1238 |
| 1239 var li = new LIElement(); | 1239 var li = new LIElement(); |
| 1240 li.classes.add('list-group-item'); | 1240 li.classes.add('list-group-item'); |
| 1241 li.children.insert(0, frameElement); | 1241 li.children.insert(0, frameElement); |
| 1242 | 1242 |
| 1243 frameList.insert(0, li); | 1243 frameList.insert(0, li); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1340 updateStackFrames(newStack); | 1340 updateStackFrames(newStack); |
| 1341 updateStackMessages(newStack); | 1341 updateStackMessages(newStack); |
| 1342 isSampled = pauseEvent == null; | 1342 isSampled = pauseEvent == null; |
| 1343 } | 1343 } |
| 1344 | 1344 |
| 1345 void setCurrentFrame(int value) { | 1345 void setCurrentFrame(int value) { |
| 1346 currentFrame = value; | 1346 currentFrame = value; |
| 1347 List frameElements = $['frameList'].children; | 1347 List frameElements = $['frameList'].children; |
| 1348 for (var frameElement in frameElements) { | 1348 for (var frameElement in frameElements) { |
| 1349 var dbgFrameElement = frameElement.children[0]; | 1349 var dbgFrameElement = frameElement.children[0]; |
| 1350 if (dbgFrameElement.frame['depth'] == currentFrame) { | 1350 if (dbgFrameElement.frame['index'] == currentFrame) { |
| 1351 dbgFrameElement.setCurrent(true); | 1351 dbgFrameElement.setCurrent(true); |
| 1352 } else { | 1352 } else { |
| 1353 dbgFrameElement.setCurrent(false); | 1353 dbgFrameElement.setCurrent(false); |
| 1354 } | 1354 } |
| 1355 } | 1355 } |
| 1356 } | 1356 } |
| 1357 | 1357 |
| 1358 Set<Script> activeScripts() { | 1358 Set<Script> activeScripts() { |
| 1359 var s = new Set<Script>(); | 1359 var s = new Set<Script>(); |
| 1360 List frameElements = $['frameList'].children; | 1360 List frameElements = $['frameList'].children; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 @observable bool busy = false; | 1422 @observable bool busy = false; |
| 1423 | 1423 |
| 1424 DebuggerFrameElement.created() : super.created(); | 1424 DebuggerFrameElement.created() : super.created(); |
| 1425 | 1425 |
| 1426 bool matchFrame(ObservableMap newFrame) { | 1426 bool matchFrame(ObservableMap newFrame) { |
| 1427 return newFrame['function'].id == frame['function'].id; | 1427 return newFrame['function'].id == frame['function'].id; |
| 1428 } | 1428 } |
| 1429 | 1429 |
| 1430 void updateFrame(ObservableMap newFrame) { | 1430 void updateFrame(ObservableMap newFrame) { |
| 1431 assert(matchFrame(newFrame)); | 1431 assert(matchFrame(newFrame)); |
| 1432 frame['depth'] = newFrame['depth']; | 1432 frame['index'] = newFrame['index']; |
| 1433 frame['tokenPos'] = newFrame['tokenPos']; | 1433 frame['tokenPos'] = newFrame['tokenPos']; |
| 1434 frame['vars'] = newFrame['vars']; | 1434 frame['vars'] = newFrame['vars']; |
| 1435 } | 1435 } |
| 1436 | 1436 |
| 1437 Script get script => frame['script']; | 1437 Script get script => frame['script']; |
| 1438 | 1438 |
| 1439 @override | 1439 @override |
| 1440 void attached() { | 1440 void attached() { |
| 1441 super.attached(); | 1441 super.attached(); |
| 1442 int windowHeight = window.innerHeight; | 1442 int windowHeight = window.innerHeight; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1496 | 1496 |
| 1497 @observable String scriptHeight; | 1497 @observable String scriptHeight; |
| 1498 @observable bool expanded = false; | 1498 @observable bool expanded = false; |
| 1499 @observable bool busy = false; | 1499 @observable bool busy = false; |
| 1500 | 1500 |
| 1501 DebuggerMessageElement.created() : super.created(); | 1501 DebuggerMessageElement.created() : super.created(); |
| 1502 | 1502 |
| 1503 void updateMessage(ServiceMap newMessage) { | 1503 void updateMessage(ServiceMap newMessage) { |
| 1504 bool messageChanged = | 1504 bool messageChanged = |
| 1505 (message['messageObjectId'] != newMessage['messageObjectId']); | 1505 (message['messageObjectId'] != newMessage['messageObjectId']); |
| 1506 message['depth'] = newMessage['depth']; | 1506 message['index'] = newMessage['index']; |
| 1507 message['handlerFunction'] = newMessage['handlerFunction']; | 1507 message['handlerFunction'] = newMessage['handlerFunction']; |
| 1508 message['messageObjectId'] = newMessage['messageObjectId']; | 1508 message['messageObjectId'] = newMessage['messageObjectId']; |
| 1509 if (messageChanged) { | 1509 if (messageChanged) { |
| 1510 // Message object id has changed: clear preview and collapse. | 1510 // Message object id has changed: clear preview and collapse. |
| 1511 preview = null; | 1511 preview = null; |
| 1512 if (expanded) { | 1512 if (expanded) { |
| 1513 toggleExpand(null, null, null); | 1513 toggleExpand(null, null, null); |
| 1514 } | 1514 } |
| 1515 } | 1515 } |
| 1516 } | 1516 } |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1667 default: | 1667 default: |
| 1668 busy = false; | 1668 busy = false; |
| 1669 break; | 1669 break; |
| 1670 } | 1670 } |
| 1671 }); | 1671 }); |
| 1672 } | 1672 } |
| 1673 | 1673 |
| 1674 DebuggerInputElement.created() : super.created(); | 1674 DebuggerInputElement.created() : super.created(); |
| 1675 } | 1675 } |
| 1676 | 1676 |
| OLD | NEW |