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

Commit 728a59e

Browse files
dnfielddnfield
committed
oops
1 parent d4bee63 commit 728a59e

26 files changed

+820
-237
lines changed

‎BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ group("flutter") {
7373

7474
if (is_win) {
7575
public_deps += [
76+
"$flutter_root/shell/platform/windows:flutter_windows_unittests",
7677
"$flutter_root/shell/platform/windows/client_wrapper:client_wrapper_windows_unittests",
77-
"$flutter_root/shell/platform/windows:flutter_windows_unittests"
7878
]
7979
}
8080

‎DEPS

Lines changed: 4 additions & 4 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': '1494a7f1ec038b183ef098836d6d730874edfa1b',
29+
'skia_revision': 'e27a503a0a21af167e6a19d2e5c7b7e1039964bf',
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': 'f4a72bfc646c47a6a1639725b406a4eda19a870f',
37+
'dart_revision': '41d13f0ffe64e40a43d5c734d67dac4e870485e2',
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
@@ -538,7 +538,7 @@ deps = {
538538
'packages': [
539539
{
540540
'package': 'fuchsia/sdk/core/mac-amd64',
541-
'version': 'wuAtwlwyr9u-xSDIrdrctLM64k3lcVEq1at5lQ3uYIkC'
541+
'version': 'pczjKIhrbXb5U4vU2oMWz3-x7bpnO3U0p-CrLoBugjMC'
542542
}
543543
],
544544
'condition': 'host_os == "mac"',
@@ -558,7 +558,7 @@ deps = {
558558
'packages': [
559559
{
560560
'package': 'fuchsia/sdk/core/linux-amd64',
561-
'version': 'q_uYXhMqlw8-oc4X69GU5FPTCU_eZkt0rzAY5VY6QggC'
561+
'version': 'cknsiQFn1C-k-OjqBY6gRwSHbiMtHitEZJ1O-_vVxbgC'
562562
}
563563
],
564564
'condition': 'host_os == "linux"',

‎ci/licenses_golden/licenses_flutter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views.dart
390390
FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
391391
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
392392
FILE: ../../../flutter/lib/web_ui/lib/src/engine/recording_canvas.dart
393+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/rrect_renderer.dart
393394
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart
394395
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/checkable.dart
395396
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/image.dart

‎ci/licenses_golden/licenses_fuchsia

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9bf9df99bd1a9b84fd5f6f06ed470c9d
1+
Signature: 8f0208dac22ad8b1f0956581aa98e0ab
22

33
UNUSED LICENSES:
44

@@ -505,6 +505,8 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
505505
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.netstack/meta.json
506506
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.posix.socket/meta.json
507507
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
508+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
509+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
508510
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
509511
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
510512
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.simplecamera/meta.json
@@ -1331,6 +1333,10 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.netstack/meta.json
13311333
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.posix.socket/meta.json
13321334
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.posix.socket/socket.fidl
13331335
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
1336+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/countdown.fidl
1337+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
1338+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/factory_reset.fidl
1339+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
13341340
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
13351341
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/prediction_info.fidl
13361342
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/accessibility.fidl
@@ -2063,6 +2069,8 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
20632069
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.netstack/meta.json
20642070
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.posix.socket/meta.json
20652071
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
2072+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
2073+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
20662074
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
20672075
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
20682076
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.simplecamera/meta.json

‎ci/licenses_golden/licenses_skia

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

33
UNUSED LICENSES:
44

@@ -3793,7 +3793,6 @@ FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h
37933793
FILE: ../../../third_party/skia/include/private/GrGLTypesPriv.h
37943794
FILE: ../../../third_party/skia/include/private/SkThreadAnnotations.h
37953795
FILE: ../../../third_party/skia/modules/canvaskit/WasmAliases.h
3796-
FILE: ../../../third_party/skia/modules/canvaskit/fonts/nofonts.cpp
37973796
FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings.cpp
37983797
FILE: ../../../third_party/skia/modules/canvaskit/particles_bindings.cpp
37993798
FILE: ../../../third_party/skia/modules/canvaskit/skottie_bindings.cpp
@@ -3821,6 +3820,7 @@ FILE: ../../../third_party/skia/src/gpu/GrClientMappedBufferManager.h
38213820
FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.cpp
38223821
FILE: ../../../third_party/skia/src/gpu/GrCopyRenderTask.h
38233822
FILE: ../../../third_party/skia/src/gpu/GrImageInfo.h
3823+
FILE: ../../../third_party/skia/src/gpu/GrProgramInfo.h
38243824
FILE: ../../../third_party/skia/src/gpu/GrRenderTask.cpp
38253825
FILE: ../../../third_party/skia/src/gpu/GrRenderTask.h
38263826
FILE: ../../../third_party/skia/src/gpu/GrShaderUtils.cpp

‎ci/licenses_golden/licenses_third_party

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

33
UNUSED LICENSES:
44

@@ -7481,6 +7481,7 @@ FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_type_table.dart
74817481
FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_api_table.dart
74827482
FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_type_table.dart
74837483
FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_util.dart
7484+
FILE: ../../../third_party/dart/runtime/tools/ffi/sdk_lib_ffi_generator.dart
74847485
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html
74857486
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js
74867487
FILE: ../../../third_party/dart/runtime/tools/run_clang_tidy.dart

‎frontend_server/BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ if (is_fuchsia_host || is_fuchsia) {
1919
"//third_party/dart-pkg/pub/path",
2020
"//third_party/dart-pkg/pub/usage",
2121
"//third_party/dart/pkg/build_integration",
22-
"//third_party/dart/pkg/frontend_server",
2322
"//third_party/dart/pkg/front_end",
23+
"//third_party/dart/pkg/frontend_server",
2424
"//third_party/dart/pkg/kernel",
2525
"//third_party/dart/pkg/vm",
2626
]
@@ -39,4 +39,3 @@ if (is_fuchsia_host || is_fuchsia) {
3939
]
4040
}
4141
}
42-

‎lib/ui/semantics.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ class SemanticsAction {
3434
static const int _kDismissIndex = 1 << 18;
3535
static const int _kMoveCursorForwardByWordIndex = 1 << 19;
3636
static const int _kMoveCursorBackwardByWordIndex = 1 << 20;
37+
// READ THIS: if you add an action here, you MUST update the
38+
// numSemanticsActions value in testing/dart/semantics_test.dart, or tests
39+
// will fail.
3740

3841
/// The numerical value for this action.
3942
///
@@ -292,6 +295,8 @@ class SemanticsFlag {
292295
static const int _kIsReadOnlyIndex = 1 << 20;
293296
static const int _kIsFocusableIndex = 1 << 21;
294297
static const int _kIsLinkIndex = 1 << 22;
298+
// READ THIS: if you add a flag here, you MUST update the numSemanticsFlags
299+
// value in testing/dart/semantics_test.dart, or tests will fail.
295300

296301
const SemanticsFlag._(this.index);
297302

@@ -536,6 +541,7 @@ class SemanticsFlag {
536541
_kHasImplicitScrollingIndex: hasImplicitScrolling,
537542
_kIsMultilineIndex: isMultiline,
538543
_kIsReadOnlyIndex: isReadOnly,
544+
_kIsFocusableIndex: isFocusable,
539545
_kIsLinkIndex: isLink,
540546
};
541547

@@ -584,6 +590,8 @@ class SemanticsFlag {
584590
return 'SemanticsFlag.isMultiline';
585591
case _kIsReadOnlyIndex:
586592
return 'SemanticsFlag.isReadOnly';
593+
case _kIsFocusableIndex:
594+
return 'SemanticsFlag.isFocusable';
587595
case _kIsLinkIndex:
588596
return 'SemanticsFlag.isLink';
589597
}

‎lib/web_ui/lib/src/engine.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ part 'engine/platform_views.dart';
5757
part 'engine/plugins.dart';
5858
part 'engine/pointer_binding.dart';
5959
part 'engine/recording_canvas.dart';
60+
part 'engine/rrect_renderer.dart';
6061
part 'engine/semantics/accessibility.dart';
6162
part 'engine/semantics/checkable.dart';
6263
part 'engine/semantics/image.dart';

0 commit comments

Comments
 (0)