Improve Code object support in service and observatory

runtime/bin/vmservice/client/deployed/web/index.html

Index: runtime/bin/vmservice/client/deployed/web/index.html
diff --git a/runtime/bin/vmservice/client/deployed/web/index.html b/runtime/bin/vmservice/client/deployed/web/index.html
index 5ea58950dae243cca6745704e7f4252f9f6d299f..be80e72b8b0963c36487470988a5d43c6bf6cc9e 100644
--- a/runtime/bin/vmservice/client/deployed/web/index.html
+++ b/runtime/bin/vmservice/client/deployed/web/index.html
@@ -42,14 +42,9 @@
     <div class="row">
     <div class="col-md-8 col-md-offset-2">
       <div class="panel panel-danger">
-        <div class="panel-heading">Error</div>
+        <div class="panel-heading">{{ error['errorType'] }}</div>
         <div class="panel-body">
-          <template if="{{ (error_obj == null) || (error_obj['type'] != 'LanguageError') }}">
-            <p>{{ error }}</p>
-          </template>
-          <template if="{{ (error_obj != null) &amp;&amp; (error_obj['type'] == 'LanguageError') }}">
-            <pre>{{ error_obj['error_msg'] }}</pre>
-          </template>
+          <p>{{ error['text'] }}</p>
         </div>
       </div>
     </div>
@@ -171,18 +166,11 @@
 </polymer-element><polymer-element name="disassembly-entry" extends="observatory-element">
   <template>
   <div class="row">
-    <template if="{{ instruction['type'] == 'DisassembledInstructionComment' }}">
-      <div class="col-md-2"></div>
-      <div class="col-md-2"></div>
-      <div class="col-md-4"><code>{{ instruction['comment'] }}</code></div>
-    </template>
-    <template if="{{ instruction['type'] == 'DisassembledInstruction' }}">
-      <div class="col-md-2"></div>
-      <div class="col-md-2">{{ instruction['pc'] }}</div>
+      <div class="col-md-2">{{ instruction.formattedTicks() }}</div>
+      <div class="col-md-2">{{ instruction.formattedAddress() }}</div>
       <div class="col-md-4">
-        <code>{{ instruction['hex'] }} {{ instruction['human'] }}</code>
+        <code>{{ instruction.machine }} {{ instruction.human }}</code>
       </div>
-    </template>
   </div>
   </template>
   
@@ -192,7 +180,7 @@
     <div class="col-md-8 col-md-offset-2">
       <div class="{{ cssPanelClass }}">
         <div class="panel-heading">
-          <function-ref app="{{ app }}" ref="{{ code['function'] }}"></function-ref>
+          <function-ref app="{{ app }}" ref="{{ code.functionRef }}"></function-ref>
         </div>
         <div class="panel-body">
           <div class="row">
@@ -200,7 +188,7 @@
               <div class="col-md-2"><strong>Address</strong></div>
               <div><strong>Instruction</strong></div>
           </div>
-          <template repeat="{{ instruction in code['disassembly'] }}">
+          <template repeat="{{ instruction in code.instructions }}">
             <disassembly-entry instruction="{{ instruction }}">
             </disassembly-entry>
           </template>
@@ -525,7 +513,7 @@
     </thead>
     <tbody>
       <tr template="" repeat="{{ frame in trace['members'] }}">
-        <td>{{$index}}</td>
+        <td></td>
         <td><function-ref app="{{ app }}" ref="{{ frame['function'] }}"></function-ref></td>
         <td><script-ref app="{{ app }}" ref="{{ frame['script'] }}"></script-ref></td>
         <td>{{ frame['line'] }}</td>
@@ -551,9 +539,8 @@
     <template if="{{ messageType == 'BreakpointList' }}">
       <breakpoint-list app="{{ app }}" msg="{{ message }}"></breakpoint-list>
     </template>
-    <!-- If the message type is a RequestError -->
-    <template if="{{ messageType == 'RequestError' }}">
-      <error-view app="{{ app }}" error="{{ message['error'] }}"></error-view>
+    <template if="{{ messageType == 'Error' }}">
+      <error-view app="{{ app }}" error="{{ message }}"></error-view>
     </template>
     <template if="{{ messageType == 'Library' }}">
       <library-view app="{{ app }}" library="{{ message }}"></library-view>
@@ -586,7 +573,7 @@
       <function-view app="{{ app }}" function="{{ message }}"></function-view>
     </template>
     <template if="{{ messageType == 'Code' }}">
-      <code-view app="{{ app }}" code="{{ message }}"></code-view>
+      <code-view app="{{ app }}" code="{{ message['code'] }}"></code-view>
     </template>
     <template if="{{ messageType == 'Script' }}">
       <script-view app="{{ app }}" script="{{ message }}"></script-view>
@@ -619,7 +606,7 @@
       </select>
       <span>methods</span>
     </div>
-    <blockquote><strong>Top Inclusive</strong></blockquote>
+    <blockquote><strong>Top Exclusive</strong></blockquote>
     <table class="table table-hover">
       <thead>
         <tr>
@@ -629,13 +616,16 @@
         </tr>
       </thead>
       <tbody>
-        <tr template="" repeat="{{ code in topInclusiveCodes }}">
-            <td>{{ codeTicks(code, true) }}</td>
-            <td>{{ codePercent(code, true) }}</td>
-            <td>{{ codeName(code) }}</td>
+        <tr template="" repeat="{{ code in topExclusiveCodes }}">
+            <td>{{ codeTicks(code, false) }}</td>
+            <td>{{ codePercent(code, false) }}</td>
+            <td>
+            <span>{{ codeName(code) }}</span>
+            <code-ref app="{{ app }}" ref="{{ code.codeRef }}"></code-ref>
+            </td>
         </tr>
     </tbody></table>
-    <blockquote><strong>Top Exclusive</strong></blockquote>
+    <blockquote><strong>Top Inclusive</strong></blockquote>
     <table class="table table-hover">
       <thead>
         <tr>
@@ -645,10 +635,13 @@
         </tr>
       </thead>
       <tbody>
-        <tr template="" repeat="{{ code in topExclusiveCodes }}">
-            <td>{{ codeTicks(code, false) }}</td>
-            <td>{{ codePercent(code, false) }}</td>
-            <td>{{ codeName(code) }}</td>
+        <tr template="" repeat="{{ code in topInclusiveCodes }}">
+            <td>{{ codeTicks(code, true) }}</td>
+            <td>{{ codePercent(code, true) }}</td>
+            <td>
+            <span>{{ codeName(code) }}</span>
+            <code-ref app="{{ app }}" ref="{{ code.codeRef }}"></code-ref>
+            </td>
         </tr>
     </tbody></table>
   </template>