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

Commit 0a71d74

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/master' into canvaskit-halfleading
2 parents 5b8818f + ccaae8d commit 0a71d74

File tree

126 files changed

+3271
-1413
lines changed

Some content is hidden

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

126 files changed

+3271
-1413
lines changed

‎BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ group("flutter") {
5252

5353
# Flutter SDK artifacts should only be built when either doing host builds, or
5454
# for cross-compiled desktop targets.
55-
build_engine_artifacts =
56-
current_toolchain == host_toolchain || (is_linux && !is_chromeos)
55+
build_engine_artifacts = current_toolchain == host_toolchain ||
56+
(is_linux && !is_chromeos) || is_mac
5757

5858
# If enbaled, compile the SDK / snapshot.
5959
if (!is_fuchsia) {

‎DEPS‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': 'c36aae31a4460481b511620a41fc6f2a95c9bcd0',
30+
'skia_revision': 'adadb95a9f1ef21ccc5264c7d0bdc83b56cf91e9',
3131

3232
# When updating the Dart revision, ensure that all entries that are
3333
# dependencies of Dart are also updated to match the entries in the
3434
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
3535
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3636
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3737
# updated revision list of existing dependencies.
38-
'dart_revision': '0546ef6899755508e538916245ff069e5266d4b5',
38+
'dart_revision': 'b8f4018535fa792891e2add3a475f35e3ec156ab',
3939

4040
# WARNING: DO NOT EDIT MANUALLY
4141
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -45,7 +45,7 @@ vars = {
4545
'dart_collection_rev': '9967dcd3d7645db6de48d5abfab3018bb0c84236',
4646
'dart_http_throttle_tag': '1.0.2',
4747
'dart_intl_tag': '0.17.0-nullsafety',
48-
'dart_linter_tag': '1.3.0',
48+
'dart_linter_tag': '1.4.0',
4949
'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
5050
'dart_pub_rev': '0e657414a472e74ca5dd76ae0db50cc060251dec',
5151
'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
@@ -154,7 +154,7 @@ deps = {
154154
Var('dart_git') + '/args.git@d8fea36c10ef96797be02e3d132d572445cd86f4',
155155

156156
'src/third_party/dart/third_party/pkg/async':
157-
Var('dart_git') + '/async.git@376c0fe95fa6fe7a5a6c41ef7b4585085c826f89',
157+
Var('dart_git') + '/async.git@cde00b89bd3c19e877b21de2c02282d4d311d0a5',
158158

159159
'src/third_party/dart/third_party/pkg/bazel_worker':
160160
Var('dart_git') + '/bazel_worker.git@0885637b037979afbf5bcd05fd748b309fd669c0',
@@ -205,10 +205,10 @@ deps = {
205205
Var('dart_git') + '/html.git@00cd3c22dac0e68e6ed9e7e4945101aedb1b3109',
206206

207207
'src/third_party/dart/third_party/pkg/http':
208-
Var('dart_git') + '/http.git@69d6064dd92470ed7ccd50a808fc789ee7716fe8',
208+
Var('dart_git') + '/http.git@abb2bb182fbd7f03aafd1f889b902d7b3bdb8769',
209209

210210
'src/third_party/dart/third_party/pkg/http_multi_server':
211-
Var('dart_git') + '/http_multi_server.git@7aca9e87d4a68374b685334f20359320054b8d7b',
211+
Var('dart_git') + '/http_multi_server.git@de1b312164c24a1690b46c6e97bd47eff40c4649',
212212

213213
'src/third_party/dart/third_party/pkg/http_parser':
214214
Var('dart_git') + '/http_parser.git@7720bfd42a0c096734c5213478fdce92c62f0293',
@@ -307,7 +307,7 @@ deps = {
307307
Var('dart_git') + '/term_glyph.git@6a0f9b6fb645ba75e7a00a4e20072678327a0347',
308308

309309
'src/third_party/dart/third_party/pkg/test':
310-
Var('dart_git') + '/test.git@e673623f45d75ccec750d35271b0b4d1423e9fac',
310+
Var('dart_git') + '/test.git@433f1d8726f9c1484007588470b17830a5e97a12',
311311

312312
'src/third_party/dart/third_party/pkg/test_reflective_loader':
313313
Var('dart_git') + '/test_reflective_loader.git@54e930a11c372683792e22bddad79197728c91ce',
@@ -322,7 +322,7 @@ deps = {
322322
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
323323

324324
'src/third_party/dart/third_party/pkg/web_socket_channel':
325-
Var('dart_git') + '/web_socket_channel.git@d3e100de8feb0283a04732366bb591ebd2282d7d',
325+
Var('dart_git') + '/web_socket_channel.git@6448ce532445a8a458fa191d9346df071ae0acad',
326326

327327
'src/third_party/dart/third_party/pkg/yaml':
328328
Var('dart_git') + '/yaml.git@b4c4411631bda556ce9a45af1ab0eecaf9f3ac53',
@@ -537,7 +537,7 @@ deps = {
537537
'packages': [
538538
{
539539
'package': 'fuchsia/sdk/core/mac-amd64',
540-
'version': 'RgZnCZ5ngRYrcqEqhl3vMA5K2V4E09fR4SX6z-_oR5oC'
540+
'version': 'uQgs5ZmFqGbZ6sZiLo5xCug5EzVsRqfvxYNOD2dE9jYC'
541541
}
542542
],
543543
'condition': 'host_os == "mac"',

‎ci/firebase_testlab.sh‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,18 @@ if [[ ! -f "$APP" ]]; then
1818
fi
1919

2020
GIT_REVISION="${2:-$(git rev-parse HEAD)}"
21-
BUILD_ID="${3:-$CIRRUS_BUILD_ID}"
22-
23-
if [[ -n $GCLOUD_FIREBASE_TESTLAB_KEY ]]; then
24-
# New contributors will not have permissions to run this test - they won't be
25-
# able to access the service account information. We should just mark the test
26-
# as passed - it will run fine on post submit, where it will still catch
27-
# failures.
28-
# We can also still make sure that building a release app bundle still works.
29-
if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then
30-
echo "This user does not have permission to run this test."
31-
exit 0
32-
fi
33-
34-
echo "$GCLOUD_FIREBASE_TESTLAB_KEY" > "${HOME}/gcloud-service-key.json"
35-
gcloud auth activate-service-account --key-file="${HOME}/gcloud-service-key.json"
36-
fi
21+
BUILD_ID="${3:-$SWARMING_TASK_ID}"
3722

3823
# Run the test.
3924
# game-loop tests are meant for OpenGL apps.
4025
# This type of test will give the application a handle to a file, and
4126
# we'll write the timeline JSON to that file.
4227
# See https://firebase.google.com/docs/test-lab/android/game-loop
28+
# Pixel 4. As of this commit, this is a highly available device in FTL.
4329
gcloud --project flutter-infra firebase test android run \
4430
--type game-loop \
4531
--app "$APP" \
4632
--timeout 2m \
4733
--results-bucket=gs://flutter_firebase_testlab \
4834
--results-dir="engine_scenario_test/$GIT_REVISION/$BUILD_ID" \
49-
--no-auto-google-login
35+
--device model=flame,version=29

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
482482
FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_canvas.dart
483483
FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_renderer.dart
484484
FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
485+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart
485486
FILE: ../../../flutter/lib/web_ui/lib/src/engine/frame_reference.dart
486487
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
487488
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/canvas.dart
@@ -495,12 +496,14 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/painting.dart
495496
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/conic.dart
496497
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart
497498
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path.dart
499+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_iterator.dart
498500
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
499501
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart
500502
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
501503
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart
502504
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart
503505
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart
506+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart
504507
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/picture.dart
505508
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
506509
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
@@ -1111,6 +1114,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterView
11111114
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Info.plist
11121115
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.h
11131116
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.mm
1117+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegateTest.mm
11141118
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
11151119
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
11161120
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm
@@ -1147,6 +1151,8 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeybo
11471151
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
11481152
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerUnittests.mm
11491153
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMacOSExternalTexture.h
1154+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.h
1155+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.mm
11501156
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRenderer.h
11511157
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRenderer.mm
11521158
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRendererTest.mm
@@ -1372,6 +1378,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h
13721378
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/logging.h
13731379
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
13741380
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h
1381+
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc
1382+
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h
13751383
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc
13761384
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.h
13771385
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.cc

0 commit comments

Comments
 (0)