Skip to content

Commit 85a9b4f

Browse files
Roll Skia from af242598f14d to 794936b23812 (2 revisions) (flutter#170875)
https://skia.googlesource.com/skia.git/+log/af242598f14d..794936b23812 2025-06-19 syoussefi@google.com Replace bug ids with mapped ids in the new issue tracker - v2 2025-06-19 syoussefi@google.com Reland "[vulkan] Add helpers for Skia to enable Vulkan features" If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC danieldilan@google.com,jimgraham@google.com,kjlubick@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent 3143e7c commit 85a9b4f

File tree

3 files changed

+75
-3
lines changed

3 files changed

+75
-3
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
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': 'af242598f14d52e580d1005232f3012e750e705f',
17+
'skia_revision': '794936b23812d1a52ffda13a506ace4e1bf954ac',
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.

engine/src/flutter/ci/licenses_golden/licenses_skia

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 2f8c959b84dddc4afae88ab8705a6778
1+
Signature: 362a50f3c95387624dd85f340fd2343e
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -440,6 +440,7 @@ FILE: ../../../flutter/third_party/skia/relnotes/fontconfig.md
440440
FILE: ../../../flutter/third_party/skia/relnotes/ganesh-vulkan11.md
441441
FILE: ../../../flutter/third_party/skia/relnotes/ios12.md
442442
FILE: ../../../flutter/third_party/skia/relnotes/macos1015.md
443+
FILE: ../../../flutter/third_party/skia/relnotes/vulkan-feature-api.md
443444
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
444445
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
445446
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@@ -9899,6 +9900,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
98999900
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99009901
====================================================================================================
99019902

9903+
====================================================================================================
9904+
LIBRARY: skia
9905+
ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanPreferredFeatures.cpp + ../../../flutter/third_party/skia/LICENSE
9906+
TYPE: LicenseType.bsd
9907+
FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanPreferredFeatures.cpp
9908+
----------------------------------------------------------------------------------------------------
9909+
Copyright 2025 Google Inc.
9910+
9911+
Redistribution and use in source and binary forms, with or without
9912+
modification, are permitted provided that the following conditions are
9913+
met:
9914+
9915+
* Redistributions of source code must retain the above copyright
9916+
notice, this list of conditions and the following disclaimer.
9917+
9918+
* Redistributions in binary form must reproduce the above copyright
9919+
notice, this list of conditions and the following disclaimer in
9920+
the documentation and/or other materials provided with the
9921+
distribution.
9922+
9923+
* Neither the name of the copyright holder nor the names of its
9924+
contributors may be used to endorse or promote products derived
9925+
from this software without specific prior written permission.
9926+
9927+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9928+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9929+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9930+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9931+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9932+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9933+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9934+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9935+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9936+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9937+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9938+
====================================================================================================
9939+
99029940
====================================================================================================
99039941
LIBRARY: skia
99049942
ORIGIN: ../../../flutter/third_party/skia/gm/hdr_pip_blur.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -9907,6 +9945,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkCPURecorder.h + ../../.
99079945
ORIGIN: ../../../flutter/third_party/skia/include/core/SkRecorder.h + ../../../flutter/third_party/skia/LICENSE
99089946
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnGraphiteTypes.h + ../../../flutter/third_party/skia/LICENSE
99099947
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/vk/precompile/VulkanPrecompileShader.h + ../../../flutter/third_party/skia/LICENSE
9948+
ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanPreferredFeatures.h + ../../../flutter/third_party/skia/LICENSE
99109949
ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/SkPMColor.h + ../../../flutter/third_party/skia/LICENSE
99119950
ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
99129951
ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings_gen.cpp + ../../../flutter/third_party/skia/LICENSE
@@ -9940,6 +9979,7 @@ FILE: ../../../flutter/third_party/skia/include/core/SkCPURecorder.h
99409979
FILE: ../../../flutter/third_party/skia/include/core/SkRecorder.h
99419980
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnGraphiteTypes.h
99429981
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/vk/precompile/VulkanPrecompileShader.h
9982+
FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanPreferredFeatures.h
99439983
FILE: ../../../flutter/third_party/skia/include/private/chromium/SkPMColor.h
99449984
FILE: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings.cpp
99459985
FILE: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings_gen.cpp
@@ -10037,4 +10077,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1003710077
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1003810078
====================================================================================================
1003910079

10040-
Total license count: 73
10080+
Total license count: 74

engine/src/flutter/sky/packages/sky_engine/LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27797,6 +27797,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2779727797
--------------------------------------------------------------------------------
2779827798
skia
2779927799

27800+
Copyright 2025 Google Inc.
27801+
27802+
Redistribution and use in source and binary forms, with or without
27803+
modification, are permitted provided that the following conditions are
27804+
met:
27805+
27806+
* Redistributions of source code must retain the above copyright
27807+
notice, this list of conditions and the following disclaimer.
27808+
27809+
* Redistributions in binary form must reproduce the above copyright
27810+
notice, this list of conditions and the following disclaimer in
27811+
the documentation and/or other materials provided with the
27812+
distribution.
27813+
27814+
* Neither the name of the copyright holder nor the names of its
27815+
contributors may be used to endorse or promote products derived
27816+
from this software without specific prior written permission.
27817+
27818+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27819+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27820+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
27821+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27822+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27823+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27824+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27825+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27826+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27827+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27828+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27829+
--------------------------------------------------------------------------------
27830+
skia
27831+
2780027832
Copyright 2025 Google LLC
2780127833

2780227834
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)