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

Commit c68bcae

Browse files
AthulJoseph27AthulJoseph27
authored
Merge branch 'main' into scissor
2 parents 6636a34 + 718f3a0 commit c68bcae

34 files changed

+600
-438
lines changed

‎DEPS‎

Lines changed: 4 additions & 4 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': 'dfbb0e6bc9740d4c3ea63793c9678b8c455ed44a',
17+
'skia_revision': '6944cd1286031c1d00896227766063187e57877c',
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,7 +56,7 @@ 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': '789763468d6b18142a494b40fb77a763dcf4bf6b',
59+
'dart_revision': '69cec5dc51f9a0954e18f0a418658bcf3f29e036',
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
@@ -436,7 +436,7 @@ deps = {
436436
Var('dart_git') + '/term_glyph.git@d7d8d7cb415ff4eac027f1b4ff8fceee641a2ccc',
437437

438438
'src/flutter/third_party/dart/third_party/pkg/test':
439-
Var('dart_git') + '/test.git@42495c26a4e5779758c54d3ff498687f913e43ae',
439+
Var('dart_git') + '/test.git@8a07bee398833ca38ca4c88905ccdbd513f40705',
440440

441441
'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
442442
Var('dart_git') + '/test_reflective_loader.git@598af2f503955020af0eaa82558d574a03934078',
@@ -908,7 +908,7 @@ deps = {
908908
'packages': [
909909
{
910910
'package': 'fuchsia/sdk/core/linux-amd64',
911-
'version': 'MjcuejuzYvYGobbFM0moy4j8BekXZcA7RDyD2ApfIVEC'
911+
'version': '07KmbdEtnhkg_tUheMIbSP0gP4xgLDifLWtGYEI_mkoC'
912912
}
913913
],
914914
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎ci/builders/linux_web_engine.json‎

Lines changed: 0 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -201,94 +201,6 @@
201201
]
202202
}
203203
},
204-
{
205-
"name": "web_tests/test_bundles/dart2wasm-html-html",
206-
"drone_dimensions": [
207-
"device_type=none",
208-
"os=Linux"
209-
],
210-
"generators": {
211-
"tasks": [
212-
{
213-
"name": "compile bundle dart2wasm-html-html",
214-
"parameters": [
215-
"test",
216-
"--compile",
217-
"--bundle=dart2wasm-html-html"
218-
],
219-
"scripts": [
220-
"flutter/lib/web_ui/dev/felt"
221-
]
222-
}
223-
]
224-
}
225-
},
226-
{
227-
"name": "web_tests/test_bundles/dart2wasm-html-ui",
228-
"drone_dimensions": [
229-
"device_type=none",
230-
"os=Linux"
231-
],
232-
"generators": {
233-
"tasks": [
234-
{
235-
"name": "compile bundle dart2wasm-html-ui",
236-
"parameters": [
237-
"test",
238-
"--compile",
239-
"--bundle=dart2wasm-html-ui"
240-
],
241-
"scripts": [
242-
"flutter/lib/web_ui/dev/felt"
243-
]
244-
}
245-
]
246-
}
247-
},
248-
{
249-
"name": "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit",
250-
"drone_dimensions": [
251-
"device_type=none",
252-
"os=Linux"
253-
],
254-
"generators": {
255-
"tasks": [
256-
{
257-
"name": "compile bundle dart2wasm-canvaskit-canvaskit",
258-
"parameters": [
259-
"test",
260-
"--compile",
261-
"--bundle=dart2wasm-canvaskit-canvaskit"
262-
],
263-
"scripts": [
264-
"flutter/lib/web_ui/dev/felt"
265-
]
266-
}
267-
]
268-
}
269-
},
270-
{
271-
"name": "web_tests/test_bundles/dart2wasm-canvaskit-ui",
272-
"drone_dimensions": [
273-
"device_type=none",
274-
"os=Linux"
275-
],
276-
"generators": {
277-
"tasks": [
278-
{
279-
"name": "compile bundle dart2wasm-canvaskit-ui",
280-
"parameters": [
281-
"test",
282-
"--compile",
283-
"--bundle=dart2wasm-canvaskit-ui"
284-
],
285-
"scripts": [
286-
"flutter/lib/web_ui/dev/felt"
287-
]
288-
}
289-
]
290-
}
291-
},
292204
{
293205
"name": "web_tests/test_bundles/dart2wasm-skwasm-ui",
294206
"drone_dimensions": [
@@ -354,10 +266,6 @@
354266
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
355267
"web_tests/test_bundles/dart2js-canvaskit-ui",
356268
"web_tests/test_bundles/dart2wasm-html-engine",
357-
"web_tests/test_bundles/dart2wasm-html-html",
358-
"web_tests/test_bundles/dart2wasm-html-ui",
359-
"web_tests/test_bundles/dart2wasm-canvaskit-canvaskit",
360-
"web_tests/test_bundles/dart2wasm-canvaskit-ui",
361269
"web_tests/test_bundles/dart2wasm-skwasm-ui",
362270
"web_tests/test_bundles/fallbacks"
363271
],
@@ -444,42 +352,6 @@
444352
],
445353
"script": "flutter/lib/web_ui/dev/felt"
446354
},
447-
{
448-
"name": "run suite chrome-dart2wasm-html-html",
449-
"parameters": [
450-
"test",
451-
"--run",
452-
"--suite=chrome-dart2wasm-html-html"
453-
],
454-
"script": "flutter/lib/web_ui/dev/felt"
455-
},
456-
{
457-
"name": "run suite chrome-dart2wasm-html-ui",
458-
"parameters": [
459-
"test",
460-
"--run",
461-
"--suite=chrome-dart2wasm-html-ui"
462-
],
463-
"script": "flutter/lib/web_ui/dev/felt"
464-
},
465-
{
466-
"name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
467-
"parameters": [
468-
"test",
469-
"--run",
470-
"--suite=chrome-dart2wasm-canvaskit-canvaskit"
471-
],
472-
"script": "flutter/lib/web_ui/dev/felt"
473-
},
474-
{
475-
"name": "run suite chrome-dart2wasm-canvaskit-ui",
476-
"parameters": [
477-
"test",
478-
"--run",
479-
"--suite=chrome-dart2wasm-canvaskit-ui"
480-
],
481-
"script": "flutter/lib/web_ui/dev/felt"
482-
},
483355
{
484356
"name": "run suite chrome-coi-dart2wasm-skwasm-ui",
485357
"parameters": [
@@ -498,24 +370,6 @@
498370
],
499371
"script": "flutter/lib/web_ui/dev/felt"
500372
},
501-
{
502-
"name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
503-
"parameters": [
504-
"test",
505-
"--run",
506-
"--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
507-
],
508-
"script": "flutter/lib/web_ui/dev/felt"
509-
},
510-
{
511-
"name": "run suite chrome-full-dart2wasm-canvaskit-ui",
512-
"parameters": [
513-
"test",
514-
"--run",
515-
"--suite=chrome-full-dart2wasm-canvaskit-ui"
516-
],
517-
"script": "flutter/lib/web_ui/dev/felt"
518-
},
519373
{
520374
"name": "run suite chrome-fallbacks",
521375
"parameters": [
@@ -735,10 +589,6 @@
735589
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
736590
"web_tests/test_bundles/dart2js-canvaskit-ui",
737591
"web_tests/test_bundles/dart2wasm-html-engine",
738-
"web_tests/test_bundles/dart2wasm-html-html",
739-
"web_tests/test_bundles/dart2wasm-html-ui",
740-
"web_tests/test_bundles/dart2wasm-canvaskit-canvaskit",
741-
"web_tests/test_bundles/dart2wasm-canvaskit-ui",
742592
"web_tests/test_bundles/dart2wasm-skwasm-ui",
743593
"web_tests/test_bundles/fallbacks"
744594
],
@@ -825,42 +675,6 @@
825675
],
826676
"script": "flutter/lib/web_ui/dev/felt"
827677
},
828-
{
829-
"name": "run suite chrome-dart2wasm-html-html",
830-
"parameters": [
831-
"test",
832-
"--run",
833-
"--suite=chrome-dart2wasm-html-html"
834-
],
835-
"script": "flutter/lib/web_ui/dev/felt"
836-
},
837-
{
838-
"name": "run suite chrome-dart2wasm-html-ui",
839-
"parameters": [
840-
"test",
841-
"--run",
842-
"--suite=chrome-dart2wasm-html-ui"
843-
],
844-
"script": "flutter/lib/web_ui/dev/felt"
845-
},
846-
{
847-
"name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
848-
"parameters": [
849-
"test",
850-
"--run",
851-
"--suite=chrome-dart2wasm-canvaskit-canvaskit"
852-
],
853-
"script": "flutter/lib/web_ui/dev/felt"
854-
},
855-
{
856-
"name": "run suite chrome-dart2wasm-canvaskit-ui",
857-
"parameters": [
858-
"test",
859-
"--run",
860-
"--suite=chrome-dart2wasm-canvaskit-ui"
861-
],
862-
"script": "flutter/lib/web_ui/dev/felt"
863-
},
864678
{
865679
"name": "run suite chrome-coi-dart2wasm-skwasm-ui",
866680
"parameters": [
@@ -879,24 +693,6 @@
879693
],
880694
"script": "flutter/lib/web_ui/dev/felt"
881695
},
882-
{
883-
"name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
884-
"parameters": [
885-
"test",
886-
"--run",
887-
"--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
888-
],
889-
"script": "flutter/lib/web_ui/dev/felt"
890-
},
891-
{
892-
"name": "run suite chrome-full-dart2wasm-canvaskit-ui",
893-
"parameters": [
894-
"test",
895-
"--run",
896-
"--suite=chrome-full-dart2wasm-canvaskit-ui"
897-
],
898-
"script": "flutter/lib/web_ui/dev/felt"
899-
},
900696
{
901697
"name": "run suite chrome-fallbacks",
902698
"parameters": [

‎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: 9d6e08f29cf7d63317408f26c238b7be
1+
Signature: c083860f04ea1d573db4b1cb93bca510
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/+/32bebf22c7657f646eccb0f1c8e199898575468d
4808+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/69cec5dc51f9a0954e18f0a418658bcf3f29e036
48094809
/third_party/fallback_root_certificates/
48104810

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

‎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: 76d249d7a0a7119f5c9b07f55e7cd391
1+
Signature: ec0314a470a5df336e61eb880500ca55
22

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

‎ci/licenses_golden/licenses_skia‎

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

33
====================================================================================================
44
LIBRARY: etc1
@@ -400,6 +400,7 @@ 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
402402
FILE: ../../../flutter/third_party/skia/relnotes/TimerQuery.md
403+
FILE: ../../../flutter/third_party/skia/relnotes/WGLWaitSync.md
403404
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
404405
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
405406
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl

‎impeller/entity/contents/content_context.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ ContentContext::ContentContext(
337337
clip_pipelines_.SetDefault(
338338
options,
339339
std::make_unique<ClipPipeline>(*context_, clip_pipeline_descriptor));
340-
texture_downsample_pipelines_.CreateDefault(*context_,
341-
options_trianglestrip);
340+
texture_downsample_pipelines_.CreateDefault(
341+
*context_, options_trianglestrip, {supports_decal});
342342
rrect_blur_pipelines_.CreateDefault(*context_, options_trianglestrip);
343343
texture_strict_src_pipelines_.CreateDefault(*context_, options);
344344
tiled_texture_pipelines_.CreateDefault(*context_, options,

‎impeller/entity/contents/contents.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ContentContextOptions OptionsFromPass(const RenderPass& pass) {
2626
FML_DCHECK(pass.HasDepthAttachment() == pass.HasStencilAttachment());
2727

2828
opts.has_depth_stencil_attachments = has_depth_stencil_attachments;
29-
opts.depth_compare = CompareFunction::kGreater;
29+
opts.depth_compare = CompareFunction::kGreaterEqual;
3030
opts.stencil_mode = ContentContextOptions::StencilMode::kIgnore;
3131
return opts;
3232
}

‎impeller/entity/contents/filters/gaussian_blur_filter_contents.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "flutter/fml/make_copyable.h"
1010
#include "impeller/entity/contents/clip_contents.h"
1111
#include "impeller/entity/contents/content_context.h"
12+
#include "impeller/entity/entity.h"
1213
#include "impeller/entity/texture_downsample.frag.h"
1314
#include "impeller/entity/texture_fill.frag.h"
1415
#include "impeller/entity/texture_fill.vert.h"
@@ -406,6 +407,8 @@ fml::StatusOr<RenderTarget> MakeDownsampleSubpass(
406407
frag_info.edge = edge;
407408
frag_info.ratio = ratio;
408409
frag_info.pixel_size = Vector2(1.0f / Size(input_texture->GetSize()));
410+
frag_info.use_decal =
411+
(tile_mode == Entity::TileMode::kDecal) ? 1.0 : 0.0;
409412

410413
const Quad& uvs = pass_args.uvs;
411414
std::array<VS::PerVertexData, 4> vertices = {

0 commit comments

Comments
 (0)