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

Commit a6ad852

Browse files
author
Chris Yang
authored
Merge branch 'main' into maskviewpool_regression
2 parents a0851b5 + a37bd4b commit a6ad852

Some content is hidden

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

43 files changed

+287
-572
lines changed

‎.github/workflows/scorecards-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@8662eabe0e9f338a07350b7fd050732745f93848
52+
uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
5353
with:
5454
sarif_file: results.sarif

‎DEPS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '9867fa253064e4dcaa083251c0cac3b58e20a427',
21+
'skia_revision': '82d1ef7a833ee606b8e35f5d3fc6514221adf453',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': 'e8b86b073413d929e6a73ad16e1db7224a17a281',
56+
'dart_revision': 'dc4a048e3cf7077be1f70d6e883c554e2f548dc2',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -68,7 +68,7 @@ vars = {
6868
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6969
'dart_protobuf_gn_rev': 'f872f05cb0378eef9a7a2609076929f0f35b4141',
7070
'dart_protobuf_rev': 'b90a4c44d56075eb23ee38ae56ce0febfd7f280f',
71-
'dart_pub_rev': '21eb39e148c720ab8577bbf3bf089556a113eb10',
71+
'dart_pub_rev': 'a3f8b2fd36ec432450caf907474a02023ef3e44e',
7272
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
7373
'dart_watcher_rev': '00aa79b0ff5562c9dafb0525891e2e69c51be06d',
7474
'dart_webdev_rev': '12f22857d509832e0e80616d937088992f565e6b',
@@ -881,7 +881,7 @@ deps = {
881881
'packages': [
882882
{
883883
'package': 'fuchsia/sdk/core/mac-amd64',
884-
'version': 'kNDuhglIFq_xEt5n3A4Xvrpnn0oGDIslJCFzfoi1UxwC'
884+
'version': 'NBgD7NzOpwnAULR_gFPv6cpJIkKpefko0tj87DYxUwsC'
885885
}
886886
],
887887
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -891,7 +891,7 @@ deps = {
891891
'packages': [
892892
{
893893
'package': 'fuchsia/sdk/core/linux-amd64',
894-
'version': 'xfKYQ2vkoLvxhBHIfawVPzeoCsW3IaqeeOEaJWPSID4C'
894+
'version': 'SJOgKviZ-kwWd1Z1u7URy-XuJcMsJPT3weBV9NYJyV8C'
895895
}
896896
],
897897
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/builders/linux_host_desktop_engine.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"type": "gcs",
99
"include_paths": [
1010
"out/host_debug/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
11-
]
11+
],
12+
"realm": "production"
1213
}
1314
],
1415
"drone_dimensions": [
@@ -40,7 +41,8 @@
4041
"type": "gcs",
4142
"include_paths": [
4243
"out/host_profile/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
43-
]
44+
],
45+
"realm": "production"
4446
}
4547
],
4648
"drone_dimensions": [
@@ -73,7 +75,8 @@
7375
"type": "gcs",
7476
"include_paths": [
7577
"out/host_release/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
76-
]
78+
],
79+
"realm": "production"
7780
}
7881
],
7982
"drone_dimensions": [

‎ci/licenses_golden/excluded_files

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2800,8 +2800,6 @@
28002800
../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
28012801
../../../third_party/skia/src/gpu/gl/BUILD.bazel
28022802
../../../third_party/skia/src/gpu/mtl/BUILD.bazel
2803-
../../../third_party/skia/src/gpu/piet/BUILD.bazel
2804-
../../../third_party/skia/src/gpu/piet/README.md
28052803
../../../third_party/skia/src/gpu/tessellate/BUILD.bazel
28062804
../../../third_party/skia/src/gpu/vk/BUILD.bazel
28072805
../../../third_party/skia/src/image/BUILD.bazel
@@ -2842,7 +2840,7 @@
28422840
../../../third_party/skia/third_party/libjpeg-turbo
28432841
../../../third_party/skia/third_party/libpng
28442842
../../../third_party/skia/third_party/lua
2845-
../../../third_party/skia/third_party/piet-gpu/Makefile
2843+
../../../third_party/skia/third_party/vello
28462844
../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
28472845
../../../third_party/skia/toolchain/BUILD.bazel
28482846
../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/BUILD.bazel

‎ci/licenses_golden/licenses_fuchsia

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 4258ab218ee2fb31efe41dd71bd85ed8
1+
Signature: 3c2ca726df921aebd2cbe83506fe1dce
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk
@@ -1138,17 +1138,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11381138

11391139
====================================================================================================
11401140
LIBRARY: fuchsia_sdk
1141-
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h + ../../../fuchsia/sdk/linux/LICENSE
1142-
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/image.h + ../../../fuchsia/sdk/linux/LICENSE
11431141
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
11441142
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
11451143
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
11461144
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
11471145
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
11481146
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
11491147
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
1150-
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/bootfs.h + ../../../fuchsia/sdk/linux/LICENSE
1151-
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h + ../../../fuchsia/sdk/linux/LICENSE
11521148
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
11531149
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
11541150
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
@@ -1391,17 +1387,13 @@ ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/profile.cc + ../../../fuchsia/sdk/linu
13911387
ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/resource.cc + ../../../fuchsia/sdk/linux/LICENSE
13921388
ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/vcpu.cc + ../../../fuchsia/sdk/linux/LICENSE
13931389
TYPE: LicenseType.bsd
1394-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h
1395-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/image.h
13961390
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h
13971391
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h
13981392
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h
13991393
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h
14001394
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h
14011395
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h
14021396
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
1403-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/bootfs.h
1404-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h
14051397
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h
14061398
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h
14071399
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h
@@ -3472,10 +3464,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34723464

34733465
====================================================================================================
34743466
LIBRARY: fuchsia_sdk
3475-
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h + ../../../fuchsia/sdk/linux/LICENSE
34763467
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
34773468
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
3478-
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h + ../../../fuchsia/sdk/linux/LICENSE
34793469
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
34803470
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
34813471
ORIGIN: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/optional_nullable.dart + ../../../fuchsia/sdk/linux/LICENSE
@@ -3702,10 +3692,8 @@ ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/internal/scalar.cc + ../../../f
37023692
ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/utf-utils.cc + ../../../fuchsia/sdk/linux/LICENSE
37033693
ORIGIN: ../../../fuchsia/sdk/linux/pkg/vulkan/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
37043694
TYPE: LicenseType.bsd
3705-
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h
37063695
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
37073696
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc
3708-
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h
37093697
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
37103698
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc
37113699
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/optional_nullable.dart
@@ -3966,6 +3954,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl +
39663954
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl + ../../../fuchsia/sdk/linux/LICENSE
39673955
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl + ../../../fuchsia/sdk/linux/LICENSE
39683956
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
3957+
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl + ../../../fuchsia/sdk/linux/LICENSE
39693958
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
39703959
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
39713960
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -3989,6 +3978,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl
39893978
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl
39903979
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl
39913980
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl
3981+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl
39923982
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl
39933983
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl
39943984
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl

‎ci/licenses_golden/licenses_skia

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 22c46ddbf02271a20eb6b0e13be8c9ad
1+
Signature: 7aa1cedbb79e0a5d9dfe292a9ca0caf8
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -384,6 +384,7 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js
384384
FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js
385385
FILE: ../../../third_party/skia/modules/skparagraph/test.html
386386
FILE: ../../../third_party/skia/package-lock.json
387+
FILE: ../../../third_party/skia/relnotes/skimage_methods.md
387388
FILE: ../../../third_party/skia/relnotes/skimage_subset.md
388389
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
389390
FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt
@@ -656,9 +657,9 @@ ORIGIN: ../../../third_party/skia/src/base/SkTSort.h + ../../../third_party/skia
656657
ORIGIN: ../../../third_party/skia/src/base/SkUtils.cpp + ../../../third_party/skia/LICENSE
657658
ORIGIN: ../../../third_party/skia/src/base/SkUtils.h + ../../../third_party/skia/LICENSE
658659
ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.cpp + ../../../third_party/skia/LICENSE
660+
ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.h + ../../../third_party/skia/LICENSE
659661
ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp + ../../../third_party/skia/LICENSE
660662
ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.h + ../../../third_party/skia/LICENSE
661-
ORIGIN: ../../../third_party/skia/src/core/SkAntiRun.h + ../../../third_party/skia/LICENSE
662663
ORIGIN: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h + ../../../third_party/skia/LICENSE
663664
ORIGIN: ../../../third_party/skia/src/core/SkBlitter.cpp + ../../../third_party/skia/LICENSE
664665
ORIGIN: ../../../third_party/skia/src/core/SkBlitter.h + ../../../third_party/skia/LICENSE
@@ -805,9 +806,9 @@ FILE: ../../../third_party/skia/src/base/SkTSort.h
805806
FILE: ../../../third_party/skia/src/base/SkUtils.cpp
806807
FILE: ../../../third_party/skia/src/base/SkUtils.h
807808
FILE: ../../../third_party/skia/src/core/SkAlphaRuns.cpp
809+
FILE: ../../../third_party/skia/src/core/SkAlphaRuns.h
808810
FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp
809811
FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.h
810-
FILE: ../../../third_party/skia/src/core/SkAntiRun.h
811812
FILE: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h
812813
FILE: ../../../third_party/skia/src/core/SkBlitter.cpp
813814
FILE: ../../../third_party/skia/src/core/SkBlitter.h
@@ -8353,8 +8354,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp + ../../../th
83538354
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.h + ../../../third_party/skia/LICENSE
83548355
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp + ../../../third_party/skia/LICENSE
83558356
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h + ../../../third_party/skia/LICENSE
8356-
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp + ../../../third_party/skia/LICENSE
8357-
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h + ../../../third_party/skia/LICENSE
83588357
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp + ../../../third_party/skia/LICENSE
83598358
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.h + ../../../third_party/skia/LICENSE
83608359
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp + ../../../third_party/skia/LICENSE
@@ -8575,8 +8574,6 @@ FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp
85758574
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.h
85768575
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp
85778576
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h
8578-
FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp
8579-
FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h
85808577
FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp
85818578
FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.h
85828579
FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp
@@ -8757,11 +8754,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h + ../../../th
87578754
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp + ../../../third_party/skia/LICENSE
87588755
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h + ../../../third_party/skia/LICENSE
87598756
ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../third_party/skia/LICENSE
8760-
ORIGIN: ../../../third_party/skia/src/gpu/piet/PietTypes.h + ../../../third_party/skia/LICENSE
8761-
ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.cpp + ../../../third_party/skia/LICENSE
8762-
ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.h + ../../../third_party/skia/LICENSE
8763-
ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.cpp + ../../../third_party/skia/LICENSE
8764-
ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.h + ../../../third_party/skia/LICENSE
87658757
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE
87668758
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE
87678759
TYPE: LicenseType.bsd
@@ -8779,11 +8771,6 @@ FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h
87798771
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp
87808772
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h
87818773
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp
8782-
FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h
8783-
FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp
8784-
FILE: ../../../third_party/skia/src/gpu/piet/Render.h
8785-
FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp
8786-
FILE: ../../../third_party/skia/src/gpu/piet/Scene.h
87878774
FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
87888775
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
87898776
----------------------------------------------------------------------------------------------------

‎ci/licenses_golden/licenses_third_party

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 36f70f102f3c815ac2c23bd10facee67
1+
Signature: 0957108b8f344f5f840417524392edfa
22

33
====================================================================================================
44
LIBRARY: angle

‎ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: aabe540615f08ecf9c89970cdec802bc
1+
Signature: f7b260cd821ec8f8838b3b739d9a4970
22

‎impeller/aiks/aiks_unittests.cc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,5 +2163,19 @@ TEST_P(AiksTest, OpaqueEntitiesGetCoercedToSource) {
21632163
ASSERT_EQ(entity.GetBlendMode(), BlendMode::kSource);
21642164
}
21652165

2166+
TEST_P(AiksTest, CanRenderDestructiveSaveLayer) {
2167+
Canvas canvas;
2168+
2169+
canvas.DrawPaint({.color = Color::Red()});
2170+
// Draw an empty savelayer with a destructive blend mode, which will replace
2171+
// the entire red screen with fully transparent black, except for the green
2172+
// circle drawn within the layer.
2173+
canvas.SaveLayer({.blend_mode = BlendMode::kSource});
2174+
canvas.DrawCircle({300, 300}, 100, {.color = Color::Green()});
2175+
canvas.Restore();
2176+
2177+
ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
2178+
}
2179+
21662180
} // namespace testing
21672181
} // namespace impeller

‎impeller/entity/contents/contents.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ bool Contents::ShouldRender(const Entity& entity,
109109
if (!stencil_coverage.has_value()) {
110110
return false;
111111
}
112-
if (Entity::IsBlendModeDestructive(entity.GetBlendMode())) {
113-
return true;
114-
}
115112

116113
auto coverage = GetCoverage(entity);
117114
if (!coverage.has_value()) {

‎impeller/entity/entity.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ bool Entity::SetInheritedOpacity(Scalar alpha) {
124124
return true;
125125
}
126126

127-
/// @brief Returns true if the blend mode is "destrictive", meaning that even
127+
/// @brief Returns true if the blend mode is "destructive", meaning that even
128128
/// fully transparent source colors would result in the destination
129129
/// getting changed.
130130
///

‎impeller/image/backends/skia/compressed_image_skia.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
#include "impeller/base/validation.h"
1010
#include "third_party/skia/include/core/SkBitmap.h"
1111
#include "third_party/skia/include/core/SkData.h"
12-
#include "third_party/skia/include/core/SkImageGenerator.h"
12+
#include "third_party/skia/include/core/SkImage.h"
1313
#include "third_party/skia/include/core/SkPixmap.h"
14+
#include "third_party/skia/include/core/SkRefCnt.h"
1415

1516
namespace impeller {
1617

@@ -46,12 +47,12 @@ DecompressedImage CompressedImageSkia::Decode() const {
4647
},
4748
src);
4849

49-
auto generator = SkImageGenerator::MakeFromEncoded(sk_data);
50-
if (!generator) {
50+
auto image = SkImages::DeferredFromEncodedData(sk_data);
51+
if (!image) {
5152
return {};
5253
}
5354

54-
const auto dims = generator->getInfo().dimensions();
55+
const auto dims = image->imageInfo().dimensions();
5556
auto info = SkImageInfo::Make(dims.width(), dims.height(),
5657
kRGBA_8888_SkColorType, kPremul_SkAlphaType);
5758

@@ -61,7 +62,7 @@ DecompressedImage CompressedImageSkia::Decode() const {
6162
return {};
6263
}
6364

64-
if (!generator->getPixels(bitmap->pixmap())) {
65+
if (!image->readPixels(nullptr, bitmap->pixmap(), 0, 0)) {
6566
VALIDATION_LOG << "Could not decompress image into arena.";
6667
return {};
6768
}

0 commit comments

Comments
 (0)