Add support for TokenStream, LocalVarDescriptors, and PcDescriptors to service lib and generic obje…

runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart

Index: runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart
diff --git a/runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart b/runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart
index 3637bbd2680a69538e8a1626d0f4a1e0c9a64c63..5e23e08e0a8fa3551774feffc2f3ed015f3ed1fa 100644
--- a/runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart
+++ b/runtime/bin/vmservice/observatory/lib/src/elements/service_ref.dart
@@ -53,7 +53,7 @@ class ServiceRefElement extends ObservatoryElement {
 
   // Workaround isEmpty not being useable due to missing @MirrorsUsed.
   bool get nameIsEmpty {
-    return name.isEmpty;
+    return (name == null) || name.isEmpty;
   }
 }
 
@@ -94,12 +94,20 @@ class AnyServiceRefElement extends ObservatoryElement {
         ServiceRefElement element = new Element.tag('library-ref');
         element.ref = ref;
         return element;
+      case 'Script':
+        ServiceRefElement element = new Element.tag('script-ref');
+        element.ref = ref;
+        return element;
       default:
         if (ref.isInstance ||
             ref.isSentinel) {  // TODO(rmacnak): Separate this out.
           ServiceRefElement element = new Element.tag('instance-ref');
           element.ref = ref;
           return element;
+        } else if (ref.isObject) {

[turnidge, 2014/09/09 19:30:25]

I think this could be a switch in the case statement instead.

[Cutch, 2014/09/10 19:59:20]

Done.

+          ServiceRefElement element = new Element.tag('object-ref');
+          element.ref = ref;
+          return element;
         } else {
           SpanElement element = new Element.tag('span');
           element.text = "<<Unknown service ref: $ref>>";
@@ -125,3 +133,8 @@ class AnyServiceRefElement extends ObservatoryElement {
     Logger.root.info('Viewing object of \'${type}\'');
   }
 }
+
+@CustomTag('object-ref')
+class ObjectRefElement extends ServiceRefElement {
+  ObjectRefElement.created() : super.created();
+}