Converted Observatory context-view element

runtime/observatory/lib/src/service/object.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.
 
 part of service;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 2745 matching lines @@
     return isolate._eval(this, expression);
   }
 
   String toString() => 'Instance($shortName)';
 }
 
 
 class Context extends HeapObject implements M.Context {
   @observable Context parentContext;
   @observable int length;
-  @observable var variables;
+  @observable Iterable<ContextElement> variables;
 
   Context._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     // Extract full properties.
     _upgradeCollection(map, isolate);
     super._update(map, mapIsRef);
 
     length = map['length'];
     parentContext = map['parent'];
 
     if (mapIsRef) {
       return;
     }
 
-    variables = map['variables'];
+    variables = (map['variables'] ?? const []).map((element) =>
+      new ContextElement(element));
 
     // We are fully loaded.
     _loaded = true;
   }
 
   String toString() => 'Context($length)';
 }
 
+class ContextElement extends M.ContextElement {
+  final Guarded<Instance> value;
+
+  ContextElement(ServiceMap map)
+    : value = new Guarded<Instance>(map['value']);
+}
+
 M.FunctionKind stringToFunctionKind(String value) {
   switch(value) {
     case 'RegularFunction': return M.FunctionKind.regular;
     case 'ClosureFunction': return M.FunctionKind.closure;
     case 'GetterFunction': return M.FunctionKind.getter;
     case 'SetterFunction': return M.FunctionKind.setter;
     case 'Constructor': return M.FunctionKind.constructor;
     case 'ImplicitGetter': return M.FunctionKind.implicitGetter;
     case 'ImplicitSetter': return M.FunctionKind.implicitSetter;
     case 'ImplicitStaticFinalGetter':
@@ skipping 1486 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }