Observatory: Promote function to ServiceObject

runtime/bin/vmservice/client/lib/src/elements/function_view.html

Index: runtime/bin/vmservice/client/lib/src/elements/function_view.html
diff --git a/runtime/bin/vmservice/client/lib/src/elements/function_view.html b/runtime/bin/vmservice/client/lib/src/elements/function_view.html
index 9f3607a00b33432e247a71cf9bf4304dfb557cf2..2ee7717b6e7299d601f880181cfa1d12147a5601 100644
--- a/runtime/bin/vmservice/client/lib/src/elements/function_view.html
+++ b/runtime/bin/vmservice/client/lib/src/elements/function_view.html
@@ -14,12 +14,12 @@
     <nav-bar>
       <top-nav-menu></top-nav-menu>
       <isolate-nav-menu isolate="{{ function.isolate }}"></isolate-nav-menu>
-      <template if="{{ function['owner'].serviceType == 'Class' }}">
+      <template if="{{ function.owningClass != null }}">
         <!-- TODO(turnidge): Add library nav menu here. -->
-        <class-nav-menu cls="{{ function['owner'] }}"></class-nav-menu>
+        <class-nav-menu cls="{{ function.owningClass }}"></class-nav-menu>
       </template>
-      <template if="{{ function['owner'].serviceType == 'Library' }}">
-        <library-nav-menu library="{{ function['owner'] }}"></library-nav-menu>
+      <template if="{{ function.owningLibrary != null }}">
+        <library-nav-menu library="{{ function.owningLibrary }}"></library-nav-menu>
       </template>
       <nav-menu link="{{ function.link }}" anchor="{{ function.name }}" last="{{ true }}"></nav-menu>
       <nav-refresh callback="{{ refresh }}"></nav-refresh>
@@ -27,79 +27,79 @@
     </nav-bar>
 
     <div class="content">
-      <h1>function {{ qualifiedName }}</h1>
+      <h1>function {{ function.qualifiedName }}</h1>
 
       <div class="memberList">
         <div class="memberItem">
           <div class="memberName">kind</div>
           <div class="memberValue">
-            <template if="{{ function['is_static'] }}">static</template>
-            <template if="{{ function['is_const'] }}">const</template>
-            {{ kind }}
+            <template if="{{ function.isStatic }}">static</template>
+            <template if="{{ function.isConst }}">const</template>
+            {{ function.kind.toString() }}
           </div>
         </div>
-        <template if="{{ function['parent'] != null }}">
+        <template if="{{ function.parent != null }}">
           <div class="memberItem">
             <div class="memberName">parent function</div>
             <div class="memberValue">
-              <function-ref ref="{{ function['parent'] }}"></function-ref>
+              <function-ref ref="{{ function.parent }}"></function-ref>
             </div>
           </div>
         </template>
         <div class="memberItem">
           <div class="memberName">owner</div>
           <div class="memberValue">
-            <template if="{{ function['owner'].serviceType == 'Class' }}">
-              <class-ref ref="{{ function['owner'] }}"></class-ref>
+            <template if="{{ function.owningClass != null }}">
+              <class-ref ref="{{ function.owningClass }}"></class-ref>
             </template>
-            <template if="{{ function['owner'].serviceType != 'Class' }}">
-              <library-ref ref="{{ function['owner'] }}"></library-ref>
+            <template if="{{ function.owningLibrary != null }}">
+              <library-ref ref="{{ function.owningLibrary }}"></library-ref>
             </template>
           </div>
         </div>
         <div class="memberItem">
           <div class="memberName">script</div>
           <div class="memberValue">
-            <script-ref ref="{{ function['script'] }}"
-                        pos="{{ function['tokenPos'] }}">
+            <script-ref ref="{{ function.script }}"
+                        pos="{{ function.tokenPos }}">
             </script-ref>
           </div>
         </div>
 
         <div class="memberItem">&nbsp;</div>
 
-        <template if="{{ function['code'] != null }}">
+        <template if="{{ function.code != null }}">
           <div class="memberItem">
             <div class="memberName">optimized code</div>
             <div class="memberValue">
-              <code-ref ref="{{ function['code'] }}"></code-ref>
+              <code-ref ref="{{ function.code }}"></code-ref>
             </div>
           </div>
         </template>
-        <template if="{{ function['unoptimized_code'] != null }}">
+        <template if="{{ function.unoptimizedCode != null }}">
           <div class="memberItem">
             <div class="memberName">unoptimized code</div>
             <div class="memberValue">
-              <code-ref ref="{{ function['unoptimized_code'] }}"></code-ref>
+              <code-ref ref="{{ function.unoptimizedCode }}"></code-ref>
             </div>
               <div class="memberValue">
                 <span title="This count is used to determine when a function will be optimized.  It is a combination of call counts and other factors.">
-                  (usage count: {{ function['usage_counter'] }})
+                  (usage count: {{ function.usageCounter }})
                 </span>
              </div>
            </div>
          </template>
          <div class="memberItem">
            <div class="memberName">deoptimizations</div>
-           <div class="memberValue">{{ function['deoptimizations'] }}</div>
+           <div class="memberValue">{{ function.deoptimizations }}</div>
          </div>
          <div class="memberItem">
            <div class="memberName">optimizable</div>
-           <div class="memberValue">{{ function['is_optimizable'] }}</div>
+           <div class="memberValue">{{ function.isOptimizable }}</div>
          </div>
          <div class="memberItem">
            <div class="memberName">inlinable</div>
-           <div class="memberValue">{{ function['is_inlinable'] }}</div>
+           <div class="memberValue">{{ function.isInlinable }}</div>
          </div>
          <template if="{{ function.name != function.vmName }}">
            <div class="memberItem">
@@ -111,9 +111,9 @@
     </div>
 
     <hr>
-    <script-inset script="{{ function['script'] }}"
-                  startPos="{{ function['tokenPos'] }}"
-                  endPos="{{ function['endTokenPos'] }}">
+    <script-inset script="{{ function.script }}"
+                  pos="{{ function.tokenPos }}"

[Cutch, 2014/07/09 20:43:31]

Why the rename from startPos to pos?

[Michael Lippautz (Google), 2014/07/09 21:02:11]

startPos it is.

+                  endPos="{{ function.endTokenPos }}">
     </script-inset>
 
     <br>