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

Commit d069fab

Browse files
author
jonahwilliams
committed
Merge branch 'main' of github.com:flutter/engine into size_swapchain_with_callback
2 parents 86e5c2e + f2b9921 commit d069fab

File tree

139 files changed

+2323
-1811
lines changed

Some content is hidden

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

139 files changed

+2323
-1811
lines changed

‎DEPS

Lines changed: 14 additions & 14 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': 'bf27636582c7151635be402cc3bf5d38d1ed2b15',
17+
'skia_revision': '19e5e8f089b24ae56af4345f728c1dd8058005d2',
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.
@@ -62,7 +62,7 @@ vars = {
6262
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
6363
# You can use //tools/dart/create_updated_flutter_deps.py to produce
6464
# updated revision list of existing dependencies.
65-
'dart_revision': '488e33cd39deb7aa7c0856c3fde2454d72b123ba',
65+
'dart_revision': '82936dcdaf4f8e01fa40962ae5786622c13b8702',
6666

6767
# WARNING: DO NOT EDIT MANUALLY
6868
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -78,9 +78,9 @@ vars = {
7878
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7979
'dart_protobuf_rev': 'a293fb9c866b1def3d3e7fffc5f6763a2ec59cc9',
8080
'dart_pub_rev': 'a3689f03168c896dd1cb0db8a60c568b38ee16bf',
81-
'dart_tools_rev': '8ffc077f93ecb630c76a833be2cc80b918916428',
81+
'dart_tools_rev': 'f6e67f2223fd5f9c6bdb3ace908d22c73ea02bc5',
8282
'dart_watcher_rev': '66cd694ffb7ee6e09ff0cde6c9f788aa47ee1a23',
83-
'dart_webdev_rev': 'f32fdc48f0ae7cb7fa8088233fd69e2ed30af457',
83+
'dart_webdev_rev': '2539d54bca7143a2dd1a1ec5d55fa38ca481639c',
8484
'dart_webkit_inspection_protocol_rev': '667c55e6f65638592768e0325b75420e39b01d2e',
8585
'dart_yaml_edit_rev': '47eb20e9083954b7b9ec1fb04e7a9f8976a8ed14',
8686
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -342,7 +342,7 @@ deps = {
342342
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:226af81369622cce9c0d98adbe31598208a27cc0'}]},
343343

344344
'src/third_party/dart/third_party/pkg/args':
345-
Var('dart_git') + '/args.git@46d5033377d277d70bc6ec68504730b9384b1db1',
345+
Var('dart_git') + '/args.git@03386ba1cc338086af46f1c742ef944c6a402862',
346346

347347
'src/third_party/dart/third_party/pkg/async':
348348
Var('dart_git') + '/async.git@e83d054b3ea0ff6cb25e5849c5408cd7c4fc1d3f',
@@ -372,7 +372,7 @@ deps = {
372372
Var('dart_git') + '/crypto.git@f2efb981b461dcae43d0cf18a3a970142abfee35',
373373

374374
'src/third_party/dart/third_party/pkg/csslib':
375-
Var('dart_git') + '/csslib.git@1ad2d1ec461fb1836180e917220a5a48fd641897',
375+
Var('dart_git') + '/csslib.git@ec86ee57c89f683352e66c55542bcc1daa425c13',
376376

377377
'src/third_party/dart/third_party/pkg/dart_style':
378378
Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
@@ -390,13 +390,13 @@ deps = {
390390
Var('dart_git') + '/glob.git@7c9a121e92687b7ac6456ec0796eb1e5c0373d90',
391391

392392
'src/third_party/dart/third_party/pkg/html':
393-
Var('dart_git') + '/html.git@06bc148600b1d1a70f2256bdf788c213f1f60f55',
393+
Var('dart_git') + '/html.git@910f6d703ed0193318fb095be09e8ddf1bec3e05',
394394

395395
'src/third_party/dart/third_party/pkg/http':
396396
Var('dart_git') + '/http.git@f0a02f98f7c921e86ecc81c70f38bb6fbccc81b9',
397397

398398
'src/third_party/dart/third_party/pkg/http_multi_server':
399-
Var('dart_git') + '/http_multi_server.git@ae484896624cee8b0a8a97a0fb1ea323c4c3d31f',
399+
Var('dart_git') + '/http_multi_server.git@491f7c613198d38c489ee0010b9c5377ad29afde',
400400

401401
'src/third_party/dart/third_party/pkg/http_parser':
402402
Var('dart_git') + '/http_parser.git@224c1a9d24b46c7a9da1f09147e0e1fbda78089d',
@@ -411,7 +411,7 @@ deps = {
411411
Var('dart_git') + '/leak_tracker.git@4a5b077739886f61bd6dc11c78865ef487c917c2',
412412

413413
'src/third_party/dart/third_party/pkg/logging':
414-
Var('dart_git') + '/logging.git@4d35a4e02b9237bd794378413e7ce3deb52ffcaf',
414+
Var('dart_git') + '/logging.git@e04942dadc6ed9ed177ab0c6b8d0e80a789cd176',
415415

416416
'src/third_party/dart/third_party/pkg/markdown':
417417
Var('dart_git') + '/markdown.git@a8288ca3a3023228f1a8a832b78d00e11f0c4b30',
@@ -420,13 +420,13 @@ deps = {
420420
Var('dart_git') + '/matcher.git@d9cf4f69e3f557718ab5be042dd5503afcacac51',
421421

422422
'src/third_party/dart/third_party/pkg/mime':
423-
Var('dart_git') + '/mime.git@ca9f059d2334bb2657683e0a7f5949817cb4b0e6',
423+
Var('dart_git') + '/mime.git@99fbdcc745e2f2cfb85be4a4c6c7b520cd25c2dd',
424424

425425
'src/third_party/dart/third_party/pkg/mockito':
426-
Var('dart_git') + '/mockito.git@e15e00086ed20f3175b2e677fd11611be4fa8e8e',
426+
Var('dart_git') + '/mockito.git@0422551a774cbf72eea87ba80e71f7b5d81199f3',
427427

428428
'src/third_party/dart/third_party/pkg/native':
429-
Var('dart_git') + '/native.git@40382efb9c7a0774d2764238fc1802e562e9cbaf',
429+
Var('dart_git') + '/native.git@0eafd544d6ebce07b42007560ae9e0858c885d89',
430430

431431
'src/third_party/dart/third_party/pkg/package_config':
432432
Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4',
@@ -477,7 +477,7 @@ deps = {
477477
Var('dart_git') + '/term_glyph.git@4c5a49664ee78b62c35de528cec5a9469bb84936',
478478

479479
'src/third_party/dart/third_party/pkg/test':
480-
Var('dart_git') + '/test.git@846d73ee40a9cbd86348bc3cfc97f9c765872f2d',
480+
Var('dart_git') + '/test.git@6700049d5de97906d033f4271f67f7599090bf4e',
481481

482482
'src/third_party/dart/third_party/pkg/test_reflective_loader':
483483
Var('dart_git') + '/test_reflective_loader.git@6edf5358b53bfda487840bad1a03d089326fa08c',
@@ -982,7 +982,7 @@ deps = {
982982
'packages': [
983983
{
984984
'package': 'fuchsia/sdk/core/linux-amd64',
985-
'version': 'Z-xFM2ILZJw22eU8qOl52sPcOgS3CQtJ1LkWDRe_dtwC'
985+
'version': 'nymRxHV9Shod7cyLeph-eLvug_6Wz_qFAIM1LeUTwOAC'
986986
}
987987
],
988988
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/builders/linux_fuchsia.json

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@
115115
{
116116
"drone_dimensions": [
117117
"device_type=none",
118+
"kvm=1",
118119
"os=Linux"
119120
],
120121
"gclient_variables": {
121-
"download_android_deps": false
122+
"download_android_deps": false,
123+
"run_fuchsia_emu": true
122124
},
123125
"gn": [
124126
"--fuchsia",
@@ -131,9 +133,22 @@
131133
"ninja": {
132134
"config": "fuchsia_release_x64",
133135
"targets": [
134-
"flutter/shell/platform/fuchsia:fuchsia"
136+
"flutter/shell/platform/fuchsia:fuchsia",
137+
"flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
138+
"fuchsia_tests"
135139
]
136-
}
140+
},
141+
"tests": [
142+
{
143+
"name": "x64 emulator based release tests",
144+
"language": "python3",
145+
"script": "flutter/tools/fuchsia/with_envs.py",
146+
"parameters": [
147+
"testing/fuchsia/run_tests.py",
148+
"fuchsia_release_x64"
149+
]
150+
}
151+
]
137152
},
138153
{
139154
"drone_dimensions": [
@@ -158,6 +173,7 @@
158173
"config": "fuchsia_debug_x64",
159174
"targets": [
160175
"flutter/shell/platform/fuchsia:fuchsia",
176+
"flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
161177
"fuchsia_tests"
162178
]
163179
},
@@ -176,7 +192,7 @@
176192
]
177193
},
178194
{
179-
"name": "x64 emulator based tests",
195+
"name": "x64 emulator based debug tests",
180196
"language": "python3",
181197
"script": "flutter/tools/fuchsia/with_envs.py",
182198
"parameters": [

‎ci/builders/mac_host_engine.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
"--prebuilt-dart-sdk",
160160
"--build-embedder-examples",
161161
"--enable-impeller-vulkan",
162+
"--enable-impeller-opengles",
162163
"--use-glfw-swiftshader"
163164
],
164165
"name": "host_release",

‎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: 1fcd064754227797855c64a9b0bfca79
1+
Signature: 2c005d749b65ecc8add010e6a96f988f
22

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

4708-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/10bbb376de7e4ec0047d6a949fe69e5dddfb7b97
4708+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fbf1d8ebceb475179e0445edde13d9400b62aca0
47094709
/third_party/fallback_root_certificates/
47104710

47114711
====================================================================================================

‎ci/licenses_golden/licenses_flutter

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5478,6 +5478,8 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc + ../..
54785478
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h + ../../../flutter/LICENSE
54795479
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc + ../../../flutter/LICENSE
54805480
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h + ../../../flutter/LICENSE
5481+
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc + ../../../flutter/LICENSE
5482+
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h + ../../../flutter/LICENSE
54815483
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc + ../../../flutter/LICENSE
54825484
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h + ../../../flutter/LICENSE
54835485
ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc + ../../../flutter/LICENSE
@@ -5857,7 +5859,6 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
58575859
ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
58585860
ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
58595861
ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
5860-
ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
58615862
ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
58625863
ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
58635864
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
@@ -5964,7 +5965,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart + ../../../
59645965
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart + ../../../flutter/LICENSE
59655966
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/display.dart + ../../../flutter/LICENSE
59665967
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart + ../../../flutter/LICENSE
5967-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/embedder.dart + ../../../flutter/LICENSE
59685968
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart + ../../../flutter/LICENSE
59695969
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart + ../../../flutter/LICENSE
59705970
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart + ../../../flutter/LICENSE
@@ -5998,6 +5998,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart + ../
59985998
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart + ../../../flutter/LICENSE
59995999
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart + ../../../flutter/LICENSE
60006000
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart + ../../../flutter/LICENSE
6001+
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart + ../../../flutter/LICENSE
60016002
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart + ../../../flutter/LICENSE
60026003
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart + ../../../flutter/LICENSE
60036004
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart + ../../../flutter/LICENSE
@@ -6142,6 +6143,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strat
61426143
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart + ../../../flutter/LICENSE
61436144
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart + ../../../flutter/LICENSE
61446145
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart + ../../../flutter/LICENSE
6146+
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart + ../../../flutter/LICENSE
61456147
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart + ../../../flutter/LICENSE
61466148
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart + ../../../flutter/LICENSE
61476149
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/window.dart + ../../../flutter/LICENSE
@@ -8334,6 +8336,8 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc
83348336
FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h
83358337
FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc
83368338
FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h
8339+
FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc
8340+
FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h
83378341
FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc
83388342
FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h
83398343
FILE: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc
@@ -8717,7 +8721,6 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
87178721
FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
87188722
FILE: ../../../flutter/lib/ui/text/font_collection.cc
87198723
FILE: ../../../flutter/lib/ui/text/font_collection.h
8720-
FILE: ../../../flutter/lib/ui/text/line_metrics.h
87218724
FILE: ../../../flutter/lib/ui/text/paragraph.cc
87228725
FILE: ../../../flutter/lib/ui/text/paragraph.h
87238726
FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
@@ -8825,7 +8828,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
88258828
FILE: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart
88268829
FILE: ../../../flutter/lib/web_ui/lib/src/engine/display.dart
88278830
FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart
8828-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/embedder.dart
88298831
FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
88308832
FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart
88318833
FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart
@@ -8859,6 +8861,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
88598861
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
88608862
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
88618863
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart
8864+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart
88628865
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart
88638866
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
88648867
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart
@@ -9003,6 +9006,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strateg
90039006
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
90049007
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
90059008
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart
9009+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart
90069010
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
90079011
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart
90089012
FILE: ../../../flutter/lib/web_ui/lib/src/engine/window.dart

‎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: 1f3843358b659d834d9358a85911f7ae
1+
Signature: 6a98456bbe14977c6aed168ddf5938c2
22

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

‎ci/licenses_golden/licenses_skia

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 8952a309a0f9d4d87b999cb868f603f8
1+
Signature: bd507bde68391717cdda555e7b282c11
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -9502,10 +9502,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
95029502

95039503
====================================================================================================
95049504
LIBRARY: skia
9505+
ORIGIN: ../../../flutter/third_party/skia/gm/imagedither.cpp + ../../../flutter/third_party/skia/LICENSE
95059506
ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp + ../../../flutter/third_party/skia/LICENSE
95069507
ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp + ../../../flutter/third_party/skia/LICENSE
95079508
ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp + ../../../flutter/third_party/skia/LICENSE
95089509
TYPE: LicenseType.bsd
9510+
FILE: ../../../flutter/third_party/skia/gm/imagedither.cpp
95099511
FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp
95109512
FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp
95119513
FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp

‎common/settings.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ struct Settings {
232232
// Some devices claim to support the required APIs but crash on their usage.
233233
bool enable_opengl_gpu_tracing = false;
234234

235+
// Enable GPU tracing in Vulkan backends.
236+
bool enable_vulkan_gpu_tracing = false;
237+
235238
// Data set by platform-specific embedders for use in font initialization.
236239
uint32_t font_initialization_data = 0;
237240

‎fml/task_source.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void TaskSource::RegisterTask(const DelayedTask& task) {
2828
case TaskSourceGrade::kUnspecified:
2929
primary_task_queue_.push(task);
3030
break;
31-
case TaskSourceGrade::kDartMicroTasks:
31+
case TaskSourceGrade::kDartEventLoop:
3232
secondary_task_queue_.push(task);
3333
break;
3434
}
@@ -42,7 +42,7 @@ void TaskSource::PopTask(TaskSourceGrade grade) {
4242
case TaskSourceGrade::kUnspecified:
4343
primary_task_queue_.pop();
4444
break;
45-
case TaskSourceGrade::kDartMicroTasks:
45+
case TaskSourceGrade::kDartEventLoop:
4646
secondary_task_queue_.pop();
4747
break;
4848
}

‎fml/task_source_grade.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ enum class TaskSourceGrade {
1717
/// interaction.
1818
kUserInteraction,
1919
/// This `TaskSourceGrade` indicates that a task corresponds to servicing a
20-
/// dart micro task. These aren't critical to user interaction.
21-
kDartMicroTasks,
20+
/// dart event loop task. These aren't critical to user interaction.
21+
kDartEventLoop,
2222
/// The absence of a specialized `TaskSourceGrade`.
2323
kUnspecified,
2424
};

0 commit comments

Comments
 (0)