Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit fd6d3b9

Browse files
timu-jesse-ezelltimu-jesse-ezell
committed
dart format
1 parent 327c164 commit fd6d3b9

File tree

2 files changed

+73
-72
lines changed

2 files changed

+73
-72
lines changed

‎lib/web_ui/lib/src/engine/renderer.dart

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import 'dart:math' as math;
77
import 'dart:typed_data';
88

99
import 'package:ui/src/engine.dart';
10-
import 'package:ui/src/engine/skwasm/skwasm_stub.dart' if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
10+
import 'package:ui/src/engine/skwasm/skwasm_stub.dart'
11+
if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
1112
import 'package:ui/ui.dart' as ui;
1213
import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
1314

@@ -103,17 +104,18 @@ abstract class Renderer {
103104
Float32List? matrix4,
104105
]);
105106

106-
ui.ImageFilter createBlurImageFilter({
107-
double sigmaX = 0.0,
108-
double sigmaY = 0.0,
109-
ui.TileMode tileMode = ui.TileMode.clamp});
110-
ui.ImageFilter createDilateImageFilter({ double radiusX = 0.0, double radiusY = 0.0});
111-
ui.ImageFilter createErodeImageFilter({ double radiusX = 0.0, double radiusY = 0.0});
112-
ui.ImageFilter createMatrixImageFilter(
113-
Float64List matrix4, {
114-
ui.FilterQuality filterQuality = ui.FilterQuality.low
115-
});
116-
ui.ImageFilter composeImageFilters({required ui.ImageFilter outer, required ui.ImageFilter inner});
107+
ui.ImageFilter createBlurImageFilter(
108+
{double sigmaX = 0.0,
109+
double sigmaY = 0.0,
110+
ui.TileMode tileMode = ui.TileMode.clamp});
111+
ui.ImageFilter createDilateImageFilter(
112+
{double radiusX = 0.0, double radiusY = 0.0});
113+
ui.ImageFilter createErodeImageFilter(
114+
{double radiusX = 0.0, double radiusY = 0.0});
115+
ui.ImageFilter createMatrixImageFilter(Float64List matrix4,
116+
{ui.FilterQuality filterQuality = ui.FilterQuality.low});
117+
ui.ImageFilter composeImageFilters(
118+
{required ui.ImageFilter outer, required ui.ImageFilter inner});
117119

118120
Future<ui.Codec> instantiateImageCodec(
119121
Uint8List list, {
@@ -129,20 +131,15 @@ abstract class Renderer {
129131

130132
FutureOr<ui.Image> createImageFromImageBitmap(DomImageBitmap imageSource);
131133

132-
ui.Image createImageFromTextureSource(Object object, { required int width, required int height });
133-
134+
ui.Image createImageFromTextureSource(Object object,
135+
{required int width, required int height});
134136

135-
void decodeImageFromPixels(
136-
Uint8List pixels,
137-
int width,
138-
int height,
139-
ui.PixelFormat format,
140-
ui.ImageDecoderCallback callback, {
141-
int? rowBytes,
142-
int? targetWidth,
143-
int? targetHeight,
144-
bool allowUpscaling = true
145-
});
137+
void decodeImageFromPixels(Uint8List pixels, int width, int height,
138+
ui.PixelFormat format, ui.ImageDecoderCallback callback,
139+
{int? rowBytes,
140+
int? targetWidth,
141+
int? targetHeight,
142+
bool allowUpscaling = true});
146143

147144
ui.ImageShader createImageShader(
148145
ui.Image image,

‎lib/web_ui/test/ui/image_golden_test.dart

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ Future<void> testMain() async {
7171
setUp(() {
7272
assetScope = fakeAssetManager.pushAssetScope();
7373
assetScope.setAsset(
74-
'glitch_shader',
75-
ByteData.sublistView(utf8.encode(kGlitchShaderSksl))
76-
);
74+
'glitch_shader', ByteData.sublistView(utf8.encode(kGlitchShaderSksl)));
7775
});
7876

7977
tearDown(() {
@@ -105,41 +103,36 @@ Future<void> testMain() async {
105103

106104
await drawPictureUsingCurrentRenderer(recorder.endRecording());
107105

108-
await matchGoldenFile('${name}_canvas_drawImage.png', region: drawRegion);
106+
await matchGoldenFile('${name}_canvas_drawImage.png',
107+
region: drawRegion);
109108
});
110109

111110
test('drawImageRect', () async {
112111
final ui.Image image = await imageGenerator();
113112

114113
final ui.PictureRecorder recorder = ui.PictureRecorder();
115114
final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
116-
canvas.drawImageRect(
117-
image,
118-
const ui.Rect.fromLTRB(50, 50, 100, 100),
119-
const ui.Rect.fromLTRB(100, 100, 150, 150),
120-
ui.Paint()
121-
);
115+
canvas.drawImageRect(image, const ui.Rect.fromLTRB(50, 50, 100, 100),
116+
const ui.Rect.fromLTRB(100, 100, 150, 150), ui.Paint());
122117

123118
await drawPictureUsingCurrentRenderer(recorder.endRecording());
124119

125-
await matchGoldenFile('${name}_canvas_drawImageRect.png', region: drawRegion);
120+
await matchGoldenFile('${name}_canvas_drawImageRect.png',
121+
region: drawRegion);
126122
});
127123

128124
test('drawImageNine', () async {
129125
final ui.Image image = await imageGenerator();
130126

131127
final ui.PictureRecorder recorder = ui.PictureRecorder();
132128
final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
133-
canvas.drawImageNine(
134-
image,
135-
const ui.Rect.fromLTRB(50, 50, 100, 100),
136-
drawRegion,
137-
ui.Paint()
138-
);
129+
canvas.drawImageNine(image, const ui.Rect.fromLTRB(50, 50, 100, 100),
130+
drawRegion, ui.Paint());
139131

140132
await drawPictureUsingCurrentRenderer(recorder.endRecording());
141133

142-
await matchGoldenFile('${name}_canvas_drawImageNine.png', region: drawRegion);
134+
await matchGoldenFile('${name}_canvas_drawImageNine.png',
135+
region: drawRegion);
143136
});
144137

145138
test('image_shader_cubic_rotated', () async {
@@ -155,19 +148,19 @@ Future<void> testMain() async {
155148
);
156149
final ui.PictureRecorder recorder = ui.PictureRecorder();
157150
final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
158-
canvas.drawOval(
159-
const ui.Rect.fromLTRB(0, 50, 300, 250),
160-
ui.Paint()..shader = shader
161-
);
151+
canvas.drawOval(const ui.Rect.fromLTRB(0, 50, 300, 250),
152+
ui.Paint()..shader = shader);
162153

163154
await drawPictureUsingCurrentRenderer(recorder.endRecording());
164-
await matchGoldenFile('${name}_image_shader_cubic_rotated.png', region: drawRegion);
155+
await matchGoldenFile('${name}_image_shader_cubic_rotated.png',
156+
region: drawRegion);
165157
});
166158

167159
test('fragment_shader_sampler', () async {
168160
final ui.Image image = await imageGenerator();
169161

170-
final ui.FragmentProgram program = await renderer.createFragmentProgram('glitch_shader');
162+
final ui.FragmentProgram program =
163+
await renderer.createFragmentProgram('glitch_shader');
171164
final ui.FragmentShader shader = program.fragmentShader();
172165

173166
// Resolution
@@ -182,11 +175,13 @@ Future<void> testMain() async {
182175

183176
final ui.PictureRecorder recorder = ui.PictureRecorder();
184177
final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
185-
canvas.drawCircle(const ui.Offset(150, 150), 100, ui.Paint()..shader = shader);
178+
canvas.drawCircle(
179+
const ui.Offset(150, 150), 100, ui.Paint()..shader = shader);
186180

187181
await drawPictureUsingCurrentRenderer(recorder.endRecording());
188182

189-
await matchGoldenFile('${name}_fragment_shader_sampler.png', region: drawRegion);
183+
await matchGoldenFile('${name}_fragment_shader_sampler.png',
184+
region: drawRegion);
190185
}, skip: isHtml); // HTML doesn't support fragment shaders
191186

192187
test('toByteData_rgba', () async {
@@ -200,7 +195,8 @@ Future<void> testMain() async {
200195
test('toByteData_png', () async {
201196
final ui.Image image = await imageGenerator();
202197

203-
final ByteData? pngData = await image.toByteData(format: ui.ImageByteFormat.png);
198+
final ByteData? pngData =
199+
await image.toByteData(format: ui.ImageByteFormat.png);
204200
expect(pngData, isNotNull);
205201
expect(pngData!.lengthInBytes, isNonZero);
206202
}, skip: isHtml); // https://github.com/flutter/flutter/issues/126611
@@ -214,19 +210,18 @@ Future<void> testMain() async {
214210
for (int x = 0; x < 15; x++) {
215211
final ui.Offset center = ui.Offset(x * 10 + 5, y * 10 + 5);
216212
final ui.Color color = ui.Color.fromRGBO(
217-
(center.dx * 256 / 150).round(),
218-
(center.dy * 256 / 150).round(), 0, 1);
213+
(center.dx * 256 / 150).round(),
214+
(center.dy * 256 / 150).round(),
215+
0,
216+
1);
219217
canvas.drawCircle(center, 5, ui.Paint()..color = color);
220218
}
221219
}
222220
return recorder.endRecording().toImage(150, 150);
223221
});
224222

225223
Uint8List generatePixelData(
226-
int width,
227-
int height,
228-
ui.Color Function(double, double) generator
229-
) {
224+
int width, int height, ui.Color Function(double, double) generator) {
230225
final Uint8List data = Uint8List(width * height * 4);
231226
int outputIndex = 0;
232227
for (int y = 0; y < height; y++) {
@@ -256,7 +251,8 @@ Future<void> testMain() async {
256251
);
257252
});
258253
final Completer<ui.Image> completer = Completer<ui.Image>();
259-
ui.decodeImageFromPixels(pixels, 150, 150, ui.PixelFormat.rgba8888, completer.complete);
254+
ui.decodeImageFromPixels(
255+
pixels, 150, 150, ui.PixelFormat.rgba8888, completer.complete);
260256
return completer.future;
261257
});
262258

@@ -289,8 +285,7 @@ Future<void> testMain() async {
289285

290286
emitImageTests('codec_uri', () async {
291287
final ui.Codec codec = await renderer.instantiateImageCodecFromUrl(
292-
Uri(path: '/test_images/mandrill_128.png')
293-
);
288+
Uri(path: '/test_images/mandrill_128.png'));
294289
expect(codec.frameCount, 1);
295290

296291
final ui.FrameInfo info = await codec.getNextFrame();
@@ -302,12 +297,14 @@ Future<void> testMain() async {
302297
if (!isFirefox) {
303298
emitImageTests('svg_image_bitmap', () async {
304299
final DomBlob svgBlob = createDomBlob(<String>[
305-
'''
300+
'''
306301
<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150">
307302
<path d="M25,75 A50,50 0 1,0 125 75 L75,25 Z" stroke="blue" stroke-width="10" fill="red"></path>
308303
</svg>
309304
'''
310-
], <String, String>{'type': 'image/svg+xml'});
305+
], <String, String>{
306+
'type': 'image/svg+xml'
307+
});
311308
final String url = domWindow.URL.createObjectURL(svgBlob);
312309
final DomHTMLImageElement image = createDomHTMLImageElement();
313310
final Completer<void> completer = Completer<void>();
@@ -324,7 +321,8 @@ Future<void> testMain() async {
324321

325322
expect(bitmap.width.toDartInt, 150);
326323
expect(bitmap.height.toDartInt, 150);
327-
final ui.Image uiImage = await renderer.createImageFromImageBitmap(bitmap);
324+
final ui.Image uiImage =
325+
await renderer.createImageFromImageBitmap(bitmap);
328326

329327
if (isSkwasm) {
330328
// Skwasm transfers the bitmap to the web worker, so it should be disposed/consumed.
@@ -340,12 +338,14 @@ Future<void> testMain() async {
340338
if (!isFirefox && !isHtml) {
341339
emitImageTests('svg_image_bitmap_texture_source', () async {
342340
final DomBlob svgBlob = createDomBlob(<String>[
343-
'''
341+
'''
344342
<svg xmlns="http://www.w3.org/2000/svg" width="150" height="150">
345343
<path d="M25,75 A50,50 0 1,0 125 75 L75,25 Z" stroke="blue" stroke-width="10" fill="red"></path>
346344
</svg>
347345
'''
348-
], <String, String>{'type': 'image/svg+xml'});
346+
], <String, String>{
347+
'type': 'image/svg+xml'
348+
});
349349
final String url = domWindow.URL.createObjectURL(svgBlob);
350350
final DomHTMLImageElement image = createDomHTMLImageElement();
351351
final Completer<void> completer = Completer<void>();
@@ -358,23 +358,27 @@ Future<void> testMain() async {
358358
image.src = url;
359359
await completer.future;
360360

361-
if(isSkwasm) {
361+
if (isSkwasm) {
362362
// Send something we can actually transfer to a worker, unfortunately we can't transfer an element.
363-
final DomImageBitmap bitmap = await createImageBitmap(image as JSObject);
363+
final DomImageBitmap bitmap =
364+
await createImageBitmap(image as JSObject);
364365
expect(bitmap.width.toDartInt, 150);
365366
expect(bitmap.height.toDartInt, 150);
366-
367-
final ui.Image uiImage = renderer.createImageFromTextureSource(bitmap, width: 150, height: 150);
367+
368+
final ui.Image uiImage = renderer.createImageFromTextureSource(bitmap,
369+
width: 150, height: 150);
368370
return uiImage;
369371
} else {
370-
final ui.Image uiImage = renderer.createImageFromTextureSource(image, width: 150, height: 150);
372+
final ui.Image uiImage = renderer.createImageFromTextureSource(image,
373+
width: 150, height: 150);
371374
return uiImage;
372375
}
373376
});
374377
}
375378

376379
emitImageTests('codec_list_resized', () async {
377-
final ByteBuffer data = await httpFetchByteBuffer('/test_images/mandrill_128.png');
380+
final ByteBuffer data =
381+
await httpFetchByteBuffer('/test_images/mandrill_128.png');
378382
final ui.Codec codec = await renderer.instantiateImageCodec(
379383
data.asUint8List(),
380384
targetWidth: 150,

0 commit comments

Comments
 (0)