Omnibus Observatory UI fixes:

runtime/observatory/lib/src/elements/class_view.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library class_view_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/src/elements/class_allocation_profile.dart';
@@ skipping 56 matching lines @@
   M.Class _cls;
   M.ClassRepository _classes;
   M.RetainedSizeRepository _retainedSizes;
   M.ReachableSizeRepository _reachableSizes;
   M.InboundReferencesRepository _references;
   M.RetainingPathRepository _retainingPaths;
   M.StronglyReachableInstancesRepository _stronglyReachableInstances;
   M.TopRetainingInstancesRepository _topRetainedInstances;
   M.FieldRepository _fields;
   M.ScriptRepository _scripts;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.EvalRepository _eval;
   M.ClassSampleProfileRepository _profiles;
   Iterable<M.Field> _classFields;
 
   M.VMRef get vm => _vm;
   M.IsolateRef get isolate => _isolate;
   M.NotificationRepository get notifications => _notifications;
   M.Class get cls => _cls;
 
   factory ClassViewElement(
       M.VM vm,
       M.IsolateRef isolate,
       M.Class cls,
       M.EventRepository events,
       M.NotificationRepository notifications,
       M.ClassRepository classes,
       M.RetainedSizeRepository retainedSizes,
       M.ReachableSizeRepository reachableSizes,
       M.InboundReferencesRepository references,
       M.RetainingPathRepository retainingPaths,
       M.FieldRepository fields,
       M.ScriptRepository scripts,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.EvalRepository eval,
       M.StronglyReachableInstancesRepository stronglyReachable,
       M.TopRetainingInstancesRepository topRetained,
       M.ClassSampleProfileRepository profiles,
       {RenderingQueue queue}) {
     assert(vm != null);
     assert(isolate != null);
     assert(events != null);
     assert(notifications != null);
     assert(cls != null);
     assert(classes != null);
     assert(retainedSizes != null);
     assert(reachableSizes != null);
     assert(references != null);
     assert(retainingPaths != null);
     assert(fields != null);
     assert(scripts != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(eval != null);
     assert(stronglyReachable != null);
     assert(topRetained != null);
     assert(profiles != null);
     ClassViewElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._vm = vm;
     e._isolate = isolate;
     e._events = events;
     e._notifications = notifications;
     e._cls = cls;
     e._classes = classes;
     e._retainedSizes = retainedSizes;
     e._reachableSizes = reachableSizes;
     e._references = references;
     e._retainingPaths = retainingPaths;
     e._fields = fields;
     e._scripts = scripts;
-    e._instances = instances;
+    e._objects = objects;
     e._eval = eval;
     e._stronglyReachableInstances = stronglyReachable;
     e._topRetainedInstances = topRetained;
     e._profiles = profiles;
     return e;
   }
 
   ClassViewElement.created() : super.created();
 
   @override
@@ skipping 10 matching lines @@
     children = [];
   }
 
   ObjectCommonElement _common;
   ClassInstancesElement _classInstances;
   bool _loadProfile = false;
 
   void render() {
     _common = _common ??
         new ObjectCommonElement(_isolate, _cls, _retainedSizes, _reachableSizes,
-            _references, _retainingPaths, _instances,
+            _references, _retainingPaths, _objects,
             queue: _r.queue);
     _classInstances = _classInstances ??
         new ClassInstancesElement(
             _isolate,
             _cls,
             _retainedSizes,
             _reachableSizes,
             _stronglyReachableInstances,
             _topRetainedInstances,
-            _instances,
+            _objects,
             queue: _r.queue);
     var header = '';
     if (_cls.isAbstract) {
       header += 'abstract ';
     }
     if (_cls.isPatch) {
       header += 'patch ';
     }
     children = [
       navBar([
@@ skipping 30 matching lines @@
             ..classes = ['memberList']
             ..children = _createMembers(),
           new DivElement()
             ..children = _cls.error == null
                 ? const []
                 : [
                     new HRElement(),
                     new ErrorRefElement(_cls.error, queue: _r.queue)
                   ],
           new HRElement(),
-          new EvalBoxElement(_isolate, _cls, _instances, _eval,
-              queue: _r.queue),
+          new EvalBoxElement(_isolate, _cls, _objects, _eval, queue: _r.queue),
           new HRElement(),
           new HeadingElement.h2()..text = 'Fields & Functions',
           new DivElement()
             ..classes = ['memberList']
             ..children = _createElements(),
           new HRElement(),
           new HeadingElement.h2()..text = 'Instances',
           new DivElement()
             ..children = _cls.hasAllocations ? [_classInstances] : const [],
           new HRElement(),
@@ skipping 34 matching lines @@
                 ? [
                     new ClassAllocationProfileElement(_isolate, _cls, _profiles,
                         queue: _r.queue)
                   ]
                 : const [],
           new DivElement()
             ..children = _cls.location != null
                 ? [
                     new HRElement(),
                     new SourceInsetElement(
-                        _isolate, _cls.location, _scripts, _instances, _events,
+                        _isolate, _cls.location, _scripts, _objects, _events,
                         queue: _r.queue)
                   ]
                 : const [],
           new HRElement(),
           new ViewFooterElement(queue: _r.queue)
         ]
     ];
   }
 
   bool _fieldsExpanded;
@@ skipping 47 matching lines @@
     if (_cls.superType != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'supertype',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new InstanceRefElement(_isolate, _cls.superType, _instances,
+              new InstanceRefElement(_isolate, _cls.superType, _objects,
                   queue: _r.queue)
             ]
         ]);
     }
     if (cls.mixin != null) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'mixin',
           new DivElement()
             ..classes = ['memberValue']
             ..children = [
-              new InstanceRefElement(_isolate, _cls.mixin, _instances,
+              new InstanceRefElement(_isolate, _cls.mixin, _objects,
                   queue: _r.queue)
             ]
         ]);
     }
     if (_cls.subclasses.length > 0) {
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
@@ skipping 16 matching lines @@
       members.add(new DivElement()
         ..classes = ['memberItem']
         ..children = [
           new DivElement()
             ..classes = ['memberName']
             ..text = 'implements',
           new DivElement()
             ..classes = ['memberValue']
             ..children = (_cls.interfaces
                 .expand((interf) => [
-                      new InstanceRefElement(_isolate, interf, _instances,
+                      new InstanceRefElement(_isolate, interf, _objects,
                           queue: _r.queue),
                       new SpanElement()..text = ', '
                     ])
                 .toList()
                   ..removeLast())
         ]);
     }
     if (_cls.name != _cls.vmName) {
       members.add(new DivElement()
         ..classes = ['memberItem']
@@ skipping 28 matching lines @@
                 ..content = [
                   new DivElement()
                     ..classes = ['memberList']
                     ..children = (fields
                         .map((f) => new DivElement()
                           ..classes = ['memberItem']
                           ..children = [
                             new DivElement()
                               ..classes = ['memberName']
                               ..children = [
-                                new FieldRefElement(_isolate, f, _instances,
+                                new FieldRefElement(_isolate, f, _objects,
                                     queue: _r.queue)
                               ],
                             new DivElement()
                               ..classes = ['memberValue']
                               ..children = f.staticValue == null
                                   ? const []
                                   : [
-                                      anyRef(
-                                          _isolate, f.staticValue, _instances,
+                                      anyRef(_isolate, f.staticValue, _objects,
                                           queue: _r.queue)
                                     ]
                           ])
                         .toList())
                 ]
             ]
         ]);
     }
 
     if (_cls.functions.isNotEmpty) {
@@ skipping 29 matching lines @@
     await _loadAdditionalData();
     _r.dirty();
   }
 
   Future _loadAdditionalData() async {
     _classFields =
         await Future.wait(_cls.fields.map((f) => _fields.get(_isolate, f.id)));
     _r.dirty();
   }
 }