Wrapping leaf nodes in non polymer elements

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 406 matching lines @@
   /// be [loaded].
   ServiceObject getFromMap(ObservableMap map);
 }
 
 abstract class Location  {
   Script get script;
   int get tokenPos;
 }
 
 /// A [SourceLocation] represents a location or range in the source code.
-class SourceLocation extends ServiceObject implements Location {
+class SourceLocation extends ServiceObject implements Location,
+                                                          M.SourceLocation {
   Script script;
   int tokenPos;
   int endTokenPos;
 
   Future<int> getLine() async {
     await script.load();
     return script.tokenToLine(tokenPos);
   }
 
   Future<int> getColumn() async {
@@ skipping 672 matching lines @@
           print("${obj.runtimeType} should be a HeapObject");
         }
         return obj;
       }));
     }
     return result;
   }
 }
 
 /// State for a running isolate.
-class Isolate extends ServiceObjectOwner {
+class Isolate extends ServiceObjectOwner implements M.Isolate {
   static const kLoggingStream = '_Logging';
   static const kExtensionStream = 'Extension';
 
   @reflectable VM get vm => owner;
   @reflectable Isolate get isolate => this;
   @observable int number;
   @observable int originNumber;
   @observable DateTime startTime;
   @observable Duration get upTime {
     if (startTime == null) {
@@ skipping 1780 matching lines @@
 }
 
 /// The location of a local variable reference in a script.
 class LocalVarLocation {
   final int line;
   final int column;
   final int endColumn;
   LocalVarLocation(this.line, this.column, this.endColumn);
 }
 
-class Script extends HeapObject {
+class Script extends HeapObject implements M.Script {
   final lines = new ObservableList<ScriptLine>();
   @observable String uri;
   @observable String kind;
   @observable DateTime loadTime;
   @observable int firstTokenPos;
   @observable int lastTokenPos;
   @observable int lineOffset;
   @observable int columnOffset;
   @observable Library library;
 
+  String source;
+
   bool get immutable => true;
 
   String _shortUri;
 
   Script._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   ScriptLine getLine(int line) {
     assert(_loaded);
     assert(line >= 1);
     return lines[line - lineOffset - 1];
@@ skipping 81 matching lines @@
     vmName = uri;
     if (mapIsRef) {
       return;
     }
     _loaded = true;
     int loadTimeMillis = map['_loadTime'];
     loadTime = new DateTime.fromMillisecondsSinceEpoch(loadTimeMillis);
     lineOffset = map['lineOffset'];
     columnOffset = map['columnOffset'];
     _parseTokenPosTable(map['tokenPosTable']);
+    source = map['source'];
     _processSource(map['source']);
     library = map['library'];
   }
 
   void _parseTokenPosTable(List<List<int>> table) {
     if (table == null) {
       return;
     }
     _tokenToLine.clear();
     _tokenToCol.clear();
@@ skipping 1072 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);
     }
   }
 }