Skip to content

Commit eccaa09

Browse files
Merge branch 'master' into unskip-web-tests-batch-1
2 parents a765a03 + 7a0b1cc commit eccaa09

114 files changed

Lines changed: 3048 additions & 1052 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: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,15 @@ platform_properties:
211211
{"dependency": "apple_signing", "version": "version:to_2027"}
212212
]
213213
device_type: none
214-
mac_model: "Macmini8,1"
214+
# Benchmarks are pinned to a single Mac model so that timing metrics are
215+
# comparable across runs. Macmini9,1 is the Apple Silicon (M1) Mac mini;
216+
# the Intel Macmini8,1 bots are being turned down
217+
# (https://flutter.dev/go/macos-intel-deprecation).
218+
mac_model: "Macmini9,1"
219+
cpu: arm64
215220
os: Mac-15.7
216221
tags: >
217-
["devicelab", "hostonly", "mac"]
222+
["devicelab", "hostonly", "mac", "arm64"]
218223
$flutter/osx_sdk : >-
219224
{
220225
"sdk_version": "17c52"
@@ -735,7 +740,6 @@ targets:
735740
- name: Linux flavors_test_linux
736741
recipe: devicelab/devicelab_drone
737742
presubmit: false
738-
bringup: true
739743
timeout: 60
740744
properties:
741745
xvfb: "1"
@@ -5363,13 +5367,12 @@ targets:
53635367
["devicelab", "ios", "mac"]
53645368
task_name: backdrop_filter_perf_ios__timeline_summary
53655369

5366-
- name: Mac_arm64_ios basic_material_app_ios__compile
5370+
- name: Mac_benchmark basic_material_app_ios__compile
53675371
recipe: devicelab/devicelab_drone
53685372
presubmit: false
5373+
bringup: true
53695374
timeout: 60
53705375
properties:
5371-
tags: >
5372-
["devicelab", "ios", "mac"]
53735376
task_name: basic_material_app_ios__compile
53745377

53755378
- name: Mac channels_integration_test_ios
@@ -5473,13 +5476,16 @@ targets:
54735476
["devicelab", "hostonly", "mac"]
54745477
task_name: flavors_test_ios
54755478

5476-
- name: Mac_arm64_ios flutter_gallery_ios__compile
5479+
- name: Mac_benchmark flutter_gallery_ios__compile
54775480
recipe: devicelab/devicelab_drone
54785481
presubmit: false
5482+
bringup: true
54795483
timeout: 60
54805484
properties:
5481-
tags: >
5482-
["devicelab", "ios", "mac", "arm64"]
5485+
dependencies: >-
5486+
[
5487+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5488+
]
54835489
task_name: flutter_gallery_ios__compile
54845490

54855491
- name: Mac_ios flutter_gallery_ios__start_up
@@ -5500,22 +5506,20 @@ targets:
55005506
["devicelab", "ios", "mac"]
55015507
task_name: flutter_view_ios__start_up
55025508

5503-
- name: Mac_arm64_ios hello_world_ios__compile
5509+
- name: Mac_benchmark hello_world_ios__compile
55045510
recipe: devicelab/devicelab_drone
55055511
presubmit: false
5512+
bringup: true
55065513
timeout: 60
55075514
properties:
5508-
tags: >
5509-
["devicelab", "ios", "mac", "arm64"]
55105515
task_name: hello_world_ios__compile
55115516

5512-
- name: Mac_arm64_ios imitation_game_flutter
5517+
- name: Mac_benchmark imitation_game_flutter
55135518
recipe: devicelab/devicelab_drone
55145519
presubmit: false
5520+
bringup: true
55155521
timeout: 60
55165522
properties:
5517-
tags: >
5518-
["devicelab", "ios", "mac", "arm64"]
55195523
task_name: imitation_game_flutter__compile
55205524

55215525
- name: Mac_arm64_ios imitation_game_swiftui

‎DEPS‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ vars = {
5555
# updated revision list of existing dependencies. You will need to
5656
# gclient sync before and after update deps to ensure all deps are updated.
5757
# updated revision list of existing dependencies.
58-
'dart_revision': '5e0368d287ef8863791487e85f729268ce3ba5bd',
58+
'dart_revision': '44f4a7000e229eaa32b90416786d0c580d6549ee',
5959

6060
# WARNING: DO NOT EDIT MANUALLY
6161
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6262
'dart_binaryen_rev': '9926156a583cec3d22d521232b31c70fa9a87dc1',
63-
'dart_boringssl_rev': '8626998e7fdd6d779f37b7ba0b726631bbb76266',
63+
'dart_boringssl_rev': '1097261733d85c85147a5c96ff6ee835c90f5951',
6464
'dart_core_rev': '08e4022160c465780690c43ffdbce60812975d2c',
6565
'dart_devtools_rev': '98217413399f2d56838f0f7497a3ba48adf6f35c',
66-
'dart_ecosystem_rev': '1bdafd85bb97b331ddd683577f48a5dfa7f4cb49',
67-
'dart_http_rev': '35769ba4d7b8342385f19f1a7b7b904319b89a6a',
66+
'dart_ecosystem_rev': '16dca7ae5d3ff896a4db47e1ed6cd50f7ebbf115',
67+
'dart_http_rev': 'd8e8e9cd1ae6ed0f0339cfa0f47f92e837a786f5',
6868
'dart_i18n_rev': '1f5ea2fb2381bdf7bab054a43c0d69771f104561',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7070
'dart_protobuf_rev': 'a73edc98c98fb25152aa3f12c1b9db91594c1369',
7171
'dart_pub_rev': '0382a52acba89ff0080d559bb22f4017962bbd1d',
7272
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
73-
'dart_tools_rev': '1b0c3bbacef984b9d8278eb5cf0f96a06c6f2850',
73+
'dart_tools_rev': '3614ce064ae452a15e83de3531236f5f89dfa526',
7474
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
7575
'dart_web_rev': 'e5c6c028da66688a2295557757850a1599ec392e',
7676
'dart_webdriver_rev': '8e5c611ea242efdc9f597a8a37c38a9c586120ee',
@@ -339,7 +339,7 @@ deps = {
339339
Var('dart_git') + '/dart_style.git@5a9534fad9ff2faba89596a70323d2b1f1bcf163',
340340

341341
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
342-
Var('dart_git') + '/dartdoc.git@df2f2cde6c18e2e613a262db05ecfe5806c40199',
342+
Var('dart_git') + '/dartdoc.git@c68debcb5636ba8d66210110092d39d5b06f8225',
343343

344344
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
345345
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -354,7 +354,7 @@ deps = {
354354
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
355355

356356
'engine/src/flutter/third_party/dart/third_party/pkg/native':
357-
Var('dart_git') + '/native.git@a88aaafdd8d64082f6ea6708ee64a8c6ee7c7ebe',
357+
Var('dart_git') + '/native.git@f628b26f039c3824d83c352c489fd1a4496780d0',
358358

359359
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
360360
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -363,7 +363,7 @@ deps = {
363363
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
364364

365365
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
366-
Var('dart_git') + '/shelf.git@f36dd68654814e0498c30b9f7ccc4bb0aa2bc118',
366+
Var('dart_git') + '/shelf.git@e5c8dc663bf1325ad8f997c4a2387923d37a90d9',
367367

368368
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
369369
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -372,7 +372,7 @@ deps = {
372372
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
373373

374374
'engine/src/flutter/third_party/dart/third_party/pkg/test':
375-
Var('dart_git') + '/test.git@c80d53dbd489d61e0481fc484cd6f9a3b53603fb',
375+
Var('dart_git') + '/test.git@9946c9551ddaffd6092c22372b7e146600aa3264',
376376

377377
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
378378
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

‎TESTOWNERS‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
/dev/devicelab/bin/tasks/platform_views_hcpp_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
103103
/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart @jtmcdole @flutter/engine
104104
/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller__timeline_summary.dart @bdero @flutter/engine
105-
/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @stuartmorgan-g @flutter/tool
105+
/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @Piinks @flutter/plugin
106106
/dev/devicelab/bin/tasks/routing_test.dart @bkonyi @flutter/tool
107107
/dev/devicelab/bin/tasks/rrect_blur_perf__timeline_summary.dart @gaaclarke @flutter/engine
108108
/dev/devicelab/bin/tasks/shader_mask_cache_perf__e2e_summary.dart @flar @flutter/engine
@@ -165,7 +165,7 @@
165165
/dev/devicelab/bin/tasks/new_gallery_opengles_impeller__transition_perf.dart @gaaclarke @flutter/engine
166166
/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart @jtmcdole @flutter/engine
167167
/dev/devicelab/bin/tasks/platform_channel_sample_test.dart @jtmcdole @flutter/engine
168-
/dev/devicelab/bin/tasks/platform_interaction_test.dart @stuartmorgan-g @flutter/plugin
168+
/dev/devicelab/bin/tasks/platform_interaction_test.dart @Piinks @flutter/plugin
169169
/dev/devicelab/bin/tasks/platform_view__start_up.dart @jtmcdole @flutter/engine
170170
/dev/devicelab/bin/tasks/run_release_test.dart @bkonyi @flutter/tool
171171
/dev/devicelab/bin/tasks/service_extensions_test.dart @bkonyi @flutter/tool
@@ -224,7 +224,7 @@
224224
/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @hellohuanlin @flutter/engine
225225
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
226226
/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @hellohuanlin @flutter/engine
227-
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan-g @flutter/plugin
227+
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @hellohuanlin @flutter/ios
228228
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ad_banners__timeline_summary.dart @hellohuanlin @flutter/engine
229229
/dev/devicelab/bin/tasks/platform_views_scroll_perf_bottom_ad_banner__timeline_summary.dart @hellohuanlin @flutter/engine
230230
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
@@ -258,7 +258,7 @@
258258
/dev/devicelab/bin/tasks/new_gallery_windows_skia__transition_perf.dart @gaaclarke @flutter/engine
259259
/dev/devicelab/bin/tasks/complex_layout_win_desktop__compile.dart @yaakovschectman @flutter/desktop
260260
/dev/devicelab/bin/tasks/complex_layout_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
261-
/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan-g @flutter/plugin
261+
/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @Piinks @flutter/plugin
262262
/dev/devicelab/bin/tasks/entrypoint_dart_registrant.dart @aaclarke @flutter/plugin
263263
/dev/devicelab/bin/tasks/flavors_test_linux.dart @robert-ancell @flutter/desktop
264264
/dev/devicelab/bin/tasks/flavors_test_macos.dart @vashworth @flutter/desktop
@@ -303,12 +303,12 @@
303303
/dev/devicelab/bin/tasks/platform_view_macos__start_up.dart @cbracken @flutter/desktop
304304
/dev/devicelab/bin/tasks/platform_view_macos_impeller__start_up.dart @loic-sharma @flutter/desktop
305305
/dev/devicelab/bin/tasks/platform_view_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
306-
/dev/devicelab/bin/tasks/plugin_lint_mac.dart @stuartmorgan-g @flutter/plugin
307-
/dev/devicelab/bin/tasks/plugin_test_android_standard.dart @stuartmorgan-g @flutter/plugin
308-
/dev/devicelab/bin/tasks/plugin_test_android_variants.dart @stuartmorgan-g @flutter/plugin
309-
/dev/devicelab/bin/tasks/plugin_test_ios.dart @stuartmorgan-g @flutter/ios
310-
/dev/devicelab/bin/tasks/plugin_test_darwin.dart @stuartmorgan-g @flutter/ios
311-
/dev/devicelab/bin/tasks/plugin_test_linux.dart @stuartmorgan-g @flutter/desktop
306+
/dev/devicelab/bin/tasks/plugin_lint_mac.dart @vashworth @flutter/ios
307+
/dev/devicelab/bin/tasks/plugin_test_android_standard.dart @mboetger @flutter/android
308+
/dev/devicelab/bin/tasks/plugin_test_android_variants.dart @mboetger @flutter/android
309+
/dev/devicelab/bin/tasks/plugin_test_ios.dart @vashworth @flutter/ios
310+
/dev/devicelab/bin/tasks/plugin_test_darwin.dart @vashworth @flutter/ios
311+
/dev/devicelab/bin/tasks/plugin_test_linux.dart @robert-ancell @flutter/desktop
312312
/dev/devicelab/bin/tasks/plugin_test_macos.dart @vashworth @flutter/desktop
313313
/dev/devicelab/bin/tasks/plugin_test_windows.dart @loic-sharma @flutter/desktop
314314
/dev/devicelab/bin/tasks/run_debug_test_android.dart @camsim99 @flutter/android
@@ -382,7 +382,7 @@
382382
# docs @justinmc @flutter/framework
383383
# snippets @justinmc @flutter/framework
384384
# flutter_packaging @christopherfujino @flutter/infra
385-
# flutter_plugins @stuartmorgan-g @flutter/plugin
385+
# flutter_plugins @Piinks @flutter/plugin
386386
# framework_tests @justinmc @flutter/framework
387387
# fuchsia_precache @bkonyi @flutter/tool
388388
# realm_checker @eyebrowsoffire @flutter/tool

‎docs/triage/Flutter-Web-Triage.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ When triaging web issues follow the following process:
1717
* Remove the `triage-web` label when the PR is approved.
1818
* If you are the last reviewer, add the `autosubmit` label.
1919
* Triage [untriaged issues](https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Ateam-web%2Cfyi-web+-label%3Atriaged-web+no%3Aassignee+-label%3A%22will+need+additional+triage%22+sort%3Aupdated-asc+-label%3A%22waiting+for+response%22+)
20+
21+
## Additional resources
22+
23+
* [flutter-zl/web-triage](https://github.com/flutter-zl/web-triage): One triager's longer-form notes on routing, priority, and labeling, with logs from past sessions.

‎engine/src/flutter/impeller/display_list/BUILD.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ template("aiks_unittests_component") {
196196
"//flutter/impeller/geometry:geometry_asserts",
197197
"//flutter/impeller/golden_tests:golden_playground_test",
198198
"//flutter/impeller/playground:playground_test",
199-
"//flutter/impeller/renderer/testing:mocks",
200199
"//flutter/testing:testing_lib",
201200
"//flutter/txt",
202201
]

‎engine/src/flutter/impeller/display_list/aiks_dl_clip_unittests.cc‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include "flutter/display_list/dl_color.h"
1010
#include "flutter/display_list/dl_paint.h"
1111
#include "flutter/display_list/effects/dl_color_filter.h"
12-
#include "flutter/display_list/effects/dl_image_filter.h"
13-
#include "flutter/display_list/geometry/dl_geometry_types.h"
1412
#include "flutter/display_list/geometry/dl_path_builder.h"
1513
#include "flutter/testing/testing.h"
1614

@@ -141,80 +139,5 @@ TEST_P(AiksTest, FramebufferBlendsRespectClips) {
141139
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
142140
}
143141

144-
TEST_P(AiksTest, CanRenderClippedBackdropFilterWithSuperellipse) {
145-
DisplayListBuilder root_builder;
146-
147-
root_builder.Scale(GetContentScale().x, GetContentScale().y);
148-
149-
// 1. Draw a dark background on the root pass.
150-
DlPaint bg_paint;
151-
bg_paint.setColor(DlColor::kBlack());
152-
root_builder.DrawPaint(bg_paint);
153-
154-
// 2. Wrap in TransformLayer (matching CupertinoSheetTransition scale +
155-
// slide).
156-
root_builder.Save();
157-
root_builder.Scale(0.9f, 0.9f);
158-
root_builder.Translate(33.4f, 3.5f);
159-
160-
// 3. Apply ClipRoundSuperellipse with top-only rounded corners (matching
161-
// CupertinoSheet).
162-
DlRect sheet_rect = DlRect::MakeXYWH(0, 42, 400, 500);
163-
DlRoundingRadii top_radii = {
164-
.top_left = {12, 12},
165-
.top_right = {12, 12},
166-
.bottom_left = {0, 0},
167-
.bottom_right = {0, 0},
168-
};
169-
DlRoundSuperellipse clip_rse =
170-
DlRoundSuperellipse::MakeRectRadii(sheet_rect, top_radii);
171-
root_builder.ClipRoundSuperellipse(clip_rse, DlClipOp::kIntersect);
172-
173-
// 4. Wrap in OpacityLayer offset (matching CupertinoSheetRoute offset: (0,
174-
// 42)).
175-
root_builder.Save();
176-
root_builder.Translate(0.0f, 42.0f);
177-
178-
// 5. Layer 1: DisplayListLayer for sheet body with Ink features.
179-
for (int i = 0; i < 5; i++) {
180-
DisplayListBuilder item_builder;
181-
DlPaint ink_paint;
182-
ink_paint.setColor(DlColor::RGBA(0.0f, 0.0f, 0.0f, 0.07f));
183-
item_builder.DrawRect(DlRect::MakeXYWH(0, i * 50, 400, 45), ink_paint);
184-
root_builder.DrawDisplayList(item_builder.Build());
185-
}
186-
187-
// 6. Layer 2: BackdropFilterLayer (_glassBar).
188-
root_builder.Save();
189-
DlRect glass_rect = DlRect::MakeXYWH(20, 350, 360, 60);
190-
DlRoundRect glass_rrect = DlRoundRect::MakeRectXY(glass_rect, 14, 14);
191-
root_builder.ClipRoundRect(glass_rrect, DlClipOp::kIntersect);
192-
193-
DlPaint save_paint;
194-
auto backdrop_filter =
195-
DlImageFilter::MakeBlur(12.0f, 12.0f, DlTileMode::kClamp);
196-
root_builder.SaveLayer(glass_rect, &save_paint, backdrop_filter.get());
197-
DisplayListBuilder glass_builder;
198-
DlPaint orange_paint;
199-
orange_paint.setColor(DlColor::RGBA(1.0f, 0.6f, 0.0f, 0.6f));
200-
glass_builder.DrawRect(glass_rect, orange_paint);
201-
root_builder.DrawDisplayList(glass_builder.Build());
202-
root_builder.Restore(); // Restore SaveLayer
203-
root_builder.Restore(); // Restore glass clip
204-
205-
// 7. Layer 3: DisplayListLayer for Scaffold AppBar / header drawn AFTER
206-
// backdrop filter.
207-
DisplayListBuilder appbar_builder;
208-
DlPaint white_paint;
209-
white_paint.setColor(DlColor::kWhite());
210-
appbar_builder.DrawRect(DlRect::MakeXYWH(0, 0, 400, 80), white_paint);
211-
root_builder.DrawDisplayList(appbar_builder.Build());
212-
213-
root_builder.Restore(); // Restore OpacityLayer offset
214-
root_builder.Restore(); // Restore TransformLayer
215-
216-
ASSERT_TRUE(OpenPlaygroundHere(root_builder.Build()));
217-
}
218-
219142
} // namespace testing
220143
} // namespace impeller

‎engine/src/flutter/impeller/display_list/canvas.cc‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,9 +1775,11 @@ void Canvas::Save(uint32_t total_content_depth) {
17751775

17761776
auto entry = CanvasStackEntry{};
17771777
entry.transform = transform_stack_.back().transform;
1778-
entry.clip_depth = std::min<uint32_t>(current_depth_ + total_content_depth,
1779-
transform_stack_.back().clip_depth);
1778+
entry.clip_depth = current_depth_ + total_content_depth;
17801779
entry.distributed_opacity = transform_stack_.back().distributed_opacity;
1780+
FML_DCHECK(entry.clip_depth <= transform_stack_.back().clip_depth)
1781+
<< entry.clip_depth << " <=? " << transform_stack_.back().clip_depth
1782+
<< " after allocating " << total_content_depth;
17811783
entry.clip_height = transform_stack_.back().clip_height;
17821784
entry.rendering_mode = Entity::RenderingMode::kDirect;
17831785
transform_stack_.push_back(entry);
@@ -1940,7 +1942,7 @@ void Canvas::SaveLayer(const Paint& paint,
19401942
// 3. The current render pass is for the onscreen pass.
19411943
const bool should_use_onscreen =
19421944
renderer_.GetDeviceCapabilities().SupportsFramebufferFetch() &&
1943-
backdrop_count_ == 0 && render_passes_.size() == 1u && is_onscreen_;
1945+
backdrop_count_ == 0 && render_passes_.size() == 1u;
19441946
input_texture = FlipBackdrop(
19451947
GetGlobalPassPosition(), //
19461948
/*should_remove_texture=*/will_cache_backdrop_texture, //
@@ -2026,8 +2028,10 @@ void Canvas::SaveLayer(const Paint& paint,
20262028

20272029
CanvasStackEntry entry;
20282030
entry.transform = transform_stack_.back().transform;
2029-
entry.clip_depth = std::min<uint32_t>(current_depth_ + total_content_depth,
2030-
transform_stack_.back().clip_depth);
2031+
entry.clip_depth = current_depth_ + total_content_depth;
2032+
FML_DCHECK(entry.clip_depth <= transform_stack_.back().clip_depth)
2033+
<< entry.clip_depth << " <=? " << transform_stack_.back().clip_depth
2034+
<< " after allocating " << total_content_depth;
20312035
entry.clip_height = transform_stack_.back().clip_height;
20322036
entry.rendering_mode = Entity::RenderingMode::kSubpassAppendSnapshotTransform;
20332037
entry.did_round_out = did_round_out;
@@ -2072,16 +2076,9 @@ bool Canvas::Restore() {
20722076
// to be overly conservative, but we need to jump the depth to
20732077
// the clip depth so that the next rendering op will get a
20742078
// larger depth (it will pre-increment the current_depth_ value).
2075-
//
2076-
// Only advance depth if clips were recorded and the allocated clip depth
2077-
// was finite. This prevents premature exhaustion of the parent pass depth
2078-
// budget.
2079-
if (transform_stack_.back().num_clips > 0 &&
2080-
transform_stack_.back().clip_depth < kMaxDepth) {
2081-
FML_DCHECK(current_depth_ <= transform_stack_.back().clip_depth)
2082-
<< current_depth_ << " <=? " << transform_stack_.back().clip_depth;
2083-
current_depth_ = transform_stack_.back().clip_depth;
2084-
}
2079+
FML_DCHECK(current_depth_ <= transform_stack_.back().clip_depth)
2080+
<< current_depth_ << " <=? " << transform_stack_.back().clip_depth;
2081+
current_depth_ = transform_stack_.back().clip_depth;
20852082

20862083
if (IsSkipping()) {
20872084
transform_stack_.pop_back();
@@ -2631,6 +2628,8 @@ std::shared_ptr<Texture> Canvas::FlipBackdrop(Point global_pass_position,
26312628
return nullptr;
26322629
}
26332630

2631+
// Restore any clips that were recorded before the backdrop filter was
2632+
// applied.
26342633
auto& replay_entities = clip_coverage_stack_.GetReplayEntities();
26352634
uint64_t current_depth =
26362635
post_depth_increment ? current_depth_ - 1 : current_depth_;
@@ -2642,7 +2641,7 @@ std::shared_ptr<Texture> Canvas::FlipBackdrop(Point global_pass_position,
26422641
SetClipScissor(replay.clip_coverage, current_render_pass,
26432642
global_pass_position);
26442643
if (!replay.clip_contents.Render(renderer_, current_render_pass,
2645-
replay.clip_depth, replay.transform)) {
2644+
replay.clip_depth)) {
26462645
VALIDATION_LOG << "Failed to render entity for clip restore.";
26472646
}
26482647
}

0 commit comments

Comments
 (0)