Skip to content

Commit 5e69b88

Browse files
mkustermannkjlubick
authored andcommitted
Use utf8.encode() instead of longer const Utf8Encoder.convert() (flutter#43675)
The change in [0] has propagated now everywhere, so we can use `utf8.encode()` instead of the longer `const Utf8Encoder.convert()`. Also it cleans up code like ``` Uint8List bytes; bytes.buffer.asByteData(); ``` as that is not guaranteed to be correct, the correct version would be ``` Uint8List bytes; bytes.buffer.asByteData(bytes.offsetInBytes, bytes.length); ``` a shorter hand for that is: ``` Uint8List bytes; ByteData.sublistView(bytes); ``` [0] dart-lang/sdk#52801
1 parent b8b4b0b commit 5e69b88

File tree

22 files changed

+41
-49
lines changed

22 files changed

+41
-49
lines changed

lib/ui/text.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3338,7 +3338,7 @@ Future<void> loadFontFromList(Uint8List list, {String? fontFamily}) {
33383338
).then((_) => _sendFontChangeMessage());
33393339
}
33403340

3341-
final ByteData _fontChangeMessage = utf8.encoder.convert(
3341+
final ByteData _fontChangeMessage = utf8.encode(
33423342
json.encode(<String, Object?>{'type': 'fontsChange'})
33433343
).buffer.asByteData();
33443344

lib/web_ui/lib/src/engine/platform_dispatcher.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
10011001
void _setAppLifecycleState(ui.AppLifecycleState state) {
10021002
sendPlatformMessage(
10031003
'flutter/lifecycle',
1004-
Uint8List.fromList(utf8.encode(state.toString())).buffer.asByteData(),
1004+
ByteData.sublistView(utf8.encode(state.toString())),
10051005
null,
10061006
);
10071007
}

lib/web_ui/lib/src/engine/services/message_codecs.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class StringCodec implements MessageCodec<String> {
3939

4040
@override
4141
ByteData encodeMessage(String message) {
42-
final Uint8List encoded = utf8.encoder.convert(message);
42+
final Uint8List encoded = utf8.encode(message);
4343
return encoded.buffer.asByteData();
4444
}
4545
}
@@ -320,7 +320,7 @@ class StandardMessageCodec implements MessageCodec<dynamic> {
320320
}
321321
} else if (value is String) {
322322
buffer.putUint8(_valueString);
323-
final List<int> bytes = utf8.encoder.convert(value);
323+
final List<int> bytes = utf8.encode(value);
324324
writeSize(buffer, bytes.length);
325325
buffer.putUint8List(bytes as Uint8List);
326326
} else if (value is Uint8List) {

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ external void stackRestore(StackPointer pointer);
2626

2727
class StackScope {
2828
Pointer<Int8> convertStringToNative(String string) {
29-
final Utf8Encoder utf8Encoder = utf8.encoder;
30-
final Uint8List encoded = utf8Encoder.convert(string);
29+
final Uint8List encoded = utf8.encode(string);
3130
final Pointer<Int8> pointer = allocInt8Array(encoded.length + 1);
3231
for (int i = 0; i < encoded.length; i++) {
3332
pointer[i] = encoded[i];

lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class AssetManager {
9292

9393
if (response.status == 404 && asset == 'AssetManifest.json') {
9494
printWarning('Asset manifest does not exist at `$url` - ignoring.');
95-
return Uint8List.fromList(utf8.encode('{}')).buffer.asByteData();
95+
return ByteData.sublistView(utf8.encode('{}'));
9696
}
9797

9898
return (await response.payload.asByteBuffer()).asByteData();

lib/web_ui/test/canvaskit/fragment_program_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void testMain() {
186186
});
187187

188188
test('FragmentProgram can be created from JSON IPLR bundle', () {
189-
final Uint8List data = const Utf8Encoder().convert(kJsonIPLR);
189+
final Uint8List data = utf8.encode(kJsonIPLR);
190190
final CkFragmentProgram program = CkFragmentProgram.fromBytes('test', data);
191191

192192
expect(program.effect, isNotNull);

lib/web_ui/test/common/fake_asset_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class FakeAssetScope {
9090
FakeAssetManager fakeAssetManager = FakeAssetManager();
9191

9292
ByteData stringAsUtf8Data(String string) {
93-
return ByteData.view(Uint8List.fromList(utf8.encode(string)).buffer);
93+
return ByteData.sublistView(utf8.encode(string));
9494
}
9595

9696
const String ahemFontFamily = 'Ahem';

lib/web_ui/test/engine/channel_buffers_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void main() {
2323
}
2424

2525
ByteData _makeByteData(String str) {
26-
final Uint8List list = const Utf8Encoder().convert(str);
26+
final Uint8List list = utf8.encode(str);
2727
final ByteBuffer buffer = list.buffer;
2828
return ByteData.view(buffer);
2929
}

lib/web_ui/test/ui/fragment_shader_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Future<void> testMain() async {
5353
assetScope = fakeAssetManager.pushAssetScope();
5454
assetScope.setAsset(
5555
'voronoi_shader',
56-
Uint8List.fromList(utf8.encode(kVoronoiShaderSksl)).buffer.asByteData()
56+
ByteData.sublistView(utf8.encode(kVoronoiShaderSksl))
5757
);
5858
});
5959

lib/web_ui/test/ui/image_golden_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Future<void> testMain() async {
6969
assetScope = fakeAssetManager.pushAssetScope();
7070
assetScope.setAsset(
7171
'glitch_shader',
72-
Uint8List.fromList(utf8.encode(kGlitchShaderSksl)).buffer.asByteData()
72+
ByteData.sublistView(utf8.encode(kGlitchShaderSksl))
7373
);
7474
});
7575

0 commit comments

Comments
 (0)