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

Commit 3a10d3f

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/master' into ios-floating-cursor-fix
2 parents d19cb61 + df26ebc commit 3a10d3f

64 files changed

Lines changed: 2133 additions & 1004 deletions

File tree

Some content is hidden

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

‎.ci.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ targets:
3030
builder: Linux Fuchsia FEMU
3131
scheduler: luci
3232

33+
- name: Linux Framework Smoke Tests
34+
builder: Linux Framework Smoke Tests
35+
scheduler: luci
36+
3337
- name: Linux Host Engine
3438
builder: Linux Host Engine
3539
scheduler: luci

‎DEPS‎

Lines changed: 7 additions & 7 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': 'e5240a24987b1f7df1f445480c3ad3856a7813af',
30+
'skia_revision': '890498e3d73014e81ae15a250e5ed658f1cf11a6',
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': '23230583a210fc0c7863c4b6dcffa3241aaf7347',
38+
'dart_revision': '069554af24d699c588cfaa2f29ebdc17fb2eb5b0',
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
@@ -48,7 +48,7 @@ vars = {
4848
'dart_intl_tag': '0.17.0-nullsafety',
4949
'dart_linter_tag': '1.4.0',
5050
'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
51-
'dart_pub_rev': '00c00e8adf9706bebe8f94483b7663c5f36f59d2',
51+
'dart_pub_rev': 'def32ceb1d660552eaec24839d377199aea5a569',
5252
'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
5353
'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
5454
'dart_shelf_proxy_tag': 'v1.0.0',
@@ -98,7 +98,7 @@ allowed_hosts = [
9898
]
9999

100100
deps = {
101-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd86d028552a050f25fb25bf9163f7df0cee9f9a4',
101+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ff1975def53bfdaa1ff3f4b0cceabf54e1323392',
102102

103103
# Fuchsia compatibility
104104
#
@@ -553,7 +553,7 @@ deps = {
553553
'packages': [
554554
{
555555
'package': 'fuchsia/third_party/clang/linux-amd64',
556-
'version': 'zRvL_ACCGLlvQyyLi6bT_5kSLvVhxlGr3sepp98wsqAC'
556+
'version': 'aUPvom0rfD2jLssugLimJkywf60eqgg9CG0Vk6-ASuUC'
557557
}
558558
],
559559
'condition': 'host_os == "linux"',
@@ -579,7 +579,7 @@ deps = {
579579
'packages': [
580580
{
581581
'package': 'fuchsia/sdk/core/mac-amd64',
582-
'version': 'OB7ucXyBdGpjfTn9GhPZfYPLRunOcg_fiTo5f5r6a4EC'
582+
'version': '5c4YB-7_rKXvMfedW8WXTUct15-kAGFGgg74XYAFg7MC'
583583
}
584584
],
585585
'condition': 'host_os == "mac"',
@@ -589,7 +589,7 @@ deps = {
589589
'packages': [
590590
{
591591
'package': 'fuchsia/sdk/core/linux-amd64',
592-
'version': 'x9gmyu-IUQsSwoEeRGHsJMS4xu4XSjo0rHnTFDVhdK4C'
592+
'version': 'Y13BYMF29W-Zpih9AwTvd1wEN5GkFYwLX7p-JHbjw_oC'
593593
}
594594
],
595595
'condition': 'host_os == "linux"',

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ FILE: ../../../flutter/lib/ui/painting/shader.cc
393393
FILE: ../../../flutter/lib/ui/painting/shader.h
394394
FILE: ../../../flutter/lib/ui/painting/single_frame_codec.cc
395395
FILE: ../../../flutter/lib/ui/painting/single_frame_codec.h
396+
FILE: ../../../flutter/lib/ui/painting/single_frame_codec_unittests.cc
396397
FILE: ../../../flutter/lib/ui/painting/vertices.cc
397398
FILE: ../../../flutter/lib/ui/painting/vertices.h
398399
FILE: ../../../flutter/lib/ui/painting/vertices_unittests.cc

‎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: 71121815d510887eeea602cc22b309e3
1+
Signature: 795d86f76da81f7d690ed8255ae2571d
22

33
UNUSED LICENSES:
44

‎ci/licenses_golden/licenses_skia‎

Lines changed: 555 additions & 493 deletions
Large diffs are not rendered by default.

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 77 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d323a7b8abe5f0443ec681d2d5c89a4b
1+
Signature: f135591063158e0f44cdc1ae3fdcd6cf
22

33
UNUSED LICENSES:
44

@@ -9400,6 +9400,20 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_i
94009400
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_linux.expect
94019401
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_macos.expect
94029402
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_win.expect
9403+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_android.expect
9404+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_ios.expect
9405+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_linux.expect
9406+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_macos.expect
9407+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_android.expect
9408+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_ios.expect
9409+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_linux.expect
9410+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_android.expect
9411+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_linux.expect
9412+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_win.expect
9413+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_ios.expect
9414+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_linux.expect
9415+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_macos.expect
9416+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_win.expect
94039417
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_android.expect
94049418
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_ios.expect
94059419
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_linux.expect
@@ -9874,6 +9888,68 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
98749888
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
98759889
====================================================================================================
98769890

9891+
====================================================================================================
9892+
LIBRARY: dart
9893+
ORIGIN: ../../../third_party/dart/benchmarks/DartCLIStartup/dart/DartCLIStartup.dart + ../../../third_party/dart/LICENSE
9894+
TYPE: LicenseType.bsd
9895+
FILE: ../../../third_party/dart/benchmarks/DartCLIStartup/dart/DartCLIStartup.dart
9896+
FILE: ../../../third_party/dart/benchmarks/DartCLIStartup/dart2/DartCLIStartup.dart
9897+
FILE: ../../../third_party/dart/benchmarks/MapLookup/dart/MapLookup.dart
9898+
FILE: ../../../third_party/dart/benchmarks/MapLookup/dart/maps.dart
9899+
FILE: ../../../third_party/dart/benchmarks/MapLookup/dart2/MapLookup.dart
9900+
FILE: ../../../third_party/dart/benchmarks/MapLookup/dart2/maps.dart
9901+
FILE: ../../../third_party/dart/benchmarks/MapLookup/generate_maps.dart
9902+
FILE: ../../../third_party/dart/benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart
9903+
FILE: ../../../third_party/dart/benchmarks/SDKArtifactSizes/dart2/SDKArtifactSizes.dart
9904+
FILE: ../../../third_party/dart/runtime/bin/abstract_socket_test.cc
9905+
FILE: ../../../third_party/dart/runtime/bin/utils.cc
9906+
FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.cc
9907+
FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.h
9908+
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/range.h
9909+
FILE: ../../../third_party/dart/runtime/vm/compiler/relocation_test.cc
9910+
FILE: ../../../third_party/dart/runtime/vm/heap/safepoint_test.cc
9911+
FILE: ../../../third_party/dart/runtime/vm/pending_deopts.cc
9912+
FILE: ../../../third_party/dart/runtime/vm/pending_deopts.h
9913+
FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.cc
9914+
FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.h
9915+
FILE: ../../../third_party/dart/samples/ffi/resource_management/arena_test.dart
9916+
FILE: ../../../third_party/dart/samples/ffi/resource_management/utf8_helpers.dart
9917+
FILE: ../../../third_party/dart/samples_2/ffi/resource_management/arena_test.dart
9918+
FILE: ../../../third_party/dart/samples_2/ffi/resource_management/utf8_helpers.dart
9919+
FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/late_helper.dart
9920+
FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_allocation_patch.dart
9921+
FILE: ../../../third_party/dart/sdk/lib/ffi/allocation.dart
9922+
FILE: ../../../third_party/dart/sdk/lib/ffi/union.dart
9923+
----------------------------------------------------------------------------------------------------
9924+
Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file
9925+
for details. All rights reserved.
9926+
9927+
Redistribution and use in source and binary forms, with or without
9928+
modification, are permitted provided that the following conditions are
9929+
met:
9930+
* Redistributions of source code must retain the above copyright
9931+
notice, this list of conditions and the following disclaimer.
9932+
* Redistributions in binary form must reproduce the above
9933+
copyright notice, this list of conditions and the following
9934+
disclaimer in the documentation and/or other materials provided
9935+
with the distribution.
9936+
* Neither the name of Google LLC nor the names of its
9937+
contributors may be used to endorse or promote products derived
9938+
from this software without specific prior written permission.
9939+
9940+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9941+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9942+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9943+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9944+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9945+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9946+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9947+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9948+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9949+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9950+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9951+
====================================================================================================
9952+
98779953
====================================================================================================
98789954
LIBRARY: dart
98799955
ORIGIN: ../../../third_party/dart/benchmarks/Dynamic/dart/Dynamic.dart + ../../../third_party/dart/LICENSE
@@ -11876,58 +11952,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1187611952
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1187711953
====================================================================================================
1187811954

11879-
====================================================================================================
11880-
LIBRARY: dart
11881-
ORIGIN: ../../../third_party/dart/runtime/bin/utils.cc + ../../../third_party/dart/LICENSE
11882-
TYPE: LicenseType.bsd
11883-
FILE: ../../../third_party/dart/runtime/bin/utils.cc
11884-
FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.cc
11885-
FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.h
11886-
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/range.h
11887-
FILE: ../../../third_party/dart/runtime/vm/compiler/relocation_test.cc
11888-
FILE: ../../../third_party/dart/runtime/vm/heap/safepoint_test.cc
11889-
FILE: ../../../third_party/dart/runtime/vm/pending_deopts.cc
11890-
FILE: ../../../third_party/dart/runtime/vm/pending_deopts.h
11891-
FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.cc
11892-
FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.h
11893-
FILE: ../../../third_party/dart/samples/ffi/resource_management/arena_test.dart
11894-
FILE: ../../../third_party/dart/samples/ffi/resource_management/utf8_helpers.dart
11895-
FILE: ../../../third_party/dart/samples_2/ffi/resource_management/arena_test.dart
11896-
FILE: ../../../third_party/dart/samples_2/ffi/resource_management/utf8_helpers.dart
11897-
FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/late_helper.dart
11898-
FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_allocation_patch.dart
11899-
FILE: ../../../third_party/dart/sdk/lib/ffi/allocation.dart
11900-
FILE: ../../../third_party/dart/sdk/lib/ffi/union.dart
11901-
----------------------------------------------------------------------------------------------------
11902-
Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file
11903-
for details. All rights reserved.
11904-
11905-
Redistribution and use in source and binary forms, with or without
11906-
modification, are permitted provided that the following conditions are
11907-
met:
11908-
* Redistributions of source code must retain the above copyright
11909-
notice, this list of conditions and the following disclaimer.
11910-
* Redistributions in binary form must reproduce the above
11911-
copyright notice, this list of conditions and the following
11912-
disclaimer in the documentation and/or other materials provided
11913-
with the distribution.
11914-
* Neither the name of Google LLC nor the names of its
11915-
contributors may be used to endorse or promote products derived
11916-
from this software without specific prior written permission.
11917-
11918-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
11919-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
11920-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
11921-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
11922-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
11923-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
11924-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
11925-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
11926-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
11927-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
11928-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11929-
====================================================================================================
11930-
1193111955
====================================================================================================
1193211956
LIBRARY: dart
1193311957
ORIGIN: ../../../third_party/dart/runtime/lib/class_id.cc + ../../../third_party/dart/LICENSE

‎fml/thread_local.cc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ void* ThreadLocalPointer::get() const {
2525

2626
void* ThreadLocalPointer::swap(void* ptr) {
2727
void* old_ptr = get();
28-
FML_CHECK(pthread_setspecific(key_, ptr) == 0);
28+
int err = pthread_setspecific(key_, ptr);
29+
if (err) {
30+
FML_CHECK(false) << "pthread_setspecific failed (" << err
31+
<< "): " << strerror(err);
32+
}
2933
return old_ptr;
3034
}
3135

‎lib/ui/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ if (enable_unittests) {
203203
"painting/image_encoding_unittests.cc",
204204
"painting/image_generator_registry_unittests.cc",
205205
"painting/path_unittests.cc",
206+
"painting/single_frame_codec_unittests.cc",
206207
"painting/vertices_unittests.cc",
207208
"window/platform_configuration_unittests.cc",
208209
"window/pointer_data_packet_converter_unittests.cc",

‎lib/ui/fixtures/ui_test.dart‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ import 'dart:ui';
99

1010
void main() {}
1111

12+
@pragma('vm:entry-point')
13+
Future<void> createSingleFrameCodec() async {
14+
final ImmutableBuffer buffer = await ImmutableBuffer.fromUint8List(Uint8List.fromList(List<int>.filled(4, 100)));
15+
final ImageDescriptor descriptor = ImageDescriptor.raw(
16+
buffer,
17+
width: 1,
18+
height: 1,
19+
pixelFormat: PixelFormat.rgba8888,
20+
);
21+
final Codec codec = await descriptor.instantiateCodec();
22+
_validateCodec(codec);
23+
await codec.getNextFrame();
24+
_validateCodec(codec);
25+
codec.dispose();
26+
descriptor.dispose();
27+
buffer.dispose();
28+
_finish();
29+
}
30+
void _validateCodec(Codec codec) native 'ValidateCodec';
31+
void _finish() native 'Finish';
32+
1233
@pragma('vm:entry-point')
1334
void createVertices() {
1435
const int uint16max = 65535;

0 commit comments

Comments
 (0)