Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: runtime/bin/vmservice/observatory/lib/src/service/object.dart

Issue 500093003: Remove service.Class.children, and (mostly) as a side-effect sort the class hierarchy view. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: build Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/vmservice/observatory/lib/src/elements/class_view.html ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/vmservice/observatory/lib/src/service/object.dart
diff --git a/runtime/bin/vmservice/observatory/lib/src/service/object.dart b/runtime/bin/vmservice/observatory/lib/src/service/object.dart
index eba79e5195ca773723d875a2ffe37a347aa52e6c..6dd19adf09ebef9b8e67faa518226eba18863f1e 100644
--- a/runtime/bin/vmservice/observatory/lib/src/service/object.dart
+++ b/runtime/bin/vmservice/observatory/lib/src/service/object.dart
@@ -683,7 +683,7 @@ class Isolate extends ServiceObjectOwner with Coverage {
rootClasses.clear();
objectClass = null;
for (var cls in classes) {
- if (cls.superClass == null) {
+ if (cls.superclass == null) {
rootClasses.add(cls);
}
if ((cls.vmName == 'Object') && (cls.isPatch == false)) {
@@ -1282,7 +1282,6 @@ class Allocations {
class Class extends ServiceObject with Coverage {
@observable Library library;
@observable Script script;
- @observable Class superClass;
@observable bool isAbstract;
@observable bool isConst;
@@ -1301,11 +1300,12 @@ class Class extends ServiceObject with Coverage {
bool get hasNoAllocations => newSpace.empty && oldSpace.empty;
- @reflectable final children = new ObservableList<Class>();
- @reflectable final subClasses = new ObservableList<Class>();
@reflectable final fields = new ObservableList<ServiceMap>();
@reflectable final functions = new ObservableList<ServiceFunction>();
+
+ @observable Class superclass;
@reflectable final interfaces = new ObservableList<Class>();
+ @reflectable final subclasses = new ObservableList<Class>();
bool get canCache => true;
bool get immutable => false;
@@ -1348,9 +1348,9 @@ class Class extends ServiceObject with Coverage {
tokenPos = map['tokenPos'];
endTokenPos = map['endTokenPos'];
- subClasses.clear();
- subClasses.addAll(map['subclasses']);
- subClasses.sort(ServiceObject.LexicalSortName);
+ subclasses.clear();
+ subclasses.addAll(map['subclasses']);
+ subclasses.sort(ServiceObject.LexicalSortName);
fields.clear();
fields.addAll(map['fields']);
@@ -1360,9 +1360,10 @@ class Class extends ServiceObject with Coverage {
functions.addAll(map['functions']);
functions.sort(ServiceObject.LexicalSortName);
- superClass = map['super'];
- if (superClass != null) {
- superClass._addToChildren(this);
+ superclass = map['super'];
+ // Work-around Object not tracking its subclasses in the VM.
+ if (superclass != null && superclass.name == "Object") {
+ superclass._addSubclass(this);
}
error = map['error'];
@@ -1375,11 +1376,12 @@ class Class extends ServiceObject with Coverage {
}
}
- void _addToChildren(Class cls) {
- if (children.contains(cls)) {
+ void _addSubclass(Class subclass) {
+ if (subclasses.contains(subclass)) {
return;
}
- children.add(cls);
+ subclasses.add(subclass);
+ subclasses.sort(ServiceObject.LexicalSortName);
}
Future<ServiceObject> get(String command) {
« no previous file with comments | « runtime/bin/vmservice/observatory/lib/src/elements/class_view.html ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698