Skip to content

Commit 6a6b9ac

Browse files
aamCommit Queue
authored andcommitted
[observatory] Migrate off dart:html to package:web.
Remove use of svg, use unicode characters instead. Run dart format on observatory sources. Sort import statements with import_sorter. No functional changes. TEST=ci, manual Change-Id: I7e4f67be06a27c8ab510ae8e50ce30b162780d30 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426683 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent 57ee563 commit 6a6b9ac

File tree

385 files changed

+7886
-6947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+7886
-6947
lines changed

runtime/observatory/bin/shell.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
library shell;
66

7-
import 'package:observatory/service_io.dart';
8-
97
import 'dart:io';
108

9+
import 'package:observatory/service_io.dart';
10+
1111
// Simple demo for service_io library. Connects to localhost on the default
1212
// port, picks the first isolate, reads requests from stdin, and prints
1313
// results to stdout. Example session:

runtime/observatory/lib/app.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@ library app;
66

77
import 'dart:async';
88
import 'dart:convert';
9-
import 'dart:html';
9+
import 'dart:js_interop';
1010

1111
import 'package:logging/logging.dart';
12-
import 'package:observatory/service_html.dart';
12+
import 'package:stack_trace/stack_trace.dart';
13+
import 'package:web/web.dart' as web;
14+
1315
import 'package:observatory/elements.dart';
14-
import 'package:observatory/src/elements/helpers/uris.dart';
1516
import 'package:observatory/event.dart';
1617
import 'package:observatory/models.dart' as M;
1718
import 'package:observatory/repositories.dart';
19+
import 'package:observatory/service_html.dart';
20+
import 'package:observatory/src/elements/helpers/element_utils.dart';
21+
import 'package:observatory/src/elements/helpers/uris.dart';
1822
import 'package:observatory/tracer.dart';
19-
import 'package:stack_trace/stack_trace.dart';
23+
import 'package:observatory/utils.dart';
2024

2125
export 'package:observatory/utils.dart';
2226

runtime/observatory/lib/debugger.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
library debugger;
66

77
import 'dart:async';
8+
89
import 'package:observatory/models.dart' as M;
910
import 'package:observatory/service.dart';
1011

runtime/observatory/lib/event.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:logging/logging.dart';
6+
67
import 'package:observatory/models.dart' as M;
78
import 'package:observatory/service.dart' as S;
89

runtime/observatory/lib/models.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
library models;
66

77
import 'dart:async';
8+
89
import 'package:observatory/object_graph.dart';
910

1011
part 'src/models/exceptions.dart';

runtime/observatory/lib/repositories.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ library repositories;
66

77
import 'dart:async';
88
import 'dart:convert';
9-
import 'dart:html';
9+
10+
import 'package:web/web.dart';
11+
1012
import 'package:observatory/allocation_profile.dart';
11-
import 'package:observatory/sample_profile.dart';
12-
import 'package:observatory/object_graph.dart';
1313
import 'package:observatory/models.dart' as M;
14+
import 'package:observatory/object_graph.dart';
15+
import 'package:observatory/sample_profile.dart';
1416
import 'package:observatory/service.dart' as S;
1517
import 'package:observatory/service_common.dart' as SC;
1618
import 'package:observatory/src/repositories/timeline_base.dart';

runtime/observatory/lib/sample_profile.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
library sample_profiler;
66

77
import 'dart:async';
8+
89
import 'package:logging/logging.dart';
10+
911
import 'package:observatory/models.dart' as M;
1012
import 'package:observatory/service.dart';
1113
import 'package:observatory/utils.dart';

runtime/observatory/lib/service.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ library service;
66

77
import 'dart:async';
88
import 'dart:convert';
9-
import 'dart:typed_data';
109
import 'dart:math' as math;
10+
import 'dart:typed_data';
1111

1212
import 'package:logging/logging.dart';
13+
1314
import 'package:observatory/event.dart' show createEventFromServiceEvent;
1415
import 'package:observatory/models.dart' as M;
1516
import 'package:observatory/object_graph.dart';

runtime/observatory/lib/service_common.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'dart:convert';
99
import 'dart:typed_data';
1010

1111
import 'package:logging/logging.dart';
12+
1213
import 'package:observatory/models.dart' as M;
1314
import 'package:observatory/service.dart';
1415

@@ -60,7 +61,7 @@ class _WebSocketRequest {
6061
: completer = new Completer<Map>();
6162
}
6263

63-
/// Minimal common interface for 'WebSocket' in [dart:io] and [dart:html].
64+
/// Minimal common interface for 'WebSocket' in [dart:io] and [package:web/web.dart].
6465
abstract class CommonWebSocket {
6566
Future<void> connect(WebSocketVMTarget target, void onOpen(),
6667
void onMessage(dynamic data), void onError(), void onClose());

runtime/observatory/lib/service_html.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
library service_html;
66

77
import 'dart:async';
8-
import 'dart:html';
98
import 'dart:typed_data';
109

10+
import 'package:web/web.dart';
11+
1112
import 'package:observatory/service_common.dart';
1213

1314
// Export the service library.
@@ -19,7 +20,7 @@ class _HtmlWebSocket implements CommonWebSocket {
1920
Future<void> connect(WebSocketVMTarget target, void onOpen(),
2021
void onMessage(dynamic data), void onError(), void onClose()) async {
2122
// The VM service will attempt to redirect our websocket connection request
22-
// to DDS, but the dart:html WebSocket doesn't follow redirects. Instead of
23+
// to DDS, but the package:web/web.dart WebSocket doesn't follow redirects. Instead of
2324
// relying on a redirect, we'll request the websocket URI from the service.
2425

2526
// TODO(bkonyi): re-enable when DDS is enabled. Currently causing Observatory
@@ -63,7 +64,7 @@ class _HtmlWebSocket implements CommonWebSocket {
6364
FileReader fileReader = new FileReader();
6465
fileReader.readAsArrayBuffer(data);
6566
return fileReader.onLoadEnd.first.then((e) {
66-
Uint8List result = fileReader.result as Uint8List;
67+
final Uint8List result = (fileReader.result as ByteBuffer).asUint8List();
6768
return new ByteData.view(
6869
result.buffer, result.offsetInBytes, result.length);
6970
});

0 commit comments

Comments
 (0)