Skip to content

Commit 1e9a0a8

Browse files
zijiehe-google-comzijiehe-google-com
authored
Merge branch 'master' into master
2 parents 6bf8567 + c781b31 commit 1e9a0a8

File tree

251 files changed

+8384
-2744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+8384
-2744
lines changed

‎.ci.yaml‎

Lines changed: 133 additions & 134 deletions
Large diffs are not rendered by default.

‎DEPS‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '87fbf970569b21df7ef56052d484d210f4692e0c',
17+
'skia_revision': '5cf5d0ff46d9a3f0abbf4149b125ed0aee93db91',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,26 +56,26 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '5c535a3687992623a8b8ea2c00e5844cd96eb761',
59+
'dart_revision': '8dc0ecee5adca1ee54205915a4ef66e40a21333f',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042',
64-
'dart_boringssl_rev': '34492c89a8e381e0e856a686cc71b1eb5bd728db',
64+
'dart_boringssl_rev': 'a70ec8dd2cc1816e9deadda2f6e536640380e20c',
6565
'dart_core_rev': '635dfa32c261ba078438b74de397f2207904ca78',
6666
'dart_devtools_rev': '4b7eda127290518ad9e0dea4dcb9510b6e5e4a41',
6767
'dart_ecosystem_rev': '815d4ba2e7d11f8695a26f6cbe1262e3b8ff8d0d',
6868
'dart_http_rev': '63c477b466f650e8f5505d6d78dc283c2c2f9845',
69-
'dart_i18n_rev': 'de1943629469719bf34269bf90fcdbe9334a73f3',
69+
'dart_i18n_rev': 'e44af5483a051d546716b6aa3a57e478c59a5d8d',
7070
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7171
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7373
'dart_protobuf_rev': '1aaa332af75c61ff32739821f7ec52186ff18d4c',
7474
'dart_pub_rev': 'b2c03b448a47fdd52800609b9222cd737be3a934',
7575
'dart_sync_http_rev': 'dc54465f07d9652875deeade643256dafa2fbc6c',
76-
'dart_tools_rev': '11f4cf7ee79632be370062dad67b7dd81bc28d55',
76+
'dart_tools_rev': '92f10a9ace39fceff212c64cbb2c10fae99ca7b8',
7777
'dart_vector_math_rev': '39cafd45346f355a6e4c38a17c89fcd199dc1c96',
78-
'dart_web_rev': '553c14d5365dc51433d4c3f4a04028f88a462ab8',
78+
'dart_web_rev': 'f1becf07db9faa56559d2844c3c6d430dc9b37de',
7979
'dart_webdev_rev': '5bf833d0c277a384ab8bbfc10e7d3d71b8022560',
8080
'dart_webdriver_rev': 'f52afbf72895ae980bd4129d877305c2182d6cbc',
8181
'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
@@ -328,7 +328,7 @@ deps = {
328328
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
329329

330330
'engine/src/flutter/third_party/dart/third_party/pkg/native':
331-
Var('dart_git') + '/native.git@625ed307c45925b4e216250745b15907bfa237ff',
331+
Var('dart_git') + '/native.git@b324678c5a469e933f30693e5648947d5bfd5e9e',
332332

333333
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
334334
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -346,7 +346,7 @@ deps = {
346346
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
347347

348348
'engine/src/flutter/third_party/dart/third_party/pkg/test':
349-
Var('dart_git') + '/test.git@3ac991fa5ea406474e4d8d6c823fc078a6c6c6b4',
349+
Var('dart_git') + '/test.git@c3755d8057f29318e31f55e86b3a74d1a48f5d0a',
350350

351351
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
352352
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -809,7 +809,7 @@ deps = {
809809
'packages': [
810810
{
811811
'package': 'fuchsia/sdk/core/linux-amd64',
812-
'version': 'uRZ63_whHk5Gt6MSMkuEAUwGxRR1Ue-ESkG6okXSvd0C'
812+
'version': 'SOlRUoAtzxSsarx-6jTZ97MPlUcb0RymBqTjolKQZNgC'
813813
}
814814
],
815815
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
250ee0d74817790a1008f2b0d2dbf3adab74eac1
1+
e800da7bccd954fb2f21814cb97635869bc61cb4

‎bin/internal/last_engine_commit.ps1‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Copyright 2014 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# Based on the current repository state, writes on stdout the last commit in the
6+
# git tree that edited either `DEPS` or any file in the `engine/` sub-folder,
7+
# which is used to ensure `bin/internal/engine.version` is set correctly.
8+
9+
# ---------------------------------- NOTE ---------------------------------- #
10+
#
11+
# Please keep the logic in this file consistent with the logic in the
12+
# `last_engine_commit.sh` script in the same directory to ensure that Flutter
13+
# continues to work across all platforms!
14+
#
15+
# https://github.com/flutter/flutter/blob/main/docs/tool/Engine-artifacts.md.
16+
#
17+
# Want to test this script?
18+
# $ cd dev/tools
19+
# $ dart test test/last_engine_commit_test.dart
20+
#
21+
# -------------------------------------------------------------------------- #
22+
23+
$ErrorActionPreference = "Stop"
24+
25+
$progName = Split-Path -parent $MyInvocation.MyCommand.Definition
26+
$flutterRoot = (Get-Item $progName).parent.parent.FullName
27+
28+
cmd /c "git log -1 --pretty=format:%H -- ""$(git rev-parse --show-toplevel)/DEPS"" ""$(git rev-parse --show-toplevel)/engine"""

‎bin/internal/last_engine_commit.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2014 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
# Based on the current repository state, writes on stdout the last commit in the
7+
# git tree that edited either `DEPS` or any file in the `engine/` sub-folder,
8+
# which is used to ensure `bin/internal/engine.version` is set correctly.
9+
#
10+
11+
# ---------------------------------- NOTE ---------------------------------- #
12+
#
13+
# Please keep the logic in this file consistent with the logic in the
14+
# `last_engine_commit.ps1` script in the same directory to ensure that Flutter
15+
# continues to work across all platforms!
16+
#
17+
# https://github.com/flutter/flutter/blob/main/docs/tool/Engine-artifacts.md.
18+
#
19+
# Want to test this script?
20+
# $ cd dev/tools
21+
# $ dart test test/last_engine_commit_test.dart
22+
#
23+
# -------------------------------------------------------------------------- #
24+
25+
set -e
26+
27+
FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")"
28+
29+
git log -1 --pretty=format:%H -- "$(git rev-parse --show-toplevel)/DEPS" "$(git rev-parse --show-toplevel)/engine"

‎dev/bots/analyze.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,6 +2660,7 @@ const Set<String> kExecutableAllowlist = <String>{
26602660
'bin/dart',
26612661
'bin/flutter',
26622662
'bin/flutter-dev',
2663+
'bin/internal/last_engine_commit.sh',
26632664
'bin/internal/update_dart_sdk.sh',
26642665
'bin/internal/update_engine_version.sh',
26652666
'bin/internal/content_aware_hash.sh',

‎dev/devicelab/lib/tasks/web_benchmarks.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Future<TaskResult> runWebBenchmark(WebBenchmarkOptions benchmarkOptions) async {
6767
'--web-browser-flag=--disable-translate',
6868
'--web-browser-flag=--disable-background-timer-throttling',
6969
'--web-browser-flag=--disable-backgrounding-occluded-windows',
70+
'--web-browser-flag=--disable-renderer-backgrounding',
71+
'--web-browser-flag=--headless=new',
7072
'--web-browser-flag=--no-sandbox',
7173
'--dart-define=FLUTTER_WEB_ENABLE_PROFILING=true',
7274
if (benchmarkOptions.withHotReload) '--web-experimental-hot-reload',

‎dev/integration_tests/hook_user_defines/hook/build.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'package:hooks/hooks.dart';
56
import 'package:logging/logging.dart';
6-
import 'package:native_assets_cli/native_assets_cli.dart';
77
import 'package:native_toolchain_c/native_toolchain_c.dart';
88

99
void main(List<String> args) async {

‎dev/integration_tests/hook_user_defines/pubspec.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ hooks:
1111
magic_value: 1000
1212

1313
dependencies:
14+
code_assets: 0.19.0
15+
hooks: 0.19.0
1416
logging: 1.3.0
15-
native_assets_cli: 0.18.0
16-
native_toolchain_c: 0.15.0
17+
native_toolchain_c: 0.16.0
1718

1819
async: 2.13.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1920
collection: 1.19.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +75,4 @@ dev_dependencies:
7475
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7576
yaml_edit: 2.2.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7677

77-
# PUBSPEC CHECKSUM: 63c9
78+
# PUBSPEC CHECKSUM: c6ed

‎dev/integration_tests/link_hook/hook/build.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'package:code_assets/code_assets.dart';
6+
import 'package:hooks/hooks.dart';
57
import 'package:logging/logging.dart';
6-
import 'package:native_assets_cli/code_assets.dart';
7-
import 'package:native_assets_cli/native_assets_cli.dart';
88
import 'package:native_toolchain_c/native_toolchain_c.dart';
99

1010
void main(List<String> args) async {

0 commit comments

Comments
 (0)