Skip to content

Commit b63546a

Browse files
committed
Converted Observatory function-view element
[email protected] Review URL: https://codereview.chromium.org/2291823002 .
1 parent c3c5ee8 commit b63546a

24 files changed

+461
-161
lines changed

runtime/observatory/lib/elements.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export 'package:observatory/src/elements/class_view.dart';
77
export 'package:observatory/src/elements/code_view.dart';
88
export 'package:observatory/src/elements/debugger.dart';
99
export 'package:observatory/src/elements/eval_link.dart';
10-
export 'package:observatory/src/elements/function_view.dart';
1110
export 'package:observatory/src/elements/instance_view.dart';
1211
export 'package:observatory/src/elements/isolate_reconnect.dart';
1312
export 'package:observatory/src/elements/isolate_summary.dart';
@@ -54,6 +53,7 @@ import 'package:observatory/src/elements/field_view.dart';
5453
import 'package:observatory/src/elements/flag_list.dart';
5554
import 'package:observatory/src/elements/function_ref.dart';
5655
import 'package:observatory/src/elements/function_ref_wrapper.dart';
56+
import 'package:observatory/src/elements/function_view.dart';
5757
import 'package:observatory/src/elements/general_error.dart';
5858
import 'package:observatory/src/elements/heap_map.dart';
5959
import 'package:observatory/src/elements/heap_snapshot.dart';
@@ -139,6 +139,7 @@ export 'package:observatory/src/elements/error_view.dart';
139139
export 'package:observatory/src/elements/eval_box.dart';
140140
export 'package:observatory/src/elements/field_ref.dart';
141141
export 'package:observatory/src/elements/field_view.dart';
142+
export 'package:observatory/src/elements/function_view.dart';
142143
export 'package:observatory/src/elements/flag_list.dart';
143144
export 'package:observatory/src/elements/function_ref.dart';
144145
export 'package:observatory/src/elements/general_error.dart';
@@ -217,6 +218,7 @@ Future initElements() async {
217218
FlagListElement.tag.ensureRegistration();
218219
FunctionRefElement.tag.ensureRegistration();
219220
FunctionRefElementWrapper.tag.ensureRegistration();
221+
FunctionViewElement.tag.ensureRegistration();
220222
GeneralErrorElement.tag.ensureRegistration();
221223
HeapMapElement.tag.ensureRegistration();
222224
HeapSnapshotElement.tag.ensureRegistration();

runtime/observatory/lib/elements.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<link rel="import" href="src/elements/code_view.html">
55
<link rel="import" href="src/elements/debugger.html">
66
<link rel="import" href="src/elements/eval_link.html">
7-
<link rel="import" href="src/elements/function_view.html">
87
<link rel="import" href="src/elements/instance_view.html">
98
<link rel="import" href="src/elements/isolate_summary.html">
109
<link rel="import" href="src/elements/isolate_view.html">

runtime/observatory/lib/models.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ part 'src/models/repositories/eval.dart';
5757
part 'src/models/repositories/event.dart';
5858
part 'src/models/repositories/field.dart';
5959
part 'src/models/repositories/flag.dart';
60+
part 'src/models/repositories/function.dart';
6061
part 'src/models/repositories/heap_snapshot.dart';
6162
part 'src/models/repositories/icdata.dart';
6263
part 'src/models/repositories/inbound_references.dart';

runtime/observatory/lib/repositories.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ part 'src/repositories/eval.dart';
2222
part 'src/repositories/event.dart';
2323
part 'src/repositories/field.dart';
2424
part 'src/repositories/flag.dart';
25+
part 'src/repositories/function.dart';
2526
part 'src/repositories/heap_snapshot.dart';
2627
part 'src/repositories/icdata.dart';
2728
part 'src/repositories/inbound_references.dart';

runtime/observatory/lib/src/app/page.dart

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ AllocationProfileRepository _allocationProfileRepository
99
ClassRepository _classRepository = new ClassRepository();
1010
ContextRepository _contextRepository = new ContextRepository();
1111
FieldRepository _fieldRepository = new FieldRepository();
12+
FunctionRepository _functionRepository = new FunctionRepository();
1213
HeapSnapshotRepository _heapSnapshotRepository
1314
= new HeapSnapshotRepository();
1415
ICDataRepository _icdataRepository = new ICDataRepository();
@@ -225,6 +226,20 @@ class InspectPage extends MatchingPage {
225226
_instanceRepository,
226227
queue: app.queue)
227228
];
229+
} else if (obj is ServiceFunction) {
230+
container.children = [
231+
new FunctionViewElement(app.vm, obj.isolate, obj, app.events,
232+
app.notifications,
233+
_functionRepository,
234+
_classRepository,
235+
_retainedSizeRepository,
236+
_reachableSizeRepository,
237+
_inboundReferencesRepository,
238+
_retainingPathRepository,
239+
_scriptRepository,
240+
_instanceRepository,
241+
queue: app.queue)
242+
];
228243
} else if (obj is ICData) {
229244
container.children = [
230245
new ICDataViewElement(app.vm, obj.isolate, obj, app.events,

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class FieldViewElement extends HtmlElement implements Renderable {
4141
NavRefreshElement.tag,
4242
NavNotifyElement.tag,
4343
ObjectCommonElement.tag,
44+
ScriptInsetElement.tag,
4445
SourceLinkElement.tag,
4546
ViewFooterElement.tag
4647
]);
@@ -283,10 +284,10 @@ class FieldViewElement extends HtmlElement implements Renderable {
283284

284285
Future _refresh() async {
285286
_field = await _fields.get(_isolate, _field.id);
286-
if (field.dartOwner is M.LibraryRef) {
287-
_library = field.dartOwner;
288-
} else if (field.dartOwner is M.ClassRef) {
289-
_library = (await _classes.get(_isolate, field.dartOwner.id)).library;
287+
if (_field.dartOwner is M.LibraryRef) {
288+
_library = _field.dartOwner;
289+
} else if (_field.dartOwner is M.ClassRef) {
290+
_library = (await _classes.get(_isolate, _field.dartOwner.id)).library;
290291
}
291292
_r.dirty();
292293
}

0 commit comments

Comments
 (0)