Revert "Give instances their own model class; move DartErrors out of instance-ref into their own er…

runtime/bin/vmservice/observatory/lib/src/elements/instance_view.html

 <link rel="import" href="../../../../packages/polymer/polymer.html">
 <link rel="import" href="class_ref.html">
 <link rel="import" href="error_view.html">
 <link rel="import" href="eval_box.html">
 <link rel="import" href="eval_link.html">
 <link rel="import" href="field_ref.html">
 <link rel="import" href="function_ref.html">
 <link rel="import" href="inbound_reference.html">
 <link rel="import" href="instance_ref.html">
 <link rel="import" href="observatory_element.html">
 <link rel="import" href="nav_bar.html">
 
 <polymer-element name="instance-view" extends="observatory-element">
   <template>
     <link rel="stylesheet" href="css/shared.css">
     <nav-bar>
       <top-nav-menu></top-nav-menu>
       <isolate-nav-menu isolate="{{ instance.isolate }}"></isolate-nav-menu>
       <!-- TODO(turnidge): Add library nav menu here. -->
-      <class-nav-menu cls="{{ instance.clazz }}"></class-nav-menu>
+      <class-nav-menu cls="{{ instance['class'] }}"></class-nav-menu>
       <nav-menu link="." anchor="instance" last="{{ true }}"></nav-menu>
       <nav-refresh callback="{{ refresh }}"></nav-refresh>
       <nav-control></nav-control>
     </nav-bar>
 
-    <template if="{{ instance.isError }}">
+    <template if="{{ instance['error'] != null }}">
       <error-view error_obj="{{ instance['error'] }}"></error-view>
     </template>
 
-    <template if="{{ !instance.isError }}">
+    <template if="{{ instance['error'] == null }}">
       <div class="content">
-        <template if="{{ instance.isType }}">
+        <!-- TODO(turnidge): Handle null instances. -->
+        <template if="{{ isType(instance) }}">
           <h1>type {{ instance.name }}</h1>
         </template>
-        <template if="{{ !instance.isType }}">
-          <h1>instance of {{ instance.clazz.name }}</h1>
+        <template if="{{ !isType(instance) }}">
+          <h1>instance of {{ instance['class'].name }}</h1>
         </template>
         <div class="memberList">
           <div class="memberItem">
             <div class="memberName">class</div>
             <div class="memberValue">
-              <class-ref ref="{{ instance.clazz }}">
+              <class-ref ref="{{ instance['class'] }}">
               </class-ref>
             </div>
           </div>
-          <template if="{{ instance.valueAsString != null }}">
+          <template if="{{ instance['valueAsString'] != null }}">
             <div class="memberItem">
               <div class="memberName">value</div>
-              <div class="memberValue">{{ instance.valueAsString }}</div>
+              <div class="memberValue">{{ instance['valueAsString'] }}</div>
             </div>
           </template>
-          <div class="memberItem" title="Space for this object in memory">
+          <div class="memberItem">
             <div class="memberName">size</div>
-            <div class="memberValue">{{ instance.size | formatSize }}</div>
+            <div class="memberValue">{{ instance['size'] | formatSize }}</div>
           </div>
-          <div class="memberItem" title="Space that would be reclaimed if references to this object were replaced with null">
+          <div class="memberItem">
             <div class="memberName">retained size</div>
             <div class="memberValue">
               <template if="{{ retainedBytes == null }}">
                 <eval-link callback="{{ retainedSize }}"
                            label="[calculate]">
                 </eval-link>
               </template>
               <template if="{{ retainedBytes != null }}">
                 {{ retainedBytes | formatSize }}
               </template>
@@ skipping 27 matching lines @@
                   showing {{ path['elements'].length }} of {{ path['length'] }}
                   <eval-link
                     callback="{{ retainingPath }}"
                     label="[find more]"
                     expr="{{ path['elements'].length * 2 }}">
                   </eval-link>
                 </template>
               </template>
             </div>
           </div>
-          <div class="memberItem" title="Objects which directly reference this object">
+          <div class="memberItem">
             <div class="memberName">inbound references</div>
             <div class="memberValue">
               <template if="{{ inboundReferences == null }}">
                 <eval-link callback="{{ fetchInboundReferences }}"
                            label="[find]"
                            expr="100">
                 </eval-link>
               </template>
               <template if="{{ inboundReferences != null }}">
                 <template repeat="{{ reference in inboundReferences['references'] }}">
                   <inbound-reference ref="{{ reference }}"></inbound-reference>
                 </template>
               </template>
             </div>
           </div>
-          <template if="{{ instance.typeClass != null }}">
+          <template if="{{ instance['type_class'] != null }}">
             <div class="memberItem">
               <div class="memberName">type class</div>
               <div class="memberValue">
-                <class-ref ref="{{ instance.typeClass }}">
+                <class-ref ref="{{ instance['type_class'] }}">
                 </class-ref>
               </div>
             </div>
           </template>
-          <template if="{{ instance.isClosure }}">
+          <template if="{{ instance['closureFunc'] != null }}">
             <div class="memberItem">
               <div class="memberName">closure function</div>
               <div class="memberValue">
-                <function-ref ref="{{ instance.closureFunc }}">
+                <function-ref ref="{{ instance['closureFunc'] }}">
                 </function-ref>
               </div>
             </div>
           </template>
 
           <div class="memberItem">&nbsp;</div>
 
           <div class="memberItem">
             <div class="memberName">toString()</div>
             <div class="memberValue">
               <eval-link callback="{{ eval }}" expr="toString()"></eval-link>
             </div>
           </div>
         </div>
       </div>
 
       <hr>
 
       <div class="content">
-        <template if="{{ instance.fields.isNotEmpty }}">
-          fields ({{ instance.fields.length }})
-          <curly-block expand="{{ instance.fields.length <= 8 }}">
+        <template if="{{ instance['fields'].isNotEmpty }}">
+          fields ({{ instance['fields'].length }})
+          <curly-block expand="{{ instance['fields'].length <= 8 }}">
             <div class="memberList">
-              <template repeat="{{ field in instance.fields }}">
+              <template repeat="{{ field in instance['fields'] }}">
                 <div class="memberItem">
                   <div class="memberName">
                     <field-ref ref="{{ field['decl'] }}"></field-ref>
                   </div>
                   <div class="memberValue">
-                    <any-service-ref ref="{{ field['value'] }}"></any-service-ref>
+                    <instance-ref ref="{{ field['value'] }}"></instance-ref>
                   </div>
                 </div>
               </template>
             </div>
           </curly-block><br><br>
         </template>
 
-        <template if="{{ instance.nativeFields.isNotEmpty }}">
-          native fields ({{ instance.nativeFields.length }})
-          <curly-block expand="{{ instance.nativeFields.length <= 8 }}">
+        <template if="{{ instance['nativeFields'].isNotEmpty }}">
+          native fields ({{ instance['nativeFields'].length }})
+          <curly-block expand="{{ instance['nativeFields'].length <= 8 }}">
             <div class="memberList">
-              <template repeat="{{ field in instance.nativeFields }}">
+              <template repeat="{{ field in instance['nativeFields'] }}">
                 <div class="memberItem">
                   <div class="memberName">[{{ field['index']}}]</div>
                   <div class="memberValue">[{{ field['value']}}]</div>
                 </div>
               </template>
             </div>
           </curly-block><br><br>
         </template>
 
-        <template if="{{ instance.elements.isNotEmpty }}">
-          elements ({{ instance.elements.length }})
-          <curly-block expand="{{ instance.elements.length <= 8 }}">
+        <template if="{{ instance['elements'].isNotEmpty }}">
+          elements ({{ instance['elements'].length }})
+          <curly-block expand="{{ instance['elements'].length <= 8 }}">
             <div class="memberList">
-              <template repeat="{{ element in instance.elements }}">
+              <template repeat="{{ element in instance['elements'] }}">
                 <div class="memberItem">
                   <div class="memberName">[{{ element['index']}}]</div>
                   <div class="memberValue">
-                    <any-service-ref ref="{{ element['value'] }}">
+                    <instance-ref ref="{{ element['value'] }}">
                     </instance-ref>
                   </div>
                 </div>
               </template>
             </div>
           </curly-block><br><br>
         </template>
       </div>
 
       <hr>
 
       <div class="content">
         <eval-box callback="{{ eval }}"></eval-box>
       </div>
       <br><br><br><br>
       <br><br><br><br>
 
     </template>
   </template>
 </polymer-element>
 
 <script type="application/dart" src="instance_view.dart"></script>