Skip to content

Commit 356ab2a

Browse files
Roll Skia from d86da2a029d8 to 2f67f1f18562 (36 revisions) (flutter#46636)
Roll Skia from d86da2a029d8 to 2f67f1f18562 (36 revisions) https://skia.googlesource.com/skia.git/+log/d86da2a029d8..2f67f1f18562 2023-10-06 kjlubick@google.com Add dedicated function to calculate length of Base64 encoded string 2023-10-06 bungeman@google.com [pathops] Simplify trivial paths to empty 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 44a79902f2c1 to 01742293d0f2 (11 revisions) 2023-10-06 johnstiles@google.com Add fuzzer for SkSL-to-WGSL. 2023-10-06 johnstiles@google.com Add fuzzer for runtime blenders. 2023-10-06 johnstiles@google.com Add fuzzer for runtime color filters. 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Manual roll Dawn from a42cebae4e42 to ac72499c0a8a (91 revisions) 2023-10-06 kjlubick@google.com Split codec-related parts out of tools/Resources.h 2023-10-06 drott@chromium.org [Fontations] Borrow glyph mask flag implementation from FreeType 2023-10-06 jvanverth@google.com Try to fix Dawn roll again. 2023-10-06 drott@chromium.org [Fontations] FFI Interface for accessing CPAL and COLRv0 info 2023-10-06 jvanverth@google.com Disable Tint's use of //build directory to fix Dawn roll 2023-10-06 johnstiles@google.com Add workaround for dropped clear in VKDMSAA. 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 3d75b794df0f to 8c341cfdef74 (3 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 46c5d45d5955 to 44a79902f2c1 (15 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from e12f70e0a324 to 8d9cef29be25 (3 revisions) 2023-10-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 535363447183 to 8d9cef29be25 2023-10-06 jvanverth@google.com [graphite] Revise PathAtlas::onAddShape interface. 2023-10-05 lovisolo@google.com [bazel] BazelBenchmarkRunner.cpp: Write results.json output file in Perf's new JSON format. 2023-10-05 johnstiles@google.com Factor out FuzzCreateValidInputsForRuntimeEffect to FuzzCommon. 2023-10-05 johnstiles@google.com Disable broken GMs on Adreno 5xx/6xx + Vulkan. 2023-10-05 kjlubick@google.com Split ToolUtils into a few files for easier modularization 2023-10-05 kjlubick@google.com Enforce IWYU on ToolUtils.h 2023-10-05 bungeman@google.com Revert "[pdf] Simplify filled paths" 2023-10-05 johnstiles@google.com Outset the rect passed to SkMesh::MakeIndexed. 2023-10-05 kjlubick@google.com Use buildifier to reformat all Bazel files 2023-10-05 robertphillips@google.com [graphite] Short circuit key generation for simple paints 2023-10-05 johnstiles@google.com Add saturate to list of supported WGSL intrinsics. 2023-10-05 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 404a76d9bf0e to 46c5d45d5955 (1 revision) 2023-10-05 bungeman@google.com [pdf] Simplify filled paths 2023-10-05 kjlubick@google.com Make SkReadBuffer *not* call SkImages::DeferredFromEncodedData by default 2023-10-05 armansito@google.com [graphite][dawn][viewer] Support turning vsync off 2023-10-05 lovisolo@google.com [bazel] BazelBenchmarkRunner.cpp: Add more flags and better validation. 2023-10-05 robertphillips@google.com [graphite] Add CoeffBlenderBlock::AddBlock 2023-10-05 robertphillips@google.com [graphite] Add ColorSpaceTransformBlock::AddBlock 2023-10-05 johnstiles@google.com Enable child effects in SkMesh programs. 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 brianosman@google.com,chinmaygarde@google.com,djsollen@google.com,rmistry@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 ...
1 parent 1f79667 commit 356ab2a

File tree

3 files changed

+78
-3
lines changed

3 files changed

+78
-3
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
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': 'd86da2a029d871842d23b143cef0a1c41b9fa4ea',
21+
'skia_revision': '2f67f1f18562ddd6b43bf7eaca6a17bfcd0a71df',
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.

ci/licenses_golden/licenses_skia

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5403ba875f3c376fc4909ab25af23332
1+
Signature: 349f2b2727ab66f3e2b6faa50843433b
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -386,6 +386,8 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js
386386
FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js
387387
FILE: ../../../third_party/skia/modules/skparagraph/test.html
388388
FILE: ../../../third_party/skia/package-lock.json
389+
FILE: ../../../third_party/skia/relnotes/mesh.md
390+
FILE: ../../../third_party/skia/relnotes/readbuffer-deserial.md
389391
FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt
390392
FILE: ../../../third_party/skia/src/ports/fontations/Cargo.toml
391393
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@@ -9355,6 +9357,47 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
93559357
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
93569358
====================================================================================================
93579359

9360+
====================================================================================================
9361+
LIBRARY: skia
9362+
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp + ../../../third_party/skia/LICENSE
9363+
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp + ../../../third_party/skia/LICENSE
9364+
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp + ../../../third_party/skia/LICENSE
9365+
TYPE: LicenseType.bsd
9366+
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp
9367+
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp
9368+
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp
9369+
----------------------------------------------------------------------------------------------------
9370+
Copyright 2023 Google, LLC
9371+
9372+
Redistribution and use in source and binary forms, with or without
9373+
modification, are permitted provided that the following conditions are
9374+
met:
9375+
9376+
* Redistributions of source code must retain the above copyright
9377+
notice, this list of conditions and the following disclaimer.
9378+
9379+
* Redistributions in binary form must reproduce the above copyright
9380+
notice, this list of conditions and the following disclaimer in
9381+
the documentation and/or other materials provided with the
9382+
distribution.
9383+
9384+
* Neither the name of the copyright holder nor the names of its
9385+
contributors may be used to endorse or promote products derived
9386+
from this software without specific prior written permission.
9387+
9388+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9389+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9390+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9391+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9392+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9393+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9394+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9395+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9396+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9397+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9398+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9399+
====================================================================================================
9400+
93589401
====================================================================================================
93599402
LIBRARY: skia
93609403
ORIGIN: ../../../third_party/skia/src/shaders/SkCoordClampShader.cpp + ../../../third_party/skia/LICENSE
@@ -9392,4 +9435,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
93929435
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
93939436
====================================================================================================
93949437

9395-
Total license count: 67
9438+
Total license count: 68

sky/packages/sky_engine/LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28118,6 +28118,38 @@ skia
2811828118

2811928119
Copyright 2023 Google LLC.
2812028120

28121+
Redistribution and use in source and binary forms, with or without
28122+
modification, are permitted provided that the following conditions are
28123+
met:
28124+
28125+
* Redistributions of source code must retain the above copyright
28126+
notice, this list of conditions and the following disclaimer.
28127+
28128+
* Redistributions in binary form must reproduce the above copyright
28129+
notice, this list of conditions and the following disclaimer in
28130+
the documentation and/or other materials provided with the
28131+
distribution.
28132+
28133+
* Neither the name of the copyright holder nor the names of its
28134+
contributors may be used to endorse or promote products derived
28135+
from this software without specific prior written permission.
28136+
28137+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
28138+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
28139+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
28140+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
28141+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28142+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28143+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28144+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28145+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28146+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28147+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28148+
--------------------------------------------------------------------------------
28149+
skia
28150+
28151+
Copyright 2023 Google, LLC
28152+
2812128153
Redistribution and use in source and binary forms, with or without
2812228154
modification, are permitted provided that the following conditions are
2812328155
met:

0 commit comments

Comments
 (0)