Converted Observatory code-ref function-ref element

[email protected]

Review URL: https://codereview.chromium.org/2194383002 .

Author: B3rn475

runtime/observatory/lib/cpu_profile.dart

@@ -5,6 +5,7 @@
 library cpu_profiler;
 
 import 'dart:typed_data';
+import 'package:observatory/models.dart' as M;
 import 'package:observatory/service.dart';
 import 'package:observatory/utils.dart';
 

runtime/observatory/lib/debugger.dart

@@ -5,6 +5,7 @@
 library debugger;
 
 import 'dart:async';
+import 'package:observatory/models.dart' as M;
 import 'package:observatory/service.dart';
 
 part 'src/debugger/debugger.dart';

runtime/observatory/lib/elements.dart

@@ -5,7 +5,6 @@ export 'package:observatory/src/elements/action_link.dart';
 export 'package:observatory/src/elements/class_ref.dart';
 export 'package:observatory/src/elements/class_tree.dart';
 export 'package:observatory/src/elements/class_view.dart';
-export 'package:observatory/src/elements/code_ref.dart';
 export 'package:observatory/src/elements/code_view.dart';
 export 'package:observatory/src/elements/context_ref.dart';
 export 'package:observatory/src/elements/context_view.dart';
@@ -17,7 +16,6 @@ export 'package:observatory/src/elements/eval_link.dart';
 export 'package:observatory/src/elements/field_ref.dart';
 export 'package:observatory/src/elements/field_view.dart';
 export 'package:observatory/src/elements/flag_list.dart';
-export 'package:observatory/src/elements/function_ref.dart';
 export 'package:observatory/src/elements/function_view.dart';
 export 'package:observatory/src/elements/general_error.dart';
 export 'package:observatory/src/elements/heap_map.dart';
@@ -55,6 +53,8 @@ export 'package:observatory/src/elements/vm_view.dart';
 
 import 'dart:async';
 
+import 'package:observatory/src/elements/code_ref.dart';
+import 'package:observatory/src/elements/code_ref_wrapper.dart';
 import 'package:observatory/src/elements/containers/virtual_collection.dart';
 import 'package:observatory/src/elements/containers/virtual_tree.dart';
 import 'package:observatory/src/elements/curly_block.dart';
@@ -64,6 +64,8 @@ import 'package:observatory/src/elements/isolate_ref_wrapper.dart';
 import 'package:observatory/src/elements/nav/bar.dart';
 import 'package:observatory/src/elements/nav/class_menu.dart';
 import 'package:observatory/src/elements/nav/class_menu_wrapper.dart';
+import 'package:observatory/src/elements/function_ref.dart';
+import 'package:observatory/src/elements/function_ref_wrapper.dart';
 import 'package:observatory/src/elements/nav/isolate_menu.dart';
 import 'package:observatory/src/elements/nav/isolate_menu_wrapper.dart';
 import 'package:observatory/src/elements/nav/library_menu.dart';
@@ -92,12 +94,14 @@ import 'package:observatory/src/elements/vm_connect.dart';
 
 export 'package:observatory/src/elements/helpers/rendering_queue.dart';
 
+export 'package:observatory/src/elements/code_ref.dart';
 export 'package:observatory/src/elements/containers/virtual_collection.dart';
 export 'package:observatory/src/elements/containers/virtual_tree.dart';
 export 'package:observatory/src/elements/curly_block.dart';
 export 'package:observatory/src/elements/isolate_ref.dart';
 export 'package:observatory/src/elements/nav/bar.dart';
 export 'package:observatory/src/elements/nav/class_menu.dart';
+export 'package:observatory/src/elements/function_ref.dart';
 export 'package:observatory/src/elements/nav/isolate_menu.dart';
 export 'package:observatory/src/elements/nav/library_menu.dart';
 export 'package:observatory/src/elements/nav/menu.dart';
@@ -117,8 +121,12 @@ export 'package:observatory/src/elements/vm_connect.dart';
 // Even though this function does not invoke any asynchronous operation
 // it is marked as async to allow future backward compatible changes.
 Future initElements() async {
+  CodeRefElement.tag.ensureRegistration();
+  CodeRefElementWrapper.tag.ensureRegistration();
   CurlyBlockElement.tag.ensureRegistration();
   CurlyBlockElementWrapper.tag.ensureRegistration();
+  FunctionRefElement.tag.ensureRegistration();
+  FunctionRefElementWrapper.tag.ensureRegistration();
   IsolateRefElement.tag.ensureRegistration();
   IsolateRefElementWrapper.tag.ensureRegistration();
   NavBarElement.tag.ensureRegistration();

runtime/observatory/lib/elements.html

@@ -2,7 +2,6 @@
 <link rel="import" href="src/elements/class_ref.html">
 <link rel="import" href="src/elements/class_tree.html">
 <link rel="import" href="src/elements/class_view.html">
-<link rel="import" href="src/elements/code_ref.html">
 <link rel="import" href="src/elements/code_view.html">
 <link rel="import" href="src/elements/cpu_profile.html">
 <link rel="import" href="src/elements/debugger.html">
@@ -12,7 +11,6 @@
 <link rel="import" href="src/elements/field_ref.html">
 <link rel="import" href="src/elements/field_view.html">
 <link rel="import" href="src/elements/flag_list.html">
-<link rel="import" href="src/elements/function_ref.html">
 <link rel="import" href="src/elements/function_view.html">
 <link rel="import" href="src/elements/general_error.html">
 <link rel="import" href="src/elements/heap_map.html">

runtime/observatory/lib/mocks.dart

@@ -11,8 +11,10 @@ import 'package:observatory/models.dart' as M;
 part 'src/mocks/exceptions/connection_exception.dart';
 
 part 'src/mocks/objects/error.dart';
+part 'src/mocks/objects/code.dart';
 part 'src/mocks/objects/event.dart';
 part 'src/mocks/objects/class.dart';
+part 'src/mocks/objects/function.dart';
 part 'src/mocks/objects/isolate.dart';
 part 'src/mocks/objects/library.dart';
 part 'src/mocks/objects/notification.dart';

runtime/observatory/lib/models.dart

@@ -9,11 +9,13 @@ import 'dart:async';
 part 'src/models/exceptions.dart';
 
 part 'src/models/objects/class.dart';
+part 'src/models/objects/code.dart';
 part 'src/models/objects/breakpoint.dart';
 part 'src/models/objects/error.dart';
 part 'src/models/objects/event.dart';
 part 'src/models/objects/extension_data.dart';
 part 'src/models/objects/frame.dart';
+part 'src/models/objects/function.dart';
 part 'src/models/objects/instance.dart';
 part 'src/models/objects/isolate.dart';
 part 'src/models/objects/library.dart';

runtime/observatory/lib/src/cpu_profile/cpu_profile.dart

@@ -133,7 +133,7 @@ class FunctionCallTreeNode extends CallTreeNode {
       if (!profileCode.code.isDartCode) {
         continue;
       }
-      if (profileCode.code.kind == CodeKind.Stub) {
+      if (profileCode.code.kind == M.CodeKind.stub) {
         continue;
       }
       if (!profileCode.code.isOptimized) {
@@ -150,7 +150,7 @@ class FunctionCallTreeNode extends CallTreeNode {
       if (!profileCode.code.isDartCode) {
         continue;
       }
-      if (profileCode.code.kind == CodeKind.Stub) {
+      if (profileCode.code.kind == M.CodeKind.stub) {
         continue;
       }
       // If the code's function isn't this function.
@@ -418,9 +418,9 @@ class ProfileCode {
 
     code.profile = this;
 
-    if (code.kind == CodeKind.Stub) {
+    if (code.kind == M.CodeKind.stub) {
       attributes.add('stub');
-    } else if (code.kind == CodeKind.Dart) {
+    } else if (code.kind == M.CodeKind.dart) {
       if (code.isNative) {
         attributes.add('ffi');  // Not to be confused with a C function.
       } else {
@@ -434,9 +434,9 @@ class ProfileCode {
       } else {
         attributes.add('unoptimized');
       }
-    } else if (code.kind == CodeKind.Tag) {
+    } else if (code.kind == M.CodeKind.tag) {
       attributes.add('tag');
-    } else if (code.kind == CodeKind.Native) {
+    } else if (code.kind == M.CodeKind.native) {
       attributes.add('native');
     }
     inclusiveTicks = int.parse(data['inclusiveTicks']);
@@ -537,7 +537,7 @@ class ProfileFunction {
   // Does this function have an unoptimized version of itself?
   bool hasUnoptimizedCode() {
     for (var profileCode in profileCodes) {
-      if (profileCode.code.kind == CodeKind.Stub) {
+      if (profileCode.code.kind == M.CodeKind.stub) {
         continue;
       }
       if (!profileCode.code.isDartCode) {
@@ -553,7 +553,7 @@ class ProfileFunction {
   // Has this function been inlined in another function?
   bool isInlined() {
     for (var profileCode in profileCodes) {
-      if (profileCode.code.kind == CodeKind.Stub) {
+      if (profileCode.code.kind == M.CodeKind.stub) {
         continue;
       }
       if (!profileCode.code.isDartCode) {
@@ -568,13 +568,13 @@ class ProfileFunction {
   }
 
   void _addKindBasedAttributes(Set<String> attribs) {
-    if (function.kind == FunctionKind.kTag) {
+    if (function.kind == M.FunctionKind.tag) {
       attribs.add('tag');
-    } else if (function.kind == FunctionKind.kStub) {
+    } else if (function.kind == M.FunctionKind.stub) {
       attribs.add('stub');
-    } else if (function.kind == FunctionKind.kNative) {
+    } else if (function.kind == M.FunctionKind.native) {
       attribs.add('native');
-    } else if (function.kind.isSynthetic()) {
+    } else if (M.isSyntheticFunction(function.kind)) {
       attribs.add('synthetic');
     } else if (function.isNative) {
       attribs.add('ffi');  // Not to be confused with a C function.

runtime/observatory/lib/src/debugger/debugger_location.dart

@@ -233,7 +233,7 @@ class DebuggerLocation {
         for (var cls in classes) {
           assert(cls.loaded);
           for (var function in cls.functions) {
-            if (function.kind == FunctionKind.kConstructor) {
+            if (function.kind == M.FunctionKind.constructor) {
               // Constructor names are class-qualified.
               if (match.group(0) == function.name) {
                 functions.add(function);
@@ -314,7 +314,7 @@ class DebuggerLocation {
         var completions = [];
         for (var cls in classes) {
           for (var function in cls.functions) {
-            if (function.kind == FunctionKind.kConstructor) {
+            if (function.kind == M.FunctionKind.constructor) {
               if (function.name.startsWith(match.group(0))) {
                 completions.add(function.name);
               }

runtime/observatory/lib/src/elements/class_ref.dart

@@ -33,4 +33,4 @@ class ClassRefElement extends ServiceRefElement {
       onDone();
     }
   }
-}
+}

runtime/observatory/lib/src/elements/class_view.html

@@ -4,7 +4,6 @@
 <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="instance_ref.html">
 <link rel="import" href="library_ref.html">
 <link rel="import" href="script_inset.html">