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

Commit 981f089

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Merge pull request #10 from flutter/master
update
2 parents 059291c + 99f8d00 commit 981f089

File tree

84 files changed

+2534
-1891
lines changed

Some content is hidden

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

84 files changed

+2534
-1891
lines changed

‎.cirrus.yml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def
33
web_shard_template: &WEB_SHARD_TEMPLATE
44
only_if: "changesInclude('.cirrus.yml', 'DEPS', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
55
environment:
6-
# As of March 2020, the Web shards needed 16G of RAM and 4 CPUs to run all framework tests with goldens without flaking.
6+
# As of March 2020, the Web shards needed 16G of RAM and 4 CPUs to run all framework tests with goldens without flaking.
77
CPU: 4
88
MEMORY: 16G
9+
WEB_SHARD_COUNT: 4
910
compile_host_script: |
1011
cd $ENGINE_PATH/src
1112
./flutter/tools/gn --unoptimized --full-dart-sdk
@@ -124,19 +125,7 @@ task:
124125
- name: web_tests-2-linux
125126
<< : *WEB_SHARD_TEMPLATE
126127

127-
- name: web_tests-3-linux
128-
<< : *WEB_SHARD_TEMPLATE
129-
130-
- name: web_tests-4-linux
131-
<< : *WEB_SHARD_TEMPLATE
132-
133-
- name: web_tests-5-linux
134-
<< : *WEB_SHARD_TEMPLATE
135-
136-
- name: web_tests-6-linux
137-
<< : *WEB_SHARD_TEMPLATE
138-
139-
- name: web_tests-7_last-linux # last Web shard must end with _last
128+
- name: web_tests-3_last-linux # last Web shard must end with _last
140129
<< : *WEB_SHARD_TEMPLATE
141130

142131
- name: web_engine_analysis
@@ -207,8 +196,3 @@ task:
207196
build_script: |
208197
cd $ENGINE_PATH/src/flutter
209198
./ci/build.sh
210-
- name: build_fuchsia_artifacts
211-
compile_fuchsia_script: |
212-
cd $ENGINE_PATH/src
213-
./flutter/tools/fuchsia/build_fuchsia_artifacts.py --engine-version HEAD --runtime-mode debug --no-lto --archs x64
214-
cd $ENGINE_PATH/src/flutter

‎.github/auto_assign.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ reviewers:
1717
- GaryQian
1818
- jason-simmons
1919
- iskakaushik
20-
- franciscojma86
2120
- cbracken
2221
- flar
2322

‎BUILD.gn‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# found in the LICENSE file.
44

55
import("//flutter/common/config.gni")
6+
import("//flutter/shell/platform/config.gni")
67

78
if (is_fuchsia) {
89
import("//build/fuchsia/sdk.gni")
@@ -63,10 +64,8 @@ group("flutter") {
6364
# If on the host, compile all unittests targets.
6465
if (current_toolchain == host_toolchain) {
6566
if (is_mac) {
66-
public_deps += [
67-
"//flutter/shell/platform/darwin:flutter_channels_unittests",
68-
"//flutter/shell/platform/darwin/macos:flutter_desktop_darwin_unittests",
69-
]
67+
public_deps +=
68+
[ "//flutter/shell/platform/darwin:flutter_channels_unittests" ]
7069
}
7170

7271
public_deps += [
@@ -75,29 +74,38 @@ group("flutter") {
7574
"//flutter/lib/ui:ui_unittests",
7675
"//flutter/runtime:runtime_unittests",
7776
"//flutter/shell/common:shell_unittests",
78-
"//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
79-
"//flutter/shell/platform/common/cpp:common_cpp_unittests",
80-
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
8177
"//flutter/shell/platform/embedder:embedder_unittests",
82-
"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
8378
"//flutter/testing:testing_unittests",
8479
"//flutter/third_party/txt:txt_unittests",
8580
]
8681

87-
if (is_win) {
88-
public_deps += [
89-
"//flutter/shell/platform/windows:flutter_windows_unittests",
90-
"//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows_unittests",
91-
]
92-
}
93-
9482
if (!is_win) {
9583
public_deps += [
9684
"//flutter/fml:fml_benchmarks",
9785
"//flutter/shell/common:shell_benchmarks",
9886
"//flutter/third_party/txt:txt_benchmarks",
9987
]
10088
}
89+
90+
# Unit tests for desktop embeddings should only be built if the desktop
91+
# embeddings are being built.
92+
if (enable_desktop_embeddings) {
93+
public_deps += [
94+
"//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
95+
"//flutter/shell/platform/common/cpp:common_cpp_unittests",
96+
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
97+
"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
98+
]
99+
if (is_mac) {
100+
public_deps += [ "//flutter/shell/platform/darwin/macos:flutter_desktop_darwin_unittests" ]
101+
}
102+
if (is_win) {
103+
public_deps += [
104+
"//flutter/shell/platform/windows:flutter_windows_unittests",
105+
"//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows_unittests",
106+
]
107+
}
108+
}
101109
}
102110
}
103111

‎DEPS‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': 'ad653d8378d7a17502956c4addebb68eb3129961',
29+
'skia_revision': 'efebaa2a1152d3950f252d63a619f53992366ff2',
3030

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

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -62,17 +62,16 @@ vars = {
6262
'dart_http_throttle_tag': '1.0.2',
6363
'dart_intl_tag': '0.16.1',
6464
'dart_json_rpc_2_tag': '2.0.9',
65-
'dart_linter_tag': '0.1.115',
65+
'dart_linter_tag': '0.1.114',
6666
'dart_logging_tag': '0.11.3+2',
6767
'dart_markdown_tag': '2.1.1',
6868
'dart_matcher_tag': '0.12.5',
6969
'dart_mime_tag': '0.9.6+2',
7070
'dart_mockito_tag': 'd39ac507483b9891165e422ec98d9fb480037c8b',
7171
'dart_mustache_tag': '5e81b12215566dbe2473b2afd01a8a8aedd56ad9',
7272
'dart_oauth2_tag': '1.2.1',
73-
'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc',
7473
'dart_package_config_tag': 'v1.9.2',
75-
'dart_path_tag': '1.6.2',
74+
'dart_path_tag': '1.7.0',
7675
'dart_pedantic_tag': 'v1.9.0',
7776
'dart_pool_tag': '1.3.6',
7877
'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
@@ -139,7 +138,7 @@ allowed_hosts = [
139138
]
140139

141140
deps = {
142-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '036715c76da60220b39312ea066cd65d32c2157d',
141+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1b6a1b344074a1105b2e9b1c714766bace22acd7',
143142

144143
# Fuchsia compatibility
145144
#
@@ -196,9 +195,6 @@ deps = {
196195
'src/third_party/dart/pkg/analysis_server/language_model':
197196
{'packages': [{'version': 'lIRt14qoA1Cocb8j3yw_Fx5cfYou2ddam6ArBm4AI6QC', 'package': 'dart/language_model'}], 'dep_type': 'cipd'},
198197

199-
'src/third_party/dart/third_party/observatory_pub_packages':
200-
Var('dart_git') + '/observatory_pub_packages.git' + '@' + Var('dart_observatory_pub_packages_rev'),
201-
202198
'src/third_party/dart/third_party/pkg/args':
203199
Var('dart_git') + '/args.git' + '@' + Var('dart_args_tag'),
204200

@@ -233,7 +229,7 @@ deps = {
233229
Var('dart_git') + '/dart2js_info.git' + '@' + Var('dart_dart2js_info_tag'),
234230

235231
'src/third_party/dart/third_party/pkg/dartdoc':
236-
Var('dart_git') + '/[email protected].3',
232+
Var('dart_git') + '/[email protected].4',
237233

238234
'src/third_party/dart/third_party/pkg/ffi':
239235
Var('dart_git') + '/ffi.git' + '@' + Var('dart_ffi_tag'),
@@ -538,7 +534,7 @@ deps = {
538534
'packages': [
539535
{
540536
'package': 'fuchsia/sdk/core/mac-amd64',
541-
'version': '8JtFK64mmIC2zTEj9ICMrcQBITqKDZVQluLVKczro9kC'
537+
'version': 'W1XGOOg536oZa9c08cv4pRp2Hq60gagWtr-TMSb6iN0C'
542538
}
543539
],
544540
'condition': 'host_os == "mac"',
@@ -558,7 +554,7 @@ deps = {
558554
'packages': [
559555
{
560556
'package': 'fuchsia/sdk/core/linux-amd64',
561-
'version': 'LnaL23_DpQsbnbs-byJi-UoGe1XerKCfLjb4_XkxMRoC'
557+
'version': 'PgthiSmMqgeVVi3s8ATyJ1ut411xGyk0h0lDZta1iUQC'
562558
}
563559
],
564560
'condition': 'host_os == "linux"',

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,9 @@ FILE: ../../../flutter/shell/platform/windows/keyboard_hook_handler.h
11821182
FILE: ../../../flutter/shell/platform/windows/platform_handler.cc
11831183
FILE: ../../../flutter/shell/platform/windows/platform_handler.h
11841184
FILE: ../../../flutter/shell/platform/windows/public/flutter_windows.h
1185+
FILE: ../../../flutter/shell/platform/windows/string_conversion.cc
1186+
FILE: ../../../flutter/shell/platform/windows/string_conversion.h
1187+
FILE: ../../../flutter/shell/platform/windows/string_conversion_unittests.cc
11851188
FILE: ../../../flutter/shell/platform/windows/text_input_plugin.cc
11861189
FILE: ../../../flutter/shell/platform/windows/text_input_plugin.h
11871190
FILE: ../../../flutter/shell/platform/windows/win32_flutter_window.cc

‎ci/licenses_golden/licenses_fuchsia‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: adc98c90de1d424da0f0546ff7689965
1+
Signature: ce7ff857ac8a13447faa8112735366c8
22

33
UNUSED LICENSES:
44

@@ -2674,7 +2674,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_processor.fidl
26742674
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_type.fidl
26752675
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/timeline_function.fidl
26762676
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/codec_factory.fidl
2677-
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/intent/intent_handler.fidl
26782677
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module/module_manifest.fidl
26792678
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/puppet_master.fidl
26802679
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_command.fidl
@@ -3269,6 +3268,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/activity_reporter.fidl
32693268
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/profile_provider.fidl
32703269
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/memorypressure.fidl
32713270
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session/session_restart_controller.fidl
3271+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/socket.fidl
32723272
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl
32733273
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl
32743274
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl

‎ci/licenses_golden/licenses_skia‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 2da5a3733cfc3ee9d4098855a1f98d15
1+
Signature: bfea63318cfc35e64a47648bbbffcd51
22

33
UNUSED LICENSES:
44

@@ -1070,6 +1070,8 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex
10701070
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json
10711071
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker.json
10721072
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-Shared_Docker.json
1073+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
1074+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
10731075
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm-Debug-iOS.json
10741076
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json
10751077
FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
@@ -1237,6 +1239,7 @@ FILE: ../../../third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfil
12371239
FILE: ../../../third_party/skia/infra/config/recipes.cfg
12381240
FILE: ../../../third_party/skia/infra/cross-compile/docker/cross-linux-arm64/Dockerfile
12391241
FILE: ../../../third_party/skia/infra/cts/whitelist_devices.json
1242+
FILE: ../../../third_party/skia/infra/docker/debian9/Dockerfile
12401243
FILE: ../../../third_party/skia/infra/gcc/Debian10-mips64el/Dockerfile
12411244
FILE: ../../../third_party/skia/infra/gcc/Debian10-x86/Dockerfile
12421245
FILE: ../../../third_party/skia/infra/gcc/Debian10/Dockerfile
@@ -3914,11 +3917,17 @@ FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DTypesPriv.cpp
39143917
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DUtil.cpp
39153918
FILE: ../../../third_party/skia/src/gpu/d3d/GrD3DUtil.h
39163919
FILE: ../../../third_party/skia/src/gpu/effects/GrDeviceSpaceEffect.fp
3920+
FILE: ../../../third_party/skia/src/gpu/effects/GrMatrixEffect.fp
39173921
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
39183922
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrDeviceSpaceEffect.h
3923+
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMatrixEffect.cpp
3924+
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMatrixEffect.h
3925+
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.cpp
39193926
FILE: ../../../third_party/skia/src/gpu/vk/GrVkManagedResource.h
39203927
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
39213928
FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
3929+
FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.cpp
3930+
FILE: ../../../third_party/skia/src/sksl/SkSLSampleMatrix.h
39223931
----------------------------------------------------------------------------------------------------
39233932
Copyright 2020 Google LLC
39243933

@@ -5033,6 +5042,8 @@ FILE: ../../../third_party/skia/gm/fpcoordinateoverride.cpp
50335042
FILE: ../../../third_party/skia/gm/inverseclip.cpp
50345043
FILE: ../../../third_party/skia/gm/labyrinth.cpp
50355044
FILE: ../../../third_party/skia/gm/preservefillrule.cpp
5045+
FILE: ../../../third_party/skia/gm/sample_matrix_constant.cpp
5046+
FILE: ../../../third_party/skia/gm/sample_matrix_variable.cpp
50365047
FILE: ../../../third_party/skia/gm/tilemodes_alpha.cpp
50375048
FILE: ../../../third_party/skia/include/core/SkPathTypes.h
50385049
FILE: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp
@@ -5627,6 +5638,8 @@ FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
56275638
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
56285639
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
56295640
FILE: ../../../third_party/skia/src/core/SkM44.cpp
5641+
FILE: ../../../third_party/skia/src/core/SkMarkerStack.cpp
5642+
FILE: ../../../third_party/skia/src/core/SkMarkerStack.h
56305643
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
56315644
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp
56325645
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h

0 commit comments

Comments
 (0)