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

Commit be0d4e3

Browse files
committed
Merge branch 'main' into trampoline
2 parents 4b5be4f + 84a46c3 commit be0d4e3

File tree

7 files changed

+14
-20
lines changed

7 files changed

+14
-20
lines changed

DEPS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ 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': '0f61238a27b0a4c1eb5b3981bf3f8ad9572f66eb',
59+
'dart_revision': 'b937619129a4cb66b9a19c0c43fe97ef85999388',
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
@@ -72,7 +72,7 @@ vars = {
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7373
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
7474
'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
75-
'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
75+
'dart_tools_rev': '55dbd6e09042bc1b935c019d8e70b3f41e6b90ea',
7676
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
7777
'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
7878
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
@@ -386,7 +386,7 @@ deps = {
386386
Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
387387

388388
'src/flutter/third_party/dart/third_party/pkg/dartdoc':
389-
Var('dart_git') + '/dartdoc.git@1d005239cbe30bac643d7471c6bae5166dc75c8b',
389+
Var('dart_git') + '/dartdoc.git@5230f8fd10d51ef379993928ae5813bda103b78d',
390390

391391
'src/flutter/third_party/dart/third_party/pkg/file':
392392
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -401,7 +401,7 @@ deps = {
401401
Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
402402

403403
'src/flutter/third_party/dart/third_party/pkg/http':
404-
Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
404+
Var('dart_git') + '/http.git@73fce7763a40920c1ce6cb5d2258d8662813ac9d',
405405

406406
'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
407407
Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -467,7 +467,7 @@ deps = {
467467
Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',
468468

469469
'src/flutter/third_party/dart/third_party/pkg/sse':
470-
Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
470+
Var('dart_git') + '/sse.git@af2c5c572a8da6d2f7551b80d75121f2a38a4c79',
471471

472472
'src/flutter/third_party/dart/third_party/pkg/stack_trace':
473473
Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
@@ -479,7 +479,7 @@ deps = {
479479
Var('dart_git') + '/string_scanner.git@a40bbbd83f1176bcc0021b336f5841310f91d8cb',
480480

481481
'src/flutter/third_party/dart/third_party/pkg/tar':
482-
Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
482+
Var('dart_git') + '/external/github.com/simolus3/tar.git@d33204cb623b87bfe9cfc92ca37d9469feba126b',
483483

484484
'src/flutter/third_party/dart/third_party/pkg/term_glyph':
485485
Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
@@ -512,7 +512,7 @@ deps = {
512512
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
513513

514514
'src/flutter/third_party/dart/third_party/pkg/yaml':
515-
Var('dart_git') + '/yaml.git@30fd9e0cd49b2e04f74769f9b24a0300e400403e',
515+
Var('dart_git') + '/yaml.git@a645c3905fc3cc2bbd3def9879ba8dedd26e3aa5',
516516

517517
'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
518518
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -969,7 +969,7 @@ deps = {
969969
'packages': [
970970
{
971971
'package': 'fuchsia/sdk/core/linux-amd64',
972-
'version': 'PefNEmf1_cZtEGlZcuNOMmO9ELop_CUkN614w4shs44C'
972+
'version': 'ZcBsXDojTYbriHD7_tdFnYvYEM2Chtlw83h6En31_ZIC'
973973
}
974974
],
975975
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

ci/licenses_golden/licenses_dart

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

33
====================================================================================================
44
LIBRARY: dart
@@ -4773,7 +4773,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47734773
This Source Code Form is "Incompatible With Secondary Licenses", as
47744774
defined by the Mozilla Public License, v. 2.0.
47754775

4776-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/7b3c16ac1cf92b98d4e8777c75fc8a883f29f444
4776+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b937619129a4cb66b9a19c0c43fe97ef85999388
47774777
/third_party/fallback_root_certificates/
47784778

47794779
====================================================================================================

ci/licenses_golden/licenses_fuchsia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: acdee47f0d11182f1283709bb2c5f8d9
1+
Signature: 348a15be9020b1a42033718637419a1f
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk

impeller/toolkit/android/proc_table.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ namespace impeller::android {
6060
INVOKE(ASurfaceTransaction_setBuffer, 29) \
6161
INVOKE(ASurfaceTransaction_setColor, 29) \
6262
INVOKE(ASurfaceTransaction_setOnComplete, 29) \
63-
INVOKE(ASurfaceTransaction_setEnableBackPressure, 31) \
6463
INVOKE(ASurfaceTransactionStats_getPreviousReleaseFenceFd, 29) \
6564
INVOKE(ATrace_isEnabled, 23) \
6665
INVOKE(eglGetNativeClientBufferANDROID, 0)

impeller/toolkit/android/surface_control.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "impeller/toolkit/android/surface_control.h"
66

77
#include "impeller/base/validation.h"
8-
#include "impeller/toolkit/android/proc_table.h"
98
#include "impeller/toolkit/android/surface_transaction.h"
109

1110
namespace impeller::android {
@@ -50,8 +49,7 @@ bool SurfaceControl::RemoveFromParent() const {
5049

5150
bool SurfaceControl::IsAvailableOnPlatform() {
5251
return GetProcTable().IsValid() &&
53-
GetProcTable().ASurfaceControl_createFromWindow.IsAvailable() &&
54-
GetProcTable().ASurfaceTransaction_setEnableBackPressure.IsAvailable();
52+
GetProcTable().ASurfaceControl_createFromWindow.IsAvailable();
5553
}
5654

5755
} // namespace impeller::android

impeller/toolkit/android/surface_transaction.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ bool SurfaceTransaction::SetContents(const SurfaceControl* control,
5858
VALIDATION_LOG << "Invalid control or buffer.";
5959
return false;
6060
}
61-
62-
const auto& proc_table = GetProcTable();
63-
64-
proc_table.ASurfaceTransaction_setBuffer(
61+
GetProcTable().ASurfaceTransaction_setBuffer(
6562
transaction_.get(), //
6663
control->GetHandle(), //
6764
buffer->GetHandle(), //

sky/packages/sky_engine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31926,7 +31926,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
3192631926
This Source Code Form is "Incompatible With Secondary Licenses", as
3192731927
defined by the Mozilla Public License, v. 2.0.
3192831928

31929-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0f61238a27b0a4c1eb5b3981bf3f8ad9572f66eb
31929+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b937619129a4cb66b9a19c0c43fe97ef85999388
3193031930
/third_party/fallback_root_certificates/
3193131931

3193231932
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)