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

Commit f788fd3

Browse files
AthulJoseph27AthulJoseph27
committed
Merge branch 'main' into scissor
2 parents 5f66152 + 82940a9 commit f788fd3

File tree

80 files changed

+2078
-688
lines changed

Some content is hidden

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

80 files changed

+2078
-688
lines changed

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ updates:
1111
timezone: "America/Los_Angeles"
1212
labels:
1313
- "autosubmit"
14+
groups:
15+
all-github-actions:
16+
patterns: [ "*" ]
1417
ignore:
1518
# ignore patch versions, just rely on minor in order to update fewer times
1619
- dependency-name: "github/codeql-action"
1720
update-types: ["version-update:semver-minor"]
21+
1822
- package-ecosystem: "pub"
1923
directory: "/lib/web_ui"
2024
schedule:

‎DEPS‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '778b21720a61d6cce3d2e4e55424cdec49abe7cf',
17+
'skia_revision': 'ca10bc19c67e4fe43725c7572eaf745513300c9d',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,22 +56,22 @@ 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': 'ed9a5b1110aeb7495a8dbfea2e797cb3d86fff08',
59+
'dart_revision': '66ab1774bfe98537df1d4fb3ce99f357dc2d79c6',
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
6363
'dart_binaryen_rev': '93883fde36ac158fd415dcd6dbd387dcfd928d3c',
6464
'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
6565
'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
66-
'dart_core_rev': '1156cfe4abc000f173bbf826783c215ca02b2ebf',
66+
'dart_core_rev': '6af0821dd8c0ecc5c30d5e67b3c8e16e8d79cda6',
6767
'dart_devtools_rev': '3642846c465888b0c56271fe9265a0901f1803f6',
6868
'dart_http_rev': '03ced4da4fbf62b9a88cf078608cd56ee7e4e0d4',
6969
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7070
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7171
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7272
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
7373
'dart_pub_rev': '8c2e621c2403cb503cc9959be387d1061a16846a',
74-
'dart_tools_rev': 'b028012c0da60d903055d124f4a6f1ba0c63c6d9',
74+
'dart_tools_rev': '66afa68006679dcfd9cca0410f01a057ff884fa2',
7575
'dart_watcher_rev': '7a15a903f7ce0737cce7d08ff30402d41b9f7b62',
7676
'dart_web_rev': '8d243766b45c163a9d18a89de059eba24398d163',
7777
'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
@@ -875,7 +875,7 @@ deps = {
875875
'packages': [
876876
{
877877
'package': 'fuchsia/sdk/core/linux-amd64',
878-
'version': 'aLUsXLv5iMZFOgcASHyt85mUrltN-l30HDAFfAX5bAUC'
878+
'version': 'z-cm2nR0aJ4lXfwZ06yE2TbodgbSvTQLHywr_um4fpMC'
879879
}
880880
],
881881
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎analysis_options.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ linter:
221221
- unnecessary_to_list_in_spreads
222222
- unreachable_from_main
223223
- unrelated_type_equality_checks
224-
- unsafe_html
225224
- use_build_context_synchronously
226225
- use_colored_box
227226
# - use_decorated_box # leads to bugs: DecoratedBox and Container are not equivalent (Container inserts extra padding)

‎ci/builders/linux_web_engine.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
},
427427
{
428428
"dependency": "firefox",
429-
"version": "version:106.0"
429+
"version": "version:132.0"
430430
}
431431
],
432432
"tasks": [

‎ci/licenses_golden/excluded_files‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3473,6 +3473,7 @@
34733473
../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/meta.json
34743474
../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/meta.json
34753475
../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/meta.json
3476+
../../../fuchsia/sdk/linux/fidl/fuchsia.system.state/meta.json
34763477
../../../fuchsia/sdk/linux/fidl/fuchsia.test/meta.json
34773478
../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/meta.json
34783479
../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/meta.json

‎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: ad943b3dce1d3415bb8663e604f48d55
1+
Signature: 09c0464bcc5bf9f2fb6847b83d2bf985
22

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

4808-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/307869c696e8003257ca3666f3c89e22f2a379a9
4808+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/e5c2c502c8906ec80c384946a8093ca3ff89ef43
48094809
/third_party/fallback_root_certificates/
48104810

48114811
====================================================================================================

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44969,6 +44969,7 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel.cc + ../../../flu
4496944969
ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc + ../../../flutter/LICENSE
4497044970
ORIGIN: ../../../flutter/shell/platform/linux/fl_framebuffer.cc + ../../../flutter/LICENSE
4497144971
ORIGIN: ../../../flutter/shell/platform/linux/fl_framebuffer.h + ../../../flutter/LICENSE
44972+
ORIGIN: ../../../flutter/shell/platform/linux/fl_framebuffer_test.cc + ../../../flutter/LICENSE
4497244973
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc + ../../../flutter/LICENSE
4497344974
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.h + ../../../flutter/LICENSE
4497444975
ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc + ../../../flutter/LICENSE
@@ -45022,6 +45023,9 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar.cc + ../../../
4502245023
ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar_private.h + ../../../flutter/LICENSE
4502345024
ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc + ../../../flutter/LICENSE
4502445025
ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc + ../../../flutter/LICENSE
45026+
ORIGIN: ../../../flutter/shell/platform/linux/fl_pointer_manager.cc + ../../../flutter/LICENSE
45027+
ORIGIN: ../../../flutter/shell/platform/linux/fl_pointer_manager.h + ../../../flutter/LICENSE
45028+
ORIGIN: ../../../flutter/shell/platform/linux/fl_pointer_manager_test.cc + ../../../flutter/LICENSE
4502545029
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderable.cc + ../../../flutter/LICENSE
4502645030
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderable.h + ../../../flutter/LICENSE
4502745031
ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer.cc + ../../../flutter/LICENSE
@@ -47865,6 +47869,7 @@ FILE: ../../../flutter/shell/platform/linux/fl_event_channel.cc
4786547869
FILE: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc
4786647870
FILE: ../../../flutter/shell/platform/linux/fl_framebuffer.cc
4786747871
FILE: ../../../flutter/shell/platform/linux/fl_framebuffer.h
47872+
FILE: ../../../flutter/shell/platform/linux/fl_framebuffer_test.cc
4786847873
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc
4786947874
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.h
4787047875
FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc
@@ -47918,6 +47923,9 @@ FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar.cc
4791847923
FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar_private.h
4791947924
FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc
4792047925
FILE: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc
47926+
FILE: ../../../flutter/shell/platform/linux/fl_pointer_manager.cc
47927+
FILE: ../../../flutter/shell/platform/linux/fl_pointer_manager.h
47928+
FILE: ../../../flutter/shell/platform/linux/fl_pointer_manager_test.cc
4792147929
FILE: ../../../flutter/shell/platform/linux/fl_renderable.cc
4792247930
FILE: ../../../flutter/shell/platform/linux/fl_renderable.h
4792347931
FILE: ../../../flutter/shell/platform/linux/fl_renderer.cc

‎ci/licenses_golden/licenses_fuchsia‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 083db43177f6a55d45143613b261b475
1+
Signature: 9797451b5eb9741675e9c6bcb9c6163c
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk
@@ -12805,6 +12805,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl + ../..
1280512805
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/constraints.fidl + ../../../fuchsia/sdk/linux/LICENSE
1280612806
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/results.fidl + ../../../fuchsia/sdk/linux/LICENSE
1280712807
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/usages.fidl + ../../../fuchsia/sdk/linux/LICENSE
12808+
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.system.state/system-state-transition.fidl + ../../../fuchsia/sdk/linux/LICENSE
1280812809
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
1280912810
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
1281012811
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/modifiers.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -13110,6 +13111,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl
1311013111
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/constraints.fidl
1311113112
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/results.fidl
1311213113
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/usages.fidl
13114+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.system.state/system-state-transition.fidl
1311313115
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl
1311413116
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl
1311513117
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/modifiers.fidl

‎ci/licenses_golden/licenses_skia‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: b6adc2a4d15695492cf578164185a65b
1+
Signature: bb61bced6c058a190b6135031b3e6187
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -399,8 +399,6 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
399399
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
400400
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
401401
FILE: ../../../flutter/third_party/skia/package-lock.json
402-
FILE: ../../../flutter/third_party/skia/relnotes/TimerQuery.md
403-
FILE: ../../../flutter/third_party/skia/relnotes/WGLWaitSync.md
404402
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
405403
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
406404
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl

‎fml/platform/darwin/cf_utils_unittests.mm‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88

99
namespace fml {
1010

11+
// Test state used in CFTest.SupportsCustomRetainRelease.
12+
struct CFRefTestState {
13+
bool retain_called;
14+
bool release_called;
15+
};
16+
1117
// Template specialization used in CFTest.SupportsCustomRetainRelease.
1218
template <>
13-
struct CFRefTraits<int64_t> {
14-
static bool retain_called;
15-
static bool release_called;
16-
17-
static constexpr int64_t kNullValue = 0;
18-
static void Retain(int64_t instance) { retain_called = true; }
19-
static void Release(int64_t instance) { release_called = true; }
19+
struct CFRefTraits<CFRefTestState*> {
20+
static constexpr CFRefTestState* kNullValue = nullptr;
21+
static void Retain(CFRefTestState* instance) { instance->retain_called = true; }
22+
static void Release(CFRefTestState* instance) { instance->release_called = true; }
2023
};
21-
bool CFRefTraits<int64_t>::retain_called = false;
22-
bool CFRefTraits<int64_t>::release_called = false;
2324

2425
namespace testing {
2526

@@ -98,18 +99,21 @@
9899
}
99100

100101
TEST(CFTest, SupportsCustomRetainRelease) {
101-
CFRef<int64_t> ref(1);
102-
ASSERT_EQ(ref.Get(), 1);
103-
ASSERT_FALSE(CFRefTraits<int64_t>::retain_called);
104-
ASSERT_FALSE(CFRefTraits<int64_t>::release_called);
102+
CFRefTestState instance{};
103+
CFRef<CFRefTestState*> ref(&instance);
104+
ASSERT_EQ(ref.Get(), &instance);
105+
ASSERT_FALSE(instance.retain_called);
106+
ASSERT_FALSE(instance.release_called);
105107
ref.Reset();
106-
ASSERT_EQ(ref.Get(), 0);
107-
ASSERT_TRUE(CFRefTraits<int64_t>::release_called);
108-
ref.Retain(2);
109-
ASSERT_EQ(ref.Get(), 2);
110-
ASSERT_TRUE(CFRefTraits<int64_t>::retain_called);
111-
CFRefTraits<int64_t>::retain_called = false;
112-
CFRefTraits<int64_t>::release_called = false;
108+
ASSERT_EQ(ref.Get(), nullptr);
109+
ASSERT_FALSE(instance.retain_called);
110+
ASSERT_TRUE(instance.release_called);
111+
112+
CFRefTestState other_instance{};
113+
ref.Retain(&other_instance);
114+
ASSERT_EQ(ref.Get(), &other_instance);
115+
ASSERT_TRUE(other_instance.retain_called);
116+
ASSERT_FALSE(other_instance.release_called);
113117
}
114118

115119
} // namespace testing

0 commit comments

Comments
 (0)