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

Commit d15dc76

Browse files
authored
Fix broken Chromebot build (#5018)
1 parent c17a629 commit d15dc76

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎lib/ui/painting/image_encoding.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ using tonic::DartInvoke;
2424
using tonic::DartPersistentValue;
2525
using tonic::ToDart;
2626

27+
#ifdef ERROR
28+
#undef ERROR
29+
#endif
30+
2731
namespace blink {
2832
namespace {
2933

‎testing/dart/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
.dart_tool
12
.packages
23
pubspec.lock

‎testing/dart/encoding_test.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'dart:ui';
77
import 'dart:typed_data';
88
import 'dart:io';
99

10-
import 'package:flutter_test/flutter_test.dart';
1110
import 'package:path/path.dart' as path;
11+
import 'package:test/test.dart';
1212

1313
const int _kWidth = 10;
1414
const int _kRadius = 2;
@@ -24,8 +24,9 @@ void main() {
2424
expect(new Uint8List.view(data.buffer), getExpectedBytes());
2525
});
2626

27-
test('Handles greyscale images', () async {
28-
Uint8List png = await new File('../resources/4x4.png').readAsBytes();
27+
test('Handles grayscale images', () async {
28+
File grayscaleImage = new File(path.join('flutter', 'testing', 'resources', '4x4.png'));
29+
Uint8List png = await grayscaleImage.readAsBytes();
2930
Completer<Image> completer = new Completer<Image>();
3031
decodeImageFromList(png, (Image image) => completer.complete(image));
3132
Image image = await completer.future;

‎testing/dart/pubspec.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
name: engine_tests
22
dependencies:
3-
flutter:
4-
sdk: flutter
5-
dev_dependencies:
6-
flutter_test:
7-
sdk: flutter
3+
test: any
84
path: any

0 commit comments

Comments
 (0)