Roll engine to b6df7a637498ca9beda1fa9cd7210e3202ea599f. (#15444)
* Roll engine to b6df7a637498ca9beda1fa9cd7210e3202ea599f.
Changes since last roll:
```
b6df7a637 Roll dart to 290c576264faa096a0b3206c71b2435309d9f904. (#4771)
a6764dbd5 Add sources for Fuchsia target. (#4763)
2d5900615 [fuchsia] Remove unused header file. (#4769)
9717063b7 Revert "Roll dart to c080951d45e79cd25df98036c4be835b284a269c. (#4767)" (#4768)
9a9814312 Roll dart to c080951d45e79cd25df98036c4be835b284a269c. (#4767)
e74e8b35c [async] Update includes of async headers to new path (#4760)
e2c4b2760 Use Dart 2 camel case constants in the engine Dart libraries (#4766)
9c1e48434 Updates for Fuchsia roll. (#4765)
14c940e27 Switch from fxl::Mutex to std::mutex (#4764)
debf82c0b Roll Garnet (#4759)
5bffdefbb Use weak pointers to the accesibility bridge from objects vended to the UIKit accessibility framework. (#4761)
```
diff --git a/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart b/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart
index b00af20..4c88623 100644
--- a/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart
+++ b/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart
@@ -36,8 +36,8 @@
fail('Expected exactly one semantics event, got ${semanticsEvents.length}');
final Duration semanticsTreeCreation = semanticsEvents.first.duration;
- final String json = JSON.encode(<String, dynamic>{'initialSemanticsTreeCreation': semanticsTreeCreation.inMilliseconds});
- new File(p.join(testOutputsDirectory, 'complex_layout_semantics_perf.json')).writeAsStringSync(json);
+ final String jsonEncoded = json.encode(<String, dynamic>{'initialSemanticsTreeCreation': semanticsTreeCreation.inMilliseconds});
+ new File(p.join(testOutputsDirectory, 'complex_layout_semantics_perf.json')).writeAsStringSync(jsonEncoded);
});
});
}
diff --git a/dev/benchmarks/microbenchmarks/lib/common.dart b/dev/benchmarks/microbenchmarks/lib/common.dart
index ca05806..2a75dc3 100644
--- a/dev/benchmarks/microbenchmarks/lib/common.dart
+++ b/dev/benchmarks/microbenchmarks/lib/common.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'package:meta/meta.dart';
@@ -54,7 +54,7 @@
for (_BenchmarkResult result in _results) {
results[result.name] = result.value;
}
- return JSON.encode(results);
+ return json.encode(results);
}
String _printPlainText() {
diff --git a/dev/bots/analyze-sample-code.dart b/dev/bots/analyze-sample-code.dart
index 085c108..a8038c5 100644
--- a/dev/bots/analyze-sample-code.dart
+++ b/dev/bots/analyze-sample-code.dart
@@ -172,7 +172,7 @@
workingDirectory: temp.path,
);
stderr.addStream(process.stderr);
- final List<String> errors = await process.stdout.transform<String>(UTF8.decoder).transform<String>(const LineSplitter()).toList();
+ final List<String> errors = await process.stdout.transform<String>(utf8.decoder).transform<String>(const LineSplitter()).toList();
if (errors.first == 'Building flutter tool...')
errors.removeAt(0);
if (errors.first.startsWith('Running "flutter packages get" in '))
diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
index 0f1c055..4622b04 100644
--- a/dev/bots/prepare_package.dart
+++ b/dev/bots/prepare_package.dart
@@ -170,7 +170,7 @@
throw new ProcessRunnerException(
message, new ProcessResult(0, exitCode, null, 'returned $exitCode'));
}
- return UTF8.decoder.convert(output).trim();
+ return utf8.decoder.convert(output).trim();
}
}
diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index 5ede8e9..78d53a3 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -290,8 +290,8 @@
final Future<List<List<int>>> savedStderr = process.stderr.toList();
final int exitCode = await process.exitCode;
final EvalResult result = new EvalResult(
- stdout: UTF8.decode((await savedStdout).expand((List<int> ints) => ints).toList()),
- stderr: UTF8.decode((await savedStderr).expand((List<int> ints) => ints).toList()),
+ stdout: utf8.decode((await savedStdout).expand((List<int> ints) => ints).toList()),
+ stderr: utf8.decode((await savedStderr).expand((List<int> ints) => ints).toList()),
);
if (exitCode != 0) {
@@ -341,8 +341,8 @@
final int exitCode = await process.exitCode;
if ((exitCode == 0) == expectFailure) {
if (!printOutput) {
- print(UTF8.decode((await savedStdout).expand((List<int> ints) => ints).toList()));
- print(UTF8.decode((await savedStderr).expand((List<int> ints) => ints).toList()));
+ print(utf8.decode((await savedStdout).expand((List<int> ints) => ints).toList()));
+ print(utf8.decode((await savedStderr).expand((List<int> ints) => ints).toList()));
}
print(
'$red━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━$reset\n'
diff --git a/dev/devicelab/bin/tasks/commands_test.dart b/dev/devicelab/bin/tasks/commands_test.dart
index 0dd2d6f..53837cf 100644
--- a/dev/devicelab/bin/tasks/commands_test.dart
+++ b/dev/devicelab/bin/tasks/commands_test.dart
@@ -30,7 +30,7 @@
);
final StreamController<String> stdout = new StreamController<String>.broadcast();
run.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('run:stdout: $line');
@@ -44,7 +44,7 @@
}
});
run.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('run:stderr: $line');
@@ -112,13 +112,13 @@
<String>['drive', '--use-existing-app', 'http://127.0.0.1:$vmServicePort/', '--keep-app-running', '--driver', 'test_driver/commands_${name}_test.dart'],
);
drive.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('drive:stdout: $line');
});
drive.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('drive:stderr: $line');
diff --git a/dev/devicelab/bin/tasks/dartdocs.dart b/dev/devicelab/bin/tasks/dartdocs.dart
index d795e86..a2d0833 100644
--- a/dev/devicelab/bin/tasks/dartdocs.dart
+++ b/dev/devicelab/bin/tasks/dartdocs.dart
@@ -21,7 +21,7 @@
int publicMembers = 0;
int otherErrors = 0;
int otherLines = 0;
- await for (String entry in analysis.stderr.transform(UTF8.decoder).transform(const LineSplitter())) {
+ await for (String entry in analysis.stderr.transform(utf8.decoder).transform(const LineSplitter())) {
print('analyzer stderr: $entry');
if (entry.startsWith('[lint] Document all public members')) {
publicMembers += 1;
@@ -33,7 +33,7 @@
otherLines += 1;
}
}
- await for (String entry in analysis.stdout.transform(UTF8.decoder).transform(const LineSplitter())) {
+ await for (String entry in analysis.stdout.transform(utf8.decoder).transform(const LineSplitter())) {
print('analyzer stdout: $entry');
if (entry == 'Building flutter tool...') {
// ignore this line
diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart
index aeb5e9f..269a13b 100644
--- a/dev/devicelab/bin/tasks/routing_test.dart
+++ b/dev/devicelab/bin/tasks/routing_test.dart
@@ -37,7 +37,7 @@
<String>['run', '--verbose', '-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
);
run.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('run:stdout: $line');
@@ -50,7 +50,7 @@
}
});
run.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('run:stderr: $line');
@@ -65,13 +65,13 @@
<String>['drive', '--use-existing-app', 'http://127.0.0.1:$vmServicePort/', '--no-keep-app-running', 'lib/route.dart'],
);
drive.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('drive:stdout: $line');
});
drive.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('drive:stderr: $line');
diff --git a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
index ce4b89a..1704fcb 100644
--- a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
+++ b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
@@ -17,7 +17,7 @@
Map<String, dynamic> parseFlutterResponse(String line) {
if (line.startsWith('[') && line.endsWith(']')) {
try {
- return JSON.decode(line)[0];
+ return json.decode(line)[0];
} catch (e) {
// Not valid JSON, so likely some other output that was surrounded by [brackets]
return null;
@@ -27,7 +27,7 @@
}
Stream<String> transformToLines(Stream<List<int>> byteStream) {
- return byteStream.transform(UTF8.decoder).transform(const LineSplitter());
+ return byteStream.transform(utf8.decoder).transform(const LineSplitter());
}
task(() async {
@@ -99,9 +99,9 @@
'method': method,
'params': params
};
- final String json = JSON.encode(<Map<String, dynamic>>[req]);
- print('run:stdin: $json');
- run.stdin.writeln(json);
+ final String jsonEncoded = json.encode(<Map<String, dynamic>>[req]);
+ print('run:stdin: $jsonEncoded');
+ run.stdin.writeln(jsonEncoded);
final Map<String, dynamic> result = await response.future;
responseSubscription.cancel();
return result;
diff --git a/dev/devicelab/bin/tasks/service_extensions_test.dart b/dev/devicelab/bin/tasks/service_extensions_test.dart
index 9334c8d..57f7cc6 100644
--- a/dev/devicelab/bin/tasks/service_extensions_test.dart
+++ b/dev/devicelab/bin/tasks/service_extensions_test.dart
@@ -29,7 +29,7 @@
<String>['run', '--verbose', '-d', device.deviceId, 'lib/main.dart'],
);
run.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('run:stdout: $line');
@@ -42,7 +42,7 @@
}
});
run.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('run:stderr: $line');
diff --git a/dev/devicelab/bin/tasks/technical_debt__cost.dart b/dev/devicelab/bin/tasks/technical_debt__cost.dart
index 707d55c..6d902c4 100644
--- a/dev/devicelab/bin/tasks/technical_debt__cost.dart
+++ b/dev/devicelab/bin/tasks/technical_debt__cost.dart
@@ -53,7 +53,7 @@
workingDirectory: flutterDirectory.path,
);
double total = 0.0;
- await for (String entry in git.stdout.transform(UTF8.decoder).transform(const LineSplitter()))
+ await for (String entry in git.stdout.transform(utf8.decoder).transform(const LineSplitter()))
total += await findCostsForFile(new File(path.join(flutterDirectory.path, entry)));
final int gitExitCode = await git.exitCode;
if (gitExitCode != 0)
diff --git a/dev/devicelab/lib/framework/framework.dart b/dev/devicelab/lib/framework/framework.dart
index be9d26d..168d180 100644
--- a/dev/devicelab/lib/framework/framework.dart
+++ b/dev/devicelab/lib/framework/framework.dart
@@ -67,7 +67,7 @@
? new Duration(minutes: int.parse(parameters['timeoutInMinutes']))
: _kDefaultTaskTimeout;
final TaskResult result = await run(taskTimeout);
- return new ServiceExtensionResponse.result(JSON.encode(result.toJson()));
+ return new ServiceExtensionResponse.result(json.encode(result.toJson()));
});
registerExtension('ext.cocoonRunnerReady',
(String method, Map<String, String> parameters) async {
@@ -164,7 +164,7 @@
/// Constructs a successful result using JSON data stored in a file.
factory TaskResult.successFromFile(File file,
{List<String> benchmarkScoreKeys}) {
- return new TaskResult.success(JSON.decode(file.readAsStringSync()),
+ return new TaskResult.success(json.decode(file.readAsStringSync()),
benchmarkScoreKeys: benchmarkScoreKeys);
}
diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart
index 6897c31..e34e41f 100644
--- a/dev/devicelab/lib/framework/utils.dart
+++ b/dev/devicelab/lib/framework/utils.dart
@@ -238,13 +238,13 @@
final Completer<Null> stdoutDone = new Completer<Null>();
final Completer<Null> stderrDone = new Completer<Null>();
process.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stdout: $line');
}, onDone: () { stdoutDone.complete(); });
process.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stderr: $line');
@@ -274,14 +274,14 @@
final Completer<Null> stdoutDone = new Completer<Null>();
final Completer<Null> stderrDone = new Completer<Null>();
process.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stdout: $line');
output.writeln(line);
}, onDone: () { stdoutDone.complete(); });
process.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stderr: $line');
diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart
index e287f89..86146e0 100644
--- a/dev/devicelab/lib/tasks/gallery.dart
+++ b/dev/devicelab/lib/tasks/gallery.dart
@@ -50,7 +50,7 @@
// Route paths contains slashes, which Firebase doesn't accept in keys, so we
// remove them.
- final Map<String, List<int>> original = JSON.decode(file(
+ final Map<String, List<int>> original = json.decode(file(
'${galleryDirectory.path}/build/transition_durations.timeline.json')
.readAsStringSync());
final Map<String, List<int>> transitions = <String, List<int>>{};
@@ -58,7 +58,7 @@
transitions[key.replaceAll('/', '')] = original[key];
}
- final Map<String, dynamic> summary = JSON.decode(file('${galleryDirectory.path}/build/transitions.timeline_summary.json').readAsStringSync());
+ final Map<String, dynamic> summary = json.decode(file('${galleryDirectory.path}/build/transitions.timeline_summary.json').readAsStringSync());
final Map<String, dynamic> data = <String, dynamic>{
'transitions': transitions,
diff --git a/dev/devicelab/lib/tasks/hot_mode_tests.dart b/dev/devicelab/lib/tasks/hot_mode_tests.dart
index 8000ba0..cb929d8 100644
--- a/dev/devicelab/lib/tasks/hot_mode_tests.dart
+++ b/dev/devicelab/lib/tasks/hot_mode_tests.dart
@@ -48,7 +48,7 @@
final Completer<Null> stdoutDone = new Completer<Null>();
final Completer<Null> stderrDone = new Completer<Null>();
process.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
if (line.contains('\] Reloaded ')) {
@@ -74,7 +74,7 @@
stdoutDone.complete();
});
process.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stderr: $line');
@@ -86,7 +86,7 @@
<Future<Null>>[stdoutDone.future, stderrDone.future]);
await process.exitCode;
- twoReloadsData = JSON.decode(benchmarkFile.readAsStringSync());
+ twoReloadsData = json.decode(benchmarkFile.readAsStringSync());
}
benchmarkFile.deleteSync();
@@ -101,7 +101,7 @@
final Completer<Null> stdoutDone = new Completer<Null>();
final Completer<Null> stderrDone = new Completer<Null>();
process.stdout
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
if (line.contains('\] Reloaded ')) {
@@ -112,7 +112,7 @@
stdoutDone.complete();
});
process.stderr
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('stderr: $line');
@@ -125,7 +125,7 @@
await process.exitCode;
freshRestartReloadsData =
- JSON.decode(benchmarkFile.readAsStringSync());
+ json.decode(benchmarkFile.readAsStringSync());
}
});
});
diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart
index 2962a5c..7558a4d 100644
--- a/dev/devicelab/lib/tasks/microbenchmarks.dart
+++ b/dev/devicelab/lib/tasks/microbenchmarks.dart
@@ -132,7 +132,7 @@
jsonStarted = false;
processWasKilledIntentionally = true;
process.kill(ProcessSignal.SIGINT); // flutter run doesn't quit automatically
- completer.complete(JSON.decode(jsonBuf.toString()));
+ completer.complete(json.decode(jsonBuf.toString()));
return;
}
diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index dcf3a83..cdd209e 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'dart:async';
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'dart:io';
import '../framework/adb.dart';
@@ -121,7 +121,7 @@
'-d',
deviceId,
]).timeout(_startupTimeout);
- final Map<String, dynamic> data = JSON.decode(file('$testDirectory/build/start_up_info.json').readAsStringSync());
+ final Map<String, dynamic> data = json.decode(file('$testDirectory/build/start_up_info.json').readAsStringSync());
if (!reportMetrics)
return new TaskResult.success(data);
@@ -161,7 +161,7 @@
'-d',
deviceId,
]);
- final Map<String, dynamic> data = JSON.decode(file('$testDirectory/build/$timelineFileName.timeline_summary.json').readAsStringSync());
+ final Map<String, dynamic> data = json.decode(file('$testDirectory/build/$timelineFileName.timeline_summary.json').readAsStringSync());
if (data['frame_count'] < 5) {
return new TaskResult.failure(
diff --git a/dev/devicelab/lib/tasks/save_catalog_screenshots.dart b/dev/devicelab/lib/tasks/save_catalog_screenshots.dart
index 4c9a062..be3bc65 100644
--- a/dev/devicelab/lib/tasks/save_catalog_screenshots.dart
+++ b/dev/devicelab/lib/tasks/save_catalog_screenshots.dart
@@ -65,7 +65,7 @@
} else {
// TODO(hansmuller): only retry on 5xx and 429 responses
logMessage('Request to save "$name" (length ${content.length}) failed with status ${response.statusCode}, will retry');
- logMessage(await response.transform(UTF8.decoder).join());
+ logMessage(await response.transform(utf8.decoder).join());
}
return response.statusCode == HttpStatus.OK;
} on TimeoutException catch (_) {
diff --git a/dev/integration_tests/channels/lib/main.dart b/dev/integration_tests/channels/lib/main.dart
index 0042967..e1826cf 100644
--- a/dev/integration_tests/channels/lib/main.dart
+++ b/dev/integration_tests/channels/lib/main.dart
@@ -59,15 +59,15 @@
]);
static final Float64List someFloat64s =
new Float64List.fromList(<double>[
- double.NAN,
- double.NEGATIVE_INFINITY,
- -double.MAX_FINITE,
- -double.MIN_POSITIVE,
+ double.nan,
+ double.negativeInfinity,
+ -double.maxFinite,
+ -double.minPositive,
-0.0,
0.0,
- double.MIN_POSITIVE,
- double.MAX_FINITE,
- double.INFINITY,
+ double.minPositive,
+ double.maxFinite,
+ double.infinity,
]);
static final List<TestStep> steps = <TestStep>[
() => methodCallJsonSuccessHandshake(null),
diff --git a/dev/integration_tests/ui/test_driver/commands_none_test.dart b/dev/integration_tests/ui/test_driver/commands_none_test.dart
index f148155..e04e39e 100644
--- a/dev/integration_tests/ui/test_driver/commands_none_test.dart
+++ b/dev/integration_tests/ui/test_driver/commands_none_test.dart
@@ -18,6 +18,6 @@
test('check that we are in normal mode', () async {
expect(await driver.requestData('status'), 'log: paint');
- await driver.waitForAbsent(find.byType('PerformanceOverlay'), timeout: Duration.ZERO);
+ await driver.waitForAbsent(find.byType('PerformanceOverlay'), timeout: Duration.zero);
});
}
diff --git a/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart b/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart
index 91140e1..f5de335 100644
--- a/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart
+++ b/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart
@@ -18,6 +18,6 @@
test('check that we are showing the performance overlay', () async {
await driver.requestData('status'); // force a reassemble
- await driver.waitFor(find.byType('PerformanceOverlay'), timeout: Duration.ZERO);
+ await driver.waitFor(find.byType('PerformanceOverlay'), timeout: Duration.zero);
});
}
diff --git a/dev/manual_tests/lib/animated_icons.dart b/dev/manual_tests/lib/animated_icons.dart
index 6f259fa..274942c 100644
--- a/dev/manual_tests/lib/animated_icons.dart
+++ b/dev/manual_tests/lib/animated_icons.dart
@@ -53,7 +53,7 @@
title: new Text(widget.sample.description),
subtitle: new Slider(
value: progress.value,
- onChanged: (double v) { progress.animateTo(v, duration: Duration.ZERO); },
+ onChanged: (double v) { progress.animateTo(v, duration: Duration.zero); },
),
);
}
diff --git a/dev/manual_tests/lib/drag_and_drop.dart b/dev/manual_tests/lib/drag_and_drop.dart
index 71a0b73..d5a3a54 100644
--- a/dev/manual_tests/lib/drag_and_drop.dart
+++ b/dev/manual_tests/lib/drag_and_drop.dart
@@ -151,7 +151,7 @@
const DashOutlineCirclePainter();
static const int segments = 17;
- static const double deltaTheta = math.PI * 2 / segments; // radians
+ static const double deltaTheta = math.pi * 2 / segments; // radians
static const double segmentArc = deltaTheta / 2.0; // radians
static const double startOffset = 1.0; // radians
@@ -164,7 +164,7 @@
..strokeWidth = radius / 10.0;
final Path path = new Path();
final Rect box = Offset.zero & size;
- for (double theta = 0.0; theta < math.PI * 2.0; theta += deltaTheta)
+ for (double theta = 0.0; theta < math.pi * 2.0; theta += deltaTheta)
path.addArc(box, theta + startOffset, segmentArc);
canvas.drawPath(path, paint);
}
diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart
index 79387b9..c67e388 100644
--- a/dev/tools/dartdoc.dart
+++ b/dev/tools/dartdoc.dart
@@ -340,7 +340,7 @@
assert(prefix != null);
assert(filter != null);
stream
- .transform(UTF8.decoder)
+ .transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
if (!filter.any((Pattern pattern) => line.contains(pattern)))
diff --git a/dev/tools/gen_date_localizations.dart b/dev/tools/gen_date_localizations.dart
index ad46156..9fe5506 100644
--- a/dev/tools/gen_date_localizations.dart
+++ b/dev/tools/gen_date_localizations.dart
@@ -85,7 +85,7 @@
buffer.writeln('const Map<String, dynamic> dateSymbols = const <String, dynamic> {');
symbolFiles.forEach((String locale, File data) {
if (materialLocales.contains(locale))
- buffer.writeln(_jsonToMapEntry(locale, JSON.decode(data.readAsStringSync())));
+ buffer.writeln(_jsonToMapEntry(locale, json.decode(data.readAsStringSync())));
});
buffer.writeln('};');
@@ -94,7 +94,7 @@
buffer.writeln('const Map<String, Map<String, String>> datePatterns = const <String, Map<String, String>> {');
patternFiles.forEach((String locale, File data) {
if (materialLocales.contains(locale)) {
- final Map<String, dynamic> patterns = JSON.decode(data.readAsStringSync());
+ final Map<String, dynamic> patterns = json.decode(data.readAsStringSync());
buffer.writeln("'$locale': const <String, String>{");
patterns.forEach((String key, dynamic value) {
assert(value is String);
diff --git a/dev/tools/gen_localizations.dart b/dev/tools/gen_localizations.dart
index 95af9af..33c0543 100644
--- a/dev/tools/gen_localizations.dart
+++ b/dev/tools/gen_localizations.dart
@@ -37,7 +37,7 @@
// dart dev/tools/gen_localizations.dart --overwrite
// ```
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'dart:io';
import 'package:path/path.dart' as pathlib;
@@ -234,7 +234,7 @@
localeToResourceAttributes[locale] ??= <String, dynamic>{};
final Map<String, String> resources = localeToResources[locale];
final Map<String, dynamic> attributes = localeToResourceAttributes[locale];
- final Map<String, dynamic> bundle = JSON.decode(file.readAsStringSync());
+ final Map<String, dynamic> bundle = json.decode(file.readAsStringSync());
for (String key in bundle.keys) {
// The ARB file resource "attributes" for foo are called @foo.
if (key.startsWith('@'))
diff --git a/dev/tools/localizations_validator.dart b/dev/tools/localizations_validator.dart
index a0acba6..2d8f028 100644
--- a/dev/tools/localizations_validator.dart
+++ b/dev/tools/localizations_validator.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:convert' show JSON;
+import 'dart:convert' show json;
import 'dart:io';
/// Sanity checking of the @foo metadata in the English translations,
@@ -22,7 +22,7 @@
return errorMessages.toString();
}
- final Map<String, dynamic> bundle = JSON.decode(file.readAsStringSync());
+ final Map<String, dynamic> bundle = json.decode(file.readAsStringSync());
for (String atResourceId in bundle.keys) {
if (!atResourceId.startsWith('@'))
continue;
