| Index: runtime/observatory/lib/src/elements/debugger.dart
|
| diff --git a/runtime/observatory/lib/src/elements/debugger.dart b/runtime/observatory/lib/src/elements/debugger.dart
|
| index b046adeb924e5f598d1ca8d1d5edfdcf7b899836..5a56306b568883a1a6fd4191b25743895c357473 100644
|
| --- a/runtime/observatory/lib/src/elements/debugger.dart
|
| +++ b/runtime/observatory/lib/src/elements/debugger.dart
|
| @@ -178,7 +178,7 @@ class PrintCommand extends DebuggerCommand {
|
| 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);
|
| }
|
| }
|
|
|
| @@ -1646,7 +1646,7 @@ class ObservatoryDebugger extends Debugger {
|
| // 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}');
|
| }
|
| @@ -2000,23 +2000,23 @@ class DebuggerPageElement extends HtmlElement implements Renderable {
|
|
|
| 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;
|
| @@ -2043,7 +2043,7 @@ class DebuggerPageElement extends HtmlElement implements Renderable {
|
|
|
| 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']
|
| @@ -2155,7 +2155,7 @@ 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;
|
| @@ -2192,20 +2192,20 @@ class DebuggerStackElement extends HtmlElement implements Renderable {
|
| 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;
|
|
|
| @@ -2263,7 +2263,7 @@ class DebuggerStackElement extends HtmlElement implements Renderable {
|
|
|
| _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) {
|
| @@ -2281,7 +2281,7 @@ class DebuggerStackElement extends HtmlElement implements Renderable {
|
|
|
| _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();
|
| @@ -2419,7 +2419,7 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| M.Isolate _isolate;
|
| S.Frame _frame;
|
| S.Frame get frame => _frame;
|
| - M.InstanceRepository _instances;
|
| + M.ObjectRepository _objects;
|
| M.ScriptRepository _scripts;
|
| M.EventRepository _events;
|
|
|
| @@ -2454,14 +2454,14 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| 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);
|
| @@ -2469,7 +2469,7 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| e._isolate = isolate;
|
| e._frame = frame;
|
| e._scroller = scroller;
|
| - e._instances = instances;
|
| + e._objects = objects;
|
| e._scripts = scripts;
|
| e._events = events;
|
| return e;
|
| @@ -2537,7 +2537,7 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| _isolate,
|
| _frame.function.location,
|
| _scripts,
|
| - _instances,
|
| + _objects,
|
| _events,
|
| currentPos: _frame.location.tokenPos,
|
| variables: _frame.variables,
|
| @@ -2562,7 +2562,7 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| ..classes = ['memberName']
|
| ..children = [
|
| anyRef(_isolate, homeMethod.dartOwner,
|
| - _instances,
|
| + _objects,
|
| queue: _r.queue)
|
| ]
|
| ]
|
| @@ -2576,7 +2576,7 @@ class DebuggerFrameElement extends HtmlElement implements Renderable {
|
| new DivElement()
|
| ..classes = ['memberName']
|
| ..children = [
|
| - anyRef(_isolate, v['value'], _instances,
|
| + anyRef(_isolate, v['value'], _objects,
|
| queue: _r.queue)
|
| ]
|
| ])
|
| @@ -2776,7 +2776,7 @@ class DebuggerMessageElement extends HtmlElement implements Renderable {
|
| S.Isolate _isolate;
|
| S.ServiceMessage _message;
|
| S.ServiceObject _preview;
|
| - M.InstanceRepository _instances;
|
| + M.ObjectRepository _objects;
|
| M.ScriptRepository _scripts;
|
| M.EventRepository _events;
|
|
|
| @@ -2791,20 +2791,19 @@ class DebuggerMessageElement extends HtmlElement implements Renderable {
|
| 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;
|
| @@ -2855,7 +2854,7 @@ class DebuggerMessageElement extends HtmlElement implements Renderable {
|
| _isolate,
|
| _message.handler.location,
|
| _scripts,
|
| - _instances,
|
| + _objects,
|
| _events,
|
| inDebuggerContext: true,
|
| queue: _r.queue)
|
| @@ -2878,7 +2877,7 @@ class DebuggerMessageElement extends HtmlElement implements Renderable {
|
| ]..addAll(_preview == null
|
| ? const []
|
| : [
|
| - anyRef(_isolate, _preview, _instances,
|
| + anyRef(_isolate, _preview, _objects,
|
| queue: _r.queue)
|
| ]))
|
| ]
|
| @@ -3073,10 +3072,9 @@ class DebuggerConsoleElement extends HtmlElement implements Renderable {
|
| }
|
| }
|
|
|
| - 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();
|
| }
|
|
|