| 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 part of service; | 5 part of service; |
| 6 | 6 |
| 7 /// A [ServiceObject] represents a persistent object within the vm. | 7 /// A [ServiceObject] represents a persistent object within the vm. |
| 8 abstract class ServiceObject extends Observable { | 8 abstract class ServiceObject extends Observable { |
| 9 static int LexicalSortName(ServiceObject o1, ServiceObject o2) { | 9 static int LexicalSortName(ServiceObject o1, ServiceObject o2) { |
| 10 return o1.name.compareTo(o2.name); | 10 return o1.name.compareTo(o2.name); |
| (...skipping 1798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1809 name = map['name']; | 1809 name = map['name']; |
| 1810 vmName = (map.containsKey('vmName') ? map['vmName'] : name); | 1810 vmName = (map.containsKey('vmName') ? map['vmName'] : name); |
| 1811 | 1811 |
| 1812 _upgradeCollection(map, isolate); | 1812 _upgradeCollection(map, isolate); |
| 1813 | 1813 |
| 1814 owningClass = map.containsKey('owningClass') ? map['owningClass'] : null; | 1814 owningClass = map.containsKey('owningClass') ? map['owningClass'] : null; |
| 1815 owningLibrary = map.containsKey('owningLibrary') ? map['owningLibrary'] : nu
ll; | 1815 owningLibrary = map.containsKey('owningLibrary') ? map['owningLibrary'] : nu
ll; |
| 1816 kind = FunctionKind.fromJSON(map['kind']); | 1816 kind = FunctionKind.fromJSON(map['kind']); |
| 1817 isDart = !kind.isFake(); | 1817 isDart = !kind.isFake(); |
| 1818 | 1818 |
| 1819 if (parent == null) { |
| 1820 qualifiedName = (owningClass != null) ? |
| 1821 "${owningClass.name}.${name}" : |
| 1822 name; |
| 1823 } else { |
| 1824 qualifiedName = "${parent.qualifiedName}.${name}"; |
| 1825 } |
| 1826 |
| 1819 if (mapIsRef) { return; } | 1827 if (mapIsRef) { return; } |
| 1820 | 1828 |
| 1821 isStatic = map['static']; | 1829 isStatic = map['static']; |
| 1822 isConst = map['const']; | 1830 isConst = map['const']; |
| 1823 parent = map['parent']; | 1831 parent = map['parent']; |
| 1824 script = map['script']; | 1832 script = map['script']; |
| 1825 tokenPos = map['tokenPos']; | 1833 tokenPos = map['tokenPos']; |
| 1826 endTokenPos = map['endTokenPos']; | 1834 endTokenPos = map['endTokenPos']; |
| 1827 code = _convertNull(map['code']); | 1835 code = _convertNull(map['code']); |
| 1828 unoptimizedCode = _convertNull(map['unoptimizedCode']); | 1836 unoptimizedCode = _convertNull(map['unoptimizedCode']); |
| 1829 isOptimizable = map['optimizable']; | 1837 isOptimizable = map['optimizable']; |
| 1830 isInlinable = map['inlinable']; | 1838 isInlinable = map['inlinable']; |
| 1831 deoptimizations = map['deoptimizations']; | 1839 deoptimizations = map['deoptimizations']; |
| 1832 usageCounter = map['usageCounter']; | 1840 usageCounter = map['usageCounter']; |
| 1833 | 1841 |
| 1834 if (parent == null) { | |
| 1835 qualifiedName = (owningClass != null) ? | |
| 1836 "${owningClass.name}.${name}" : | |
| 1837 name; | |
| 1838 } else { | |
| 1839 qualifiedName = "${parent.qualifiedName}.${name}"; | |
| 1840 } | |
| 1841 | |
| 1842 } | 1842 } |
| 1843 } | 1843 } |
| 1844 | 1844 |
| 1845 | 1845 |
| 1846 class Field extends ServiceObject { | 1846 class Field extends ServiceObject { |
| 1847 @observable var /* Library or Class */ owner; | 1847 @observable var /* Library or Class */ owner; |
| 1848 @observable Instance declaredType; | 1848 @observable Instance declaredType; |
| 1849 @observable bool isStatic; | 1849 @observable bool isStatic; |
| 1850 @observable bool isFinal; | 1850 @observable bool isFinal; |
| 1851 @observable bool isConst; | 1851 @observable bool isConst; |
| (...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2858 var v = list[i]; | 2858 var v = list[i]; |
| 2859 if ((v is ObservableMap) && _isServiceMap(v)) { | 2859 if ((v is ObservableMap) && _isServiceMap(v)) { |
| 2860 list[i] = owner.getFromMap(v); | 2860 list[i] = owner.getFromMap(v); |
| 2861 } else if (v is ObservableList) { | 2861 } else if (v is ObservableList) { |
| 2862 _upgradeObservableList(v, owner); | 2862 _upgradeObservableList(v, owner); |
| 2863 } else if (v is ObservableMap) { | 2863 } else if (v is ObservableMap) { |
| 2864 _upgradeObservableMap(v, owner); | 2864 _upgradeObservableMap(v, owner); |
| 2865 } | 2865 } |
| 2866 } | 2866 } |
| 2867 } | 2867 } |
| OLD | NEW |