Skip to content

Commit 4593244

Browse files
committed
Update dependencies.
1 parent 49e55d3 commit 4593244

4 files changed

Lines changed: 60 additions & 43 deletions

File tree

DEPS

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,28 @@ vars = {
4646
# updated revision list of existing dependencies. You will need to
4747
# gclient sync before and after update deps to ensure all deps are updated.
4848
# updated revision list of existing dependencies.
49-
'dart_revision': '8b036b3e63cbfb6866975f98548051f4dc156ab6',
49+
'dart_revision': '9576691c37d84d3b66a9722e4fadacc764f04b21',
5050

5151
# WARNING: DO NOT EDIT MANUALLY
5252
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
53-
'dart_ai_rev': 'fd7ce1e5b27a85a73af175d85d72f670bc453bac',
54-
'dart_binaryen_rev': '204c3f88bb2e2c92b103b0cfbf4e0a4863c12c87',
55-
'dart_boringssl_rev': '9a74210911fd45b13274f4b9784c4c6a9c6de0f0',
56-
'dart_core_rev': '5782e0c7d79146e75b170829edb38afd4d69edc5',
57-
'dart_devtools_rev': '0a0cf24dcd589e9436e266d09b6ababa09b8c70e',
58-
'dart_ecosystem_rev': '7bfb1cb1a34794f21b68f80ba1dcc0f3ce701a63',
59-
'dart_http_rev': '30013eb7bc9d7023c39efc18738cd46e00f47dc6',
60-
'dart_i18n_rev': 'de7e11b7cc231d8daf6e49dc12690d7339241691',
53+
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
54+
'dart_binaryen_rev': '604f547f5ccb51cdc02c1b12fe96a6d045c602d5',
55+
'dart_boringssl_rev': 'a1c146745137642dfb53a1ec12ebe79817b31584',
56+
'dart_core_rev': 'be0b1531c445a185d3e93887b8d0355fc766c314',
57+
'dart_devtools_rev': '23a1bf0ff30bc83b1dc16045d6d9b15da9b4bc9c',
58+
'dart_ecosystem_rev': '319ff812d463fc194999a0d4b682097450279332',
59+
'dart_http_rev': 'c140dc012da1df74b0fb99230b8736438b8eba6a',
60+
'dart_i18n_rev': '2ae32fdd9ca14ecdca77dc37787dbba3c9e2c48a',
6161
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
62-
'dart_protobuf_rev': 'd5639f45b8468fba684b076b9403ccd5f2290056',
63-
'dart_pub_rev': '26c6985c742593d081f8b58450f463a584a4203a',
62+
'dart_protobuf_rev': '84079e8b8531309e06ba7276b1c28bdca9210ad6',
63+
'dart_pub_rev': '74408212b5348003381bc63f3b59274aaa23cfa3',
6464
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
65-
'dart_tools_rev': 'fe7cd20a6cf7d9e91b174d1ba5941ef70bcd4cc4',
66-
'dart_vector_math_rev': '66d590b3cbb73397ed1b8aa87b55b2251c536008',
67-
'dart_web_rev': '94d22feda246280b39661f3b74c0ea48a25dd3e7',
68-
'dart_webdev_rev': '234e44c2ba0aa6cee5a36026538ca89457bf0d55',
69-
'dart_webdriver_rev': '9b6e829cfe4e6ca0cff7910e2ec58ed809dbc303',
70-
'dart_webkit_inspection_protocol_rev': '0f7685804d77ec02c6564d7ac1a6c8a2341c5bdf',
65+
'dart_tools_rev': '6a7dd15748e63db7d41cfee8294c54636b668f41',
66+
'dart_vector_math_rev': '7bf60fb95e0fbbd7648944071de9ab5e32ce7387',
67+
'dart_web_rev': '294391c659526ecd0392eff2ccf133b07f9e1f80',
68+
'dart_webdev_rev': 'f9a56607fac5ad0c979d2647cf11d3e3be993bf6',
69+
'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
70+
'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',
7171

7272
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
7373

@@ -205,10 +205,10 @@ deps = {
205205
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
206206

207207
'engine/src/flutter/third_party/rapidjson':
208-
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
208+
Var('flutter_git') + '/third_party/rapidjson' + '@' + '47253cab97e9cfe99dbd6b90836fc11589d7d802',
209209

210210
'engine/src/flutter/third_party/harfbuzz':
211-
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea6a172f84f2cbcfed803b5ae71064c7afb6b5c2',
211+
Var('flutter_git') + '/third_party/harfbuzz' + '@' + '49844c32a7a3f6be371355a1213c952a3f4a44e7',
212212

213213
'engine/src/flutter/third_party/libcxx':
214214
Var('llvm_git') + '/llvm-project/libcxx' + '@' + 'bd557f6f764d1e40b62528a13b124ce740624f8f',
@@ -220,7 +220,7 @@ deps = {
220220
Var('llvm_git') + '/llvm-project/libc' + '@' + '5af39a19a1ad51ce93972cdab206dcd3ff9b6afa',
221221

222222
'engine/src/flutter/third_party/icu':
223-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a86a32e67b8d1384b33f8fa48c83a6079b86f8cd',
223+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'ee5f27adc28bd3f15b2c293f726d14d2e336cbd5',
224224

225225
'engine/src/flutter/third_party/gtest-parallel':
226226
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -229,7 +229,7 @@ deps = {
229229
Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
230230

231231
'engine/src/flutter/third_party/googletest':
232-
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
232+
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + 'e9907112b47255d50b4d343e7e2160bce8dc85d1',
233233

234234
'engine/src/flutter/third_party/re2':
235235
Var('chromium_git') + '/external/github.com/google/re2' + '@' + 'c84a140c93352cdabbfb547c531be34515b12228',
@@ -249,7 +249,7 @@ deps = {
249249
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
250250

251251
'engine/src/flutter/third_party/dart/third_party/devtools':
252-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:0a0cf24dcd589e9436e266d09b6ababa09b8c70e'}]},
252+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:23a1bf0ff30bc83b1dc16045d6d9b15da9b4bc9c'}]},
253253

254254
'engine/src/flutter/third_party/dart/third_party/perfetto/src':
255255
Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
@@ -261,10 +261,10 @@ deps = {
261261
Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
262262

263263
'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
264-
Var('dart_git') + '/dart_style.git@a6b10dcc3db33597d058cdd602c6059137550b9b',
264+
Var('dart_git') + '/dart_style.git@f1d10e1e052116aeb3851f90ace55e5447b3bc21',
265265

266266
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
267-
Var('dart_git') + '/dartdoc.git@af0085039035557c792b2d08965e24c2dd342d63',
267+
Var('dart_git') + '/dartdoc.git@77a52b6125ce8cc8a88a8a399d80701254e43838',
268268

269269
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
270270
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -279,7 +279,7 @@ deps = {
279279
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
280280

281281
'engine/src/flutter/third_party/dart/third_party/pkg/native':
282-
Var('dart_git') + '/native.git@8c3f3ecd2e8f06b0922951e3d433f8754cb4dd4c',
282+
Var('dart_git') + '/native.git@2f0b168e61588a7c504cba544036be3c3b63f6e6',
283283

284284
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
285285
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -288,7 +288,7 @@ deps = {
288288
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
289289

290290
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
291-
Var('dart_git') + '/shelf.git@6e60bbeb17b2c07613fe1d6dd02ced2d05b82cc2',
291+
Var('dart_git') + '/shelf.git@74d58bc1499115f91f8120dbd08f77c83f7f343d',
292292

293293
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
294294
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -297,7 +297,7 @@ deps = {
297297
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
298298

299299
'engine/src/flutter/third_party/dart/third_party/pkg/test':
300-
Var('dart_git') + '/test.git@5adf49a2d20c9844e393152c2984b81ecfa3b6cb',
300+
Var('dart_git') + '/test.git@14f99ecdcb74778654d936ce26c70798a3b6649f',
301301

302302
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
303303
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -318,7 +318,7 @@ deps = {
318318
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
319319

320320
'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
321-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:bc20d999d68a261ae12c56bab7ba304bd0de5346'}]},
321+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:9aa7097f2e3e80647d539b5575273257e1883633'}]},
322322

323323
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
324324

engine/src/flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ config("harfbuzz_flags") {
1313
"-Wno-missing-field-initializers",
1414
"-Wno-unused-variable",
1515
"-Wno-sign-compare",
16+
17+
# Workaround for an incompatibility with current versions of Clang
18+
# (see https://github.com/harfbuzz/harfbuzz/issues/5738)
19+
"-Wno-array-bounds",
20+
21+
# Workaround for the lack of a newline at the end of some HarfBuzz
22+
# source files.
23+
"-Wno-newline-eof",
1624
]
1725
}
1826

@@ -30,6 +38,7 @@ config("harfbuzz_flags") {
3038

3139
source_set("harfbuzz_sources") {
3240
sources = [
41+
"src/OT/Var/VARC/VARC.cc",
3342
"src/hb-aat-layout.cc",
3443
"src/hb-aat-map.cc",
3544
"src/hb-blob.cc",
@@ -73,6 +82,7 @@ source_set("harfbuzz_sources") {
7382
"src/hb-ot-tag.cc",
7483
"src/hb-ot-var.cc",
7584
"src/hb-outline.cc",
85+
"src/hb-paint-bounded.cc",
7686
"src/hb-paint-extents.cc",
7787
"src/hb-paint.cc",
7888
"src/hb-set.cc",
@@ -97,6 +107,7 @@ source_set("harfbuzz_sources") {
97107

98108
source_set("harfbuzz_subset") {
99109
sources = [
110+
"src/OT/Var/VARC/VARC.cc",
100111
"src/graph/gsubgpos-context.cc",
101112
"src/hb-aat-layout.cc",
102113
"src/hb-aat-map.cc",
@@ -141,6 +152,7 @@ source_set("harfbuzz_subset") {
141152
"src/hb-ot-tag.cc",
142153
"src/hb-ot-var.cc",
143154
"src/hb-outline.cc",
155+
"src/hb-paint-bounded.cc",
144156
"src/hb-paint-extents.cc",
145157
"src/hb-paint.cc",
146158
"src/hb-set.cc",
@@ -155,7 +167,14 @@ source_set("harfbuzz_subset") {
155167
"src/hb-subset-input.cc",
156168
"src/hb-subset-instancer-iup.cc",
157169
"src/hb-subset-instancer-solver.cc",
170+
"src/hb-subset-plan-layout.cc",
171+
"src/hb-subset-plan-var.cc",
158172
"src/hb-subset-plan.cc",
173+
"src/hb-subset-table-cff.cc",
174+
"src/hb-subset-table-color.cc",
175+
"src/hb-subset-table-layout.cc",
176+
"src/hb-subset-table-other.cc",
177+
"src/hb-subset-table-var.cc",
159178
"src/hb-subset.cc",
160179
"src/hb-ucd.cc",
161180
"src/hb-unicode.cc",
@@ -174,4 +193,4 @@ source_set("harfbuzz_subset") {
174193
source_set("harfbuzz") {
175194
output_name = "harfbuzz"
176195
public_deps = [ ":harfbuzz_sources" ]
177-
}
196+
}

engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class HandleResult extends _Result {
4848
Handle get handle => _handle!;
4949

5050
@pragma('vm:entry-point')
51-
const HandleResult(final int status, [this._handle]) : super(status);
51+
const HandleResult(super.status, [this._handle]);
5252
@override
5353
String toString() => 'HandleResult(status=$status, handle=$_handle)';
5454
}
@@ -62,7 +62,7 @@ class HandlePairResult extends _Result {
6262
Handle get second => _second!;
6363

6464
@pragma('vm:entry-point')
65-
const HandlePairResult(final int status, [this._first, this._second]) : super(status);
65+
const HandlePairResult(super.status, [this._first, this._second]);
6666
@override
6767
String toString() => 'HandlePairResult(status=$status, first=$_first, second=$_second)';
6868
}
@@ -78,7 +78,7 @@ class ReadResult extends _Result {
7878
List<Handle> get handles => _handles!;
7979

8080
@pragma('vm:entry-point')
81-
const ReadResult(final int status, [this._bytes, this._numBytes, this._handles]) : super(status);
81+
const ReadResult(super.status, [this._bytes, this._numBytes, this._handles]);
8282

8383
/// Returns the bytes as a Uint8List. If status != OK this will throw
8484
/// an exception.
@@ -120,8 +120,7 @@ class ReadEtcResult extends _Result {
120120
List<HandleInfo> get handleInfos => _handleInfos!;
121121

122122
@pragma('vm:entry-point')
123-
const ReadEtcResult(final int status, [this._bytes, this._numBytes, this._handleInfos])
124-
: super(status);
123+
const ReadEtcResult(super.status, [this._bytes, this._numBytes, this._handleInfos]);
125124

126125
/// Returns the bytes as a Uint8List. If status != OK this will throw
127126
/// an exception.
@@ -145,7 +144,7 @@ class WriteResult extends _Result {
145144
int get numBytes => _numBytes!;
146145

147146
@pragma('vm:entry-point')
148-
const WriteResult(final int status, [this._numBytes]) : super(status);
147+
const WriteResult(super.status, [this._numBytes]);
149148
@override
150149
String toString() => 'WriteResult(status=$status, numBytes=$_numBytes)';
151150
}
@@ -156,7 +155,7 @@ class GetSizeResult extends _Result {
156155
int get size => _size!;
157156

158157
@pragma('vm:entry-point')
159-
const GetSizeResult(final int status, [this._size]) : super(status);
158+
const GetSizeResult(super.status, [this._size]);
160159
@override
161160
String toString() => 'GetSizeResult(status=$status, size=$_size)';
162161
}
@@ -170,7 +169,7 @@ class FromFileResult extends _Result {
170169
int get numBytes => _numBytes!;
171170

172171
@pragma('vm:entry-point')
173-
const FromFileResult(final int status, [this._handle, this._numBytes]) : super(status);
172+
const FromFileResult(super.status, [this._handle, this._numBytes]);
174173
@override
175174
String toString() => 'FromFileResult(status=$status, handle=$_handle, numBytes=$_numBytes)';
176175
}
@@ -181,7 +180,7 @@ class MapResult extends _Result {
181180
Uint8List get data => _data!;
182181

183182
@pragma('vm:entry-point')
184-
const MapResult(final int status, [this._data]) : super(status);
183+
const MapResult(super.status, [this._data]);
185184
@override
186185
String toString() => 'MapResult(status=$status, data=$_data)';
187186
}

engine/src/flutter/shell/profiling/sampling_profiler_unittest.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ TEST(SamplingProfilerTest, DeleteAfterStart) {
4949
// Ignore calls to PostTask since that would require mocking out calls to
5050
// Dart.
5151
EXPECT_CALL(*task_runner, PostDelayedTask(_, _))
52-
.WillRepeatedly(
53-
Invoke([&](const fml::closure& task, fml::TimeDelta delay) {
54-
invoke_count.fetch_add(1);
55-
thread->GetTaskRunner()->PostTask(task);
56-
}));
52+
.WillRepeatedly([&](const fml::closure& task, fml::TimeDelta delay) {
53+
invoke_count.fetch_add(1);
54+
thread->GetTaskRunner()->PostTask(task);
55+
});
5756

5857
{
5958
auto profiler = SamplingProfiler(

0 commit comments

Comments
 (0)