Skip to content

Commit 25b40a0

Browse files
tvolkertcommit-bot@chromium.org
authored andcommitted
Update RawSocket.read to return Uint8List
Bug: #36900 Change-Id: I0940d86dadce0acd41fb639a4598ffa36569c11a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104522 Commit-Queue: Todd Volkert <[email protected]> Reviewed-by: Lasse R.H. Nielsen <[email protected]>
1 parent bd84cff commit 25b40a0

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

runtime/bin/socket_patch.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ class _NativeSocket extends _NativeSocketNativeWrapper with _ServiceObject {
665665
String get _serviceTypePath => throw new UnimplementedError();
666666
String get _serviceTypeName => throw new UnimplementedError();
667667

668-
List<int> read(int len) {
668+
Uint8List read(int len) {
669669
if (len != null && len <= 0) {
670670
throw new ArgumentError("Illegal length $len");
671671
}
@@ -1378,7 +1378,7 @@ class _RawSocket extends Stream<RawSocketEvent> implements RawSocket {
13781378

13791379
int available() => _socket.available;
13801380

1381-
List<int> read([int len]) {
1381+
Uint8List read([int len]) {
13821382
if (_isMacOSTerminalInput) {
13831383
var available = this.available();
13841384
if (available == 0) return null;

sdk/lib/io/secure_socket.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
676676
_scheduleReadEvent();
677677
}
678678

679-
List<int> read([int length]) {
679+
Uint8List read([int length]) {
680680
if (length != null && (length is! int || length < 0)) {
681681
throw new ArgumentError(
682682
"Invalid length parameter in SecureSocket.read (length: $length)");
@@ -1157,14 +1157,14 @@ class _ExternalBuffer {
11571157
return size - end;
11581158
}
11591159

1160-
List<int> read(int bytes) {
1160+
Uint8List read(int bytes) {
11611161
if (bytes == null) {
11621162
bytes = length;
11631163
} else {
11641164
bytes = min(bytes, length);
11651165
}
11661166
if (bytes == 0) return null;
1167-
List<int> result = new Uint8List(bytes);
1167+
Uint8List result = new Uint8List(bytes);
11681168
int bytesRead = 0;
11691169
// Loop over zero, one, or two linear data ranges.
11701170
while (bytesRead < bytes) {

sdk/lib/io/socket.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ abstract class RawSocket implements Stream<RawSocketEvent> {
624624
* available for immediate reading. If no data is available [:null:]
625625
* is returned.
626626
*/
627-
List<int> read([int len]);
627+
Uint8List read([int len]);
628628

629629
/**
630630
* Writes up to [count] bytes of the buffer from [offset] buffer offset to

0 commit comments

Comments
 (0)