DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll Skia from 297dbc32a6c7 to 5f110d5f48a3 (2 revisions) (#170821)

Browse Source 
https://skia.googlesource.com/skia.git/+log/297dbc32a6c7..5f110d5f48a3

2025-06-18 robertphillips@google.com [graphite] More Android-specific
PaintOptions
2025-06-18 michaelludwig@google.com Revert "[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
This commit is contained in:
engine-flutter-autoroll 2025-06-18 15:19:54 -04:00 committed by GitHub
parent ea010f3e44
commit ae285146ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -14,7 +14,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '297dbc32a6c7cba67659f1cd2391b15aa85ce295',
'skia_revision': '5f110d5f48a3bb613384b7e3b995a911d2b35390',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

44
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: 4bce30e4bffdb72f2677589424314498
Signature: 1267f6428001717b8ce893810b527577
====================================================================================================
LIBRARY: etc1
@ -440,7 +440,6 @@ FILE: ../../../flutter/third_party/skia/relnotes/fontconfig.md
FILE: ../../../flutter/third_party/skia/relnotes/ganesh-vulkan11.md
FILE: ../../../flutter/third_party/skia/relnotes/ios12.md
FILE: ../../../flutter/third_party/skia/relnotes/macos1015.md
FILE: ../../../flutter/third_party/skia/relnotes/vulkan-feature-api.md
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@ -9900,43 +9899,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: skia
ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanPreferredFeatures.cpp + ../../../flutter/third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanPreferredFeatures.cpp
----------------------------------------------------------------------------------------------------
Copyright 2025 Google Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: skia
ORIGIN: ../../../flutter/third_party/skia/gm/hdr_pip_blur.cpp + ../../../flutter/third_party/skia/LICENSE
@ -9945,7 +9907,6 @@ ORIGIN: ../../../flutter/third_party/skia/include/core/SkCPURecorder.h + ../../.
ORIGIN: ../../../flutter/third_party/skia/include/core/SkRecorder.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnGraphiteTypes.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/vk/precompile/VulkanPrecompileShader.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanPreferredFeatures.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/SkPMColor.h + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings_gen.cpp + ../../../flutter/third_party/skia/LICENSE
@ -9979,7 +9940,6 @@ FILE: ../../../flutter/third_party/skia/include/core/SkCPURecorder.h
FILE: ../../../flutter/third_party/skia/include/core/SkRecorder.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnGraphiteTypes.h
FILE: ../../../flutter/third_party/skia/include/gpu/graphite/vk/precompile/VulkanPrecompileShader.h
FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanPreferredFeatures.h
FILE: ../../../flutter/third_party/skia/include/private/chromium/SkPMColor.h
FILE: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings.cpp
FILE: ../../../flutter/third_party/skia/modules/canvaskit/bidi_bindings_gen.cpp
@ -10077,4 +10037,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
Total license count: 74
Total license count: 73

32
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -27797,38 +27797,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia
Copyright 2025 Google Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia
Copyright 2025 Google LLC
Redistribution and use in source and binary forms, with or without