Omnibus Observatory UI fixes:

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

 // Copyright (c) 2014, 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 debugger_page_element;
 
 import 'dart:async';
 import 'dart:svg';
 import 'dart:html';
 import 'dart:math';
@@ skipping 160 matching lines @@
       debugger.console.print('No stack');
       return;
     }
     var expression = args.join('');
     var response =
         await debugger.isolate.evalFrame(debugger.currentFrame, expression);
     if (response is S.DartError) {
       debugger.console.print(response.message);
     } else {
       debugger.console.print('= ', newline: false);
-      debugger.console.printRef(debugger.isolate, response, debugger.instances);
+      debugger.console.printRef(debugger.isolate, response, debugger.objects);
     }
   }
 
   String helpShort = 'Evaluate and print an expression in the current frame';
 
   String helpLong = 'Evaluate and print an expression in the current frame.\n'
       '\n'
       'Syntax: print <expression>\n'
       '        p <expression>\n';
 }
@@ skipping 1447 matching lines @@
           var bpId = event.breakpoint.number;
           console.print('Paused at breakpoint ${bpId} at '
               '${script.name}:${line}:${col}');
         } else if ((event is M.PauseExceptionEvent) &&
             (event.exception != null)) {
           console.print('Paused due to exception at '
               '${script.name}:${line}:${col}');
           // This seems to be missing if we are paused-at-exception after
           // paused-at-isolate-exit. Maybe we shutdown part of the debugger too
           // soon?
-          console.printRef(isolate, event.exception, instances);
+          console.printRef(isolate, event.exception, objects);
         } else {
           console.print('Paused at ${script.name}:${line}:${col}');
         }
       });
     } else {
       console.print("Paused in message loop (type 'continue' or [F7] "
           "to resume processing messages)");
     }
   }
 
@@ skipping 333 matching lines @@
   static const tag =
       const Tag<DebuggerPageElement>('debugger-page', dependencies: const [
     NavTopMenuElement.tag,
     NavVMMenuElement.tag,
     NavIsolateMenuElement.tag,
     NavNotifyElement.tag,
   ]);
 
   S.Isolate _isolate;
   ObservatoryDebugger _debugger;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.ScriptRepository _scripts;
   M.EventRepository _events;
 
-  factory DebuggerPageElement(S.Isolate isolate, M.InstanceRepository instances,
+  factory DebuggerPageElement(S.Isolate isolate, M.ObjectRepository objects,
       M.ScriptRepository scripts, M.EventRepository events) {
     assert(isolate != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(scripts != null);
     assert(events != null);
     final e = document.createElement(tag.name);
     final debugger = new ObservatoryDebugger(isolate);
     debugger.page = e;
-    debugger.instances = instances;
+    debugger.objects = objects;
     e._isolate = isolate;
     e._debugger = debugger;
-    e._instances = instances;
+    e._objects = objects;
     e._scripts = scripts;
     e._events = events;
     return e;
   }
 
   DebuggerPageElement.created() : super.created();
 
   Future<StreamSubscription> _vmSubscriptionFuture;
   Future<StreamSubscription> _isolateSubscriptionFuture;
   Future<StreamSubscription> _debugSubscriptionFuture;
   Future<StreamSubscription> _stdoutSubscriptionFuture;
   Future<StreamSubscription> _stderrSubscriptionFuture;
   Future<StreamSubscription> _logSubscriptionFuture;
 
   ObservatoryApplication get app => ObservatoryApplication.app;
 
   Timer _timer;
 
   static final consoleElement = new DebuggerConsoleElement();
 
   @override
   void attached() {
     super.attached();
 
     final stackDiv = new DivElement()..classes = ['stack'];
     final stackElement = new DebuggerStackElement(
-        _isolate, _debugger, stackDiv, _instances, _scripts, _events);
+        _isolate, _debugger, stackDiv, _objects, _scripts, _events);
     stackDiv.children = [stackElement];
     final consoleDiv = new DivElement()
       ..classes = ['console']
       ..children = [consoleElement];
     final commandElement = new DebuggerInputElement(_isolate, _debugger);
     final commandDiv = new DivElement()
       ..classes = ['commandline']
       ..children = [commandElement];
 
     children = [
@@ skipping 91 matching lines @@
     S.cancelFutureSubscription(_logSubscriptionFuture);
     _logSubscriptionFuture = null;
     super.detached();
   }
 }
 
 class DebuggerStackElement extends HtmlElement implements Renderable {
   static const tag = const Tag<DebuggerStackElement>('debugger-stack');
 
   S.Isolate _isolate;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.ScriptRepository _scripts;
   M.EventRepository _events;
   Element _scroller;
   DivElement _isSampled;
   bool get isSampled => !_isSampled.classes.contains('hidden');
   set isSampled(bool value) {
     if (value != isSampled) {
       _isSampled.classes.toggle('hidden');
     }
   }
@@ skipping 16 matching lines @@
 
   UListElement _frameList;
   UListElement _messageList;
   int currentFrame;
   ObservatoryDebugger _debugger;
 
   factory DebuggerStackElement(
       S.Isolate isolate,
       ObservatoryDebugger debugger,
       Element scroller,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.ScriptRepository scripts,
       M.EventRepository events) {
     assert(isolate != null);
     assert(debugger != null);
     assert(scroller != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(scripts != null);
     assert(events != null);
     final e = document.createElement(tag.name);
     e._isolate = isolate;
     e._debugger = debugger;
     e._scroller = scroller;
-    e._instances = instances;
+    e._objects = objects;
     e._scripts = scripts;
     e._events = events;
 
     var btnPause;
     var btnRefresh;
     e.children = [
       e._isSampled = new DivElement()
         ..classes = ['sampledMessage', 'hidden']
         ..children = [
           new SpanElement()
@@ skipping 37 matching lines @@
     ];
     return e;
   }
 
   void render() {
     /* nothing to do */
   }
 
   _addFrame(List frameList, S.Frame frameInfo) {
     final frameElement = new DebuggerFrameElement(
-        _isolate, frameInfo, _scroller, _instances, _scripts, _events,
+        _isolate, frameInfo, _scroller, _objects, _scripts, _events,
         queue: app.queue);
 
     if (frameInfo.index == currentFrame) {
       frameElement.setCurrent(true);
     } else {
       frameElement.setCurrent(false);
     }
 
     var li = new LIElement();
     li.classes.add('list-group-item');
     li.children.insert(0, frameElement);
 
     frameList.insert(0, li);
   }
 
   _addMessage(List messageList, S.ServiceMessage messageInfo) {
     final messageElement = new DebuggerMessageElement(
-        _isolate, messageInfo, _instances, _scripts, _events,
+        _isolate, messageInfo, _objects, _scripts, _events,
         queue: app.queue);
 
     var li = new LIElement();
     li.classes.add('list-group-item');
     li.children.insert(0, messageElement);
 
     messageList.add(li);
   }
 
   ObservatoryApplication get app => ObservatoryApplication.app;
@@ skipping 117 matching lines @@
 
   RenderingScheduler<DebuggerMessageElement> _r;
 
   Stream<RenderedEvent<DebuggerMessageElement>> get onRendered => _r.onRendered;
 
   Element _scroller;
   DivElement _varsDiv;
   M.Isolate _isolate;
   S.Frame _frame;
   S.Frame get frame => _frame;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.ScriptRepository _scripts;
   M.EventRepository _events;
 
   // Is this the current frame?
   bool _current = false;
 
   // Has this frame been pinned open?
   bool _pinned = false;
 
   bool _expanded = false;
@@ skipping 14 matching lines @@
           _unexpand();
         }
       }
     });
   }
 
   factory DebuggerFrameElement(
       M.Isolate isolate,
       S.Frame frame,
       Element scroller,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.ScriptRepository scripts,
       M.EventRepository events,
       {RenderingQueue queue}) {
     assert(isolate != null);
     assert(frame != null);
     assert(scroller != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(scripts != null);
     assert(events != null);
     final DebuggerFrameElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._isolate = isolate;
     e._frame = frame;
     e._scroller = scroller;
-    e._instances = instances;
+    e._objects = objects;
     e._scripts = scripts;
     e._events = events;
     return e;
   }
 
   DebuggerFrameElement.created() : super.created();
 
   void render() {
     if (_pinned) {
       classes.add('shadow');
@@ skipping 47 matching lines @@
               ..children = [
                 new DivElement()
                   ..classes = ['flex-item-script']
                   ..children = _frame.function?.location == null
                       ? const []
                       : [
                           new SourceInsetElement(
                               _isolate,
                               _frame.function.location,
                               _scripts,
-                              _instances,
+                              _objects,
                               _events,
                               currentPos: _frame.location.tokenPos,
                               variables: _frame.variables,
                               inDebuggerContext: true,
                               queue: _r.queue)
                         ],
                 new DivElement()
                   ..classes = ['flex-item-vars']
                   ..children = [
                     _varsDiv = new DivElement()
                       ..classes = ['memberList', 'frameVars']
                       ..children = ([
                         new DivElement()
                           ..classes = ['memberItem']
                           ..children = homeMethodName == null
                               ? const []
                               : [
                                   new DivElement()
                                     ..classes = ['memberName']
                                     ..text = homeMethodName,
                                   new DivElement()
                                     ..classes = ['memberName']
                                     ..children = [
                                       anyRef(_isolate, homeMethod.dartOwner,
-                                          _instances,
+                                          _objects,
                                           queue: _r.queue)
                                     ]
                                 ]
                       ]..addAll(_frame.variables
                           .map((v) => new DivElement()
                             ..classes = ['memberItem']
                             ..children = [
                               new DivElement()
                                 ..classes = ['memberName']
                                 ..text = v.name,
                               new DivElement()
                                 ..classes = ['memberName']
                                 ..children = [
-                                  anyRef(_isolate, v['value'], _instances,
+                                  anyRef(_isolate, v['value'], _objects,
                                       queue: _r.queue)
                                 ]
                             ])
                           .toList()))
                   ]
               ],
             new DivElement()
               ..classes = ['frameContractor']
               ..children = [
                 collapseButton = new ButtonElement()
@@ skipping 179 matching lines @@
 class DebuggerMessageElement extends HtmlElement implements Renderable {
   static const tag = const Tag<DebuggerMessageElement>('debugger-message');
 
   RenderingScheduler<DebuggerMessageElement> _r;
 
   Stream<RenderedEvent<DebuggerMessageElement>> get onRendered => _r.onRendered;
 
   S.Isolate _isolate;
   S.ServiceMessage _message;
   S.ServiceObject _preview;
-  M.InstanceRepository _instances;
+  M.ObjectRepository _objects;
   M.ScriptRepository _scripts;
   M.EventRepository _events;
 
   // Is this the current message?
   bool _current = false;
 
   // Has this message been pinned open?
   bool _pinned = false;
 
   bool _expanded = false;
 
   factory DebuggerMessageElement(
       S.Isolate isolate,
       S.ServiceMessage message,
-      M.InstanceRepository instances,
+      M.ObjectRepository objects,
       M.ScriptRepository scripts,
       M.EventRepository events,
       {RenderingQueue queue}) {
     assert(isolate != null);
     assert(message != null);
-    assert(instances != null);
-    assert(instances != null);
+    assert(objects != null);
     assert(events != null);
     final DebuggerMessageElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._isolate = isolate;
     e._message = message;
-    e._instances = instances;
+    e._objects = objects;
     e._scripts = scripts;
     e._events = events;
     return e;
   }
 
   DebuggerMessageElement.created() : super.created();
 
   void render() {
     if (_pinned) {
       classes.add('shadow');
@@ skipping 30 matching lines @@
               ..children = [
                 new DivElement()
                   ..classes = ['flex-item-script']
                   ..children = _message.handler == null
                       ? const []
                       : [
                           new SourceInsetElement(
                               _isolate,
                               _message.handler.location,
                               _scripts,
-                              _instances,
+                              _objects,
                               _events,
                               inDebuggerContext: true,
                               queue: _r.queue)
                         ],
                 new DivElement()
                   ..classes = ['flex-item-vars']
                   ..children = [
                     new DivElement()
                       ..classes = ['memberItem']
                       ..children = [
                         new DivElement()..classes = ['memberName'],
                         new DivElement()
                           ..classes = ['memberValue']
                           ..children = ([
                             previewButton = new ButtonElement()
                               ..text = 'preview'
                               ..onClick.listen((_) {
                                 previewButton.disabled = true;
                               })
                           ]..addAll(_preview == null
                               ? const []
                               : [
-                                  anyRef(_isolate, _preview, _instances,
+                                  anyRef(_isolate, _preview, _objects,
                                       queue: _r.queue)
                                 ]))
                       ]
                   ]
               ],
             new DivElement()
               ..classes = ['messageContractor']
               ..children = [
                 collapseButton = new ButtonElement()
                   ..onClick.listen((e) async {
@@ skipping 174 matching lines @@
       span.classes.add('green');
       span.appendText(line);
       span.appendText('\n');
       children.add(span);
     }
     if (autoScroll) {
       _scrollToBottom(parent);
     }
   }
 
-  void printRef(
-      S.Isolate isolate, S.Instance ref, M.InstanceRepository instances,
+  void printRef(S.Isolate isolate, S.Instance ref, M.ObjectRepository objects,
       {bool newline: true}) {
-    _append(new InstanceRefElement(isolate, ref, instances, queue: app.queue));
+    _append(new InstanceRefElement(isolate, ref, objects, queue: app.queue));
     if (newline) {
       this.newline();
     }
   }
 
   void newline() {
     _append(new BRElement());
   }
 
   void clear() {
@@ skipping 255 matching lines @@
   ..setAttribute('height', '24')
   ..children = [
     new PathElement()
       ..setAttribute(
           'd',
           'M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 '
           '10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 '
           '0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 '
           '9h2V7h-2v2z')
   ];