Skip to content

Commit 764a9e0

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from e1f3980272f3 to dfb838747295 (48 revisions) (flutter#38790)
https://skia.googlesource.com/skia.git/+log/e1f3980272f3..dfb838747295 2023-01-11 kjlubick@google.com Move two chromium-specific headers into i/p/chromium 2023-01-11 robertphillips@google.com [graphite] Make onMakeTextureImage create mipmap levels when needed 2023-01-11 ccameron@chromium.org Remove JpegGainmap from bazel build 2023-01-11 johnstiles@google.com Fix implementation of max(U32,U32) on SSE4.1/AVX. 2023-01-11 jvanverth@google.com [graphite] Trim whitespace and comments from text shaders 2023-01-11 johnstiles@google.com Fix SwizzleAsLValue test in RP. 2023-01-11 johnstiles@google.com Peephole-optimize away repeated branch calls. 2023-01-11 johnstiles@google.com Add for-loop support to RP codegen. 2023-01-11 kjlubick@google.com Reland "Remove staging flag SK_LEGACY_PATH_ARCTO_ENDPOINT" 2023-01-11 ccameron@chromium.org SkJpegCodec: Detect multi-picture format gainmaps 2023-01-11 kjlubick@google.com Break apart more gni file lists 2023-01-11 herb@google.com Make the logic for prepareFor(Mask|SDFT)Drawing the same 2023-01-11 kjlubick@google.com Fix file permissions on source file 2023-01-11 johnstiles@google.com Add support for intrinsic cross() in RP codegen. 2023-01-11 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 8bedae1a44a2 to c36104f3c23a 2023-01-11 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from c4a4ae610317 to 93e4d1cd4725 (7 revisions) 2023-01-11 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 493f3f310a2b to eab5947427ad (9 revisions) 2023-01-11 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from bc43ccfd822f to 8bedae1a44a2 (4 revisions) 2023-01-11 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from 477744b7b52c to 410b5acc7f3f (16 revisions) 2023-01-10 kjlubick@google.com Add gni file list for Skia codecs used by Chromium 2023-01-10 johnstiles@google.com Add partial RP codegen support for constant indices. 2023-01-10 armansito@google.com [graphite] Introduce ClearBuffersTask 2023-01-10 armansito@google.com [graphite] Use explicit curve type attribute when IEEE infinity is not supported 2023-01-10 johnstiles@google.com Disable all() intrinsic test on some Radeons. 2023-01-10 jmbetancourt@google.com create global symlink to Mac SDK during bazel toochain config 2023-01-10 kjlubick@google.com Break apart public and private gpu files in GN lists 2023-01-10 johnstiles@google.com Add RP builder support for cloning between stacks. 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from d110b2a1b9e3 to c4a4ae610317 (1 revision) 2023-01-10 kjlubick@google.com Update defines for libfuzzer builds 2023-01-10 nscobie@google.com Transitional integration of Perfetto tracing in Android Framework 2023-01-10 ccameron@chromium.org SkAndroidCodec: Add getGainmapInfo 2023-01-10 kjlubick@google.com [bazel] Break up shaper srcs 2023-01-10 johnstiles@google.com Add support for intrinsic any()/all() in RP codegen. 2023-01-10 ccameron@chromium.org SkJpegCodec: Add Multi-Picture Format (MPF) Support 2023-01-10 jvanverth@google.com [graphite] Track plot information and use it for conditional uploads 2023-01-10 armansito@google.com [graphite] Change RenderStep::vertexSkSL return type to std::string 2023-01-10 johnstiles@google.com Add support for intrinsic step() in RP codegen. 2023-01-10 robertphillips@google.com Revert "Clear special surfaces with red color on debug tests" 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from bc43ccfd822f to d0dc447f5709 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 9c1598af45f5 to 493f3f310a2b (8 revisions) 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from 10524e337d18 to bc43ccfd822f (4 revisions) 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from a3544353e82d to 477744b7b52c (11 revisions) 2023-01-10 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 8c09d95e66d0 to d110b2a1b9e3 (12 revisions) 2023-01-09 johnstiles@google.com Add support for bit-casting in RP codegen. 2023-01-09 herb@google.com Add analysis canvas and glyph data serialization to VIA 2023-01-09 johnstiles@google.com Add support for matrixCompMult in RP codegen. 2023-01-09 ccameron@chromium.org Add JpegSegmentScan utility 2023-01-09 brianosman@google.com Move SkTHash.h to src/core 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 aaclarke@google.com,herb@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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent cccaae2 commit 764a9e0

File tree

3 files changed

+98
-9
lines changed

3 files changed

+98
-9
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': 'e1f3980272f36023aa300c739fee8bef345f2ab3',
21+
'skia_revision': 'dfb838747295b9109343e6f536b25e9fa3fe933e',
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: 65 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 1b7e0d1182c107163b421488f3059d82
1+
Signature: fa9e0cdd5cd2189db5a01faa94515a3d
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -2310,12 +2310,12 @@ ORIGIN: ../../../third_party/skia/include/ports/SkFontConfigInterface.h + ../../
23102310
ORIGIN: ../../../third_party/skia/include/private/SkTLogic.h + ../../../third_party/skia/LICENSE
23112311
ORIGIN: ../../../third_party/skia/include/private/base/SkOnce.h + ../../../third_party/skia/LICENSE
23122312
ORIGIN: ../../../third_party/skia/include/private/base/SkTFitsIn.h + ../../../third_party/skia/LICENSE
2313+
ORIGIN: ../../../third_party/skia/include/private/chromium/SkDiscardableMemory.h + ../../../third_party/skia/LICENSE
23132314
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h + ../../../third_party/skia/LICENSE
23142315
ORIGIN: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h + ../../../third_party/skia/LICENSE
23152316
ORIGIN: ../../../third_party/skia/src/core/SkBitmapDevice.cpp + ../../../third_party/skia/LICENSE
23162317
ORIGIN: ../../../third_party/skia/src/core/SkBitmapDevice.h + ../../../third_party/skia/LICENSE
23172318
ORIGIN: ../../../third_party/skia/src/core/SkDataTable.cpp + ../../../third_party/skia/LICENSE
2318-
ORIGIN: ../../../third_party/skia/src/core/SkDiscardableMemory.h + ../../../third_party/skia/LICENSE
23192319
ORIGIN: ../../../third_party/skia/src/core/SkDocument.cpp + ../../../third_party/skia/LICENSE
23202320
ORIGIN: ../../../third_party/skia/src/core/SkDrawLooper.cpp + ../../../third_party/skia/LICENSE
23212321
ORIGIN: ../../../third_party/skia/src/core/SkFontStream.h + ../../../third_party/skia/LICENSE
@@ -2451,12 +2451,12 @@ FILE: ../../../third_party/skia/include/ports/SkFontConfigInterface.h
24512451
FILE: ../../../third_party/skia/include/private/SkTLogic.h
24522452
FILE: ../../../third_party/skia/include/private/base/SkOnce.h
24532453
FILE: ../../../third_party/skia/include/private/base/SkTFitsIn.h
2454+
FILE: ../../../third_party/skia/include/private/chromium/SkDiscardableMemory.h
24542455
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
24552456
FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
24562457
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.cpp
24572458
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.h
24582459
FILE: ../../../third_party/skia/src/core/SkDataTable.cpp
2459-
FILE: ../../../third_party/skia/src/core/SkDiscardableMemory.h
24602460
FILE: ../../../third_party/skia/src/core/SkDocument.cpp
24612461
FILE: ../../../third_party/skia/src/core/SkDrawLooper.cpp
24622462
FILE: ../../../third_party/skia/src/core/SkFontStream.h
@@ -3111,7 +3111,6 @@ ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_directory.h + ../../..
31113111
ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_empty.h + ../../../third_party/skia/LICENSE
31123112
ORIGIN: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h + ../../../third_party/skia/LICENSE
31133113
ORIGIN: ../../../third_party/skia/include/private/SkSpinlock.h + ../../../third_party/skia/LICENSE
3114-
ORIGIN: ../../../third_party/skia/include/private/SkTHash.h + ../../../third_party/skia/LICENSE
31153114
ORIGIN: ../../../third_party/skia/include/private/base/SkMutex.h + ../../../third_party/skia/LICENSE
31163115
ORIGIN: ../../../third_party/skia/include/private/base/SkSemaphore.h + ../../../third_party/skia/LICENSE
31173116
ORIGIN: ../../../third_party/skia/include/private/base/SkThreadID.h + ../../../third_party/skia/LICENSE
@@ -3181,6 +3180,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkSharedMutex.cpp + ../../../third_pa
31813180
ORIGIN: ../../../third_party/skia/src/core/SkSharedMutex.h + ../../../third_party/skia/LICENSE
31823181
ORIGIN: ../../../third_party/skia/src/core/SkSpinlock.cpp + ../../../third_party/skia/LICENSE
31833182
ORIGIN: ../../../third_party/skia/src/core/SkTDPQueue.h + ../../../third_party/skia/LICENSE
3183+
ORIGIN: ../../../third_party/skia/src/core/SkTHash.h + ../../../third_party/skia/LICENSE
31843184
ORIGIN: ../../../third_party/skia/src/core/SkThreadID.cpp + ../../../third_party/skia/LICENSE
31853185
ORIGIN: ../../../third_party/skia/src/core/SkTime.cpp + ../../../third_party/skia/LICENSE
31863186
ORIGIN: ../../../third_party/skia/src/core/SkXfermodeInterpretation.cpp + ../../../third_party/skia/LICENSE
@@ -3400,7 +3400,6 @@ FILE: ../../../third_party/skia/include/ports/SkFontMgr_directory.h
34003400
FILE: ../../../third_party/skia/include/ports/SkFontMgr_empty.h
34013401
FILE: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h
34023402
FILE: ../../../third_party/skia/include/private/SkSpinlock.h
3403-
FILE: ../../../third_party/skia/include/private/SkTHash.h
34043403
FILE: ../../../third_party/skia/include/private/base/SkMutex.h
34053404
FILE: ../../../third_party/skia/include/private/base/SkSemaphore.h
34063405
FILE: ../../../third_party/skia/include/private/base/SkThreadID.h
@@ -3470,6 +3469,7 @@ FILE: ../../../third_party/skia/src/core/SkSharedMutex.cpp
34703469
FILE: ../../../third_party/skia/src/core/SkSharedMutex.h
34713470
FILE: ../../../third_party/skia/src/core/SkSpinlock.cpp
34723471
FILE: ../../../third_party/skia/src/core/SkTDPQueue.h
3472+
FILE: ../../../third_party/skia/src/core/SkTHash.h
34733473
FILE: ../../../third_party/skia/src/core/SkThreadID.cpp
34743474
FILE: ../../../third_party/skia/src/core/SkTime.cpp
34753475
FILE: ../../../third_party/skia/src/core/SkXfermodeInterpretation.cpp
@@ -5772,6 +5772,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h + ../../../thir
57725772
ORIGIN: ../../../third_party/skia/include/ports/SkCFObject.h + ../../../third_party/skia/LICENSE
57735773
ORIGIN: ../../../third_party/skia/include/private/SkSLDefines.h + ../../../third_party/skia/LICENSE
57745774
ORIGIN: ../../../third_party/skia/include/private/SkVx.h + ../../../third_party/skia/LICENSE
5775+
ORIGIN: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h + ../../../third_party/skia/LICENSE
57755776
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrContext_Base.h + ../../../third_party/skia/LICENSE
57765777
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrImageContext.h + ../../../third_party/skia/LICENSE
57775778
ORIGIN: ../../../third_party/skia/modules/skottie/src/Composition.cpp + ../../../third_party/skia/LICENSE
@@ -5882,7 +5883,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm + ../../.
58825883
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp + ../../../third_party/skia/LICENSE
58835884
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.h + ../../../third_party/skia/LICENSE
58845885
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp + ../../../third_party/skia/LICENSE
5885-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h + ../../../third_party/skia/LICENSE
58865886
ORIGIN: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h + ../../../third_party/skia/LICENSE
58875887
ORIGIN: ../../../third_party/skia/src/image/SkSurface_GpuMtl.mm + ../../../third_party/skia/LICENSE
58885888
ORIGIN: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp + ../../../third_party/skia/LICENSE
@@ -5920,6 +5920,7 @@ FILE: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h
59205920
FILE: ../../../third_party/skia/include/ports/SkCFObject.h
59215921
FILE: ../../../third_party/skia/include/private/SkSLDefines.h
59225922
FILE: ../../../third_party/skia/include/private/SkVx.h
5923+
FILE: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h
59235924
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrContext_Base.h
59245925
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrImageContext.h
59255926
FILE: ../../../third_party/skia/modules/skottie/src/Composition.cpp
@@ -6030,7 +6031,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm
60306031
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp
60316032
FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.h
60326033
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp
6033-
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h
60346034
FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h
60356035
FILE: ../../../third_party/skia/src/image/SkSurface_GpuMtl.mm
60366036
FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp
@@ -8304,6 +8304,7 @@ ORIGIN: ../../../third_party/skia/include/private/base/SkFeatures.h + ../../../t
83048304
ORIGIN: ../../../third_party/skia/include/private/base/SkLoadUserConfig.h + ../../../third_party/skia/LICENSE
83058305
ORIGIN: ../../../third_party/skia/include/sksl/SkSLVersion.h + ../../../third_party/skia/LICENSE
83068306
ORIGIN: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp + ../../../third_party/skia/LICENSE
8307+
ORIGIN: ../../../third_party/skia/src/android/SkAndroidFrameworkPerfettoStaticStorage.cpp + ../../../third_party/skia/LICENSE
83078308
ORIGIN: ../../../third_party/skia/src/core/SkCapabilities.cpp + ../../../third_party/skia/LICENSE
83088309
ORIGIN: ../../../third_party/skia/src/core/SkDebugUtils.h + ../../../third_party/skia/LICENSE
83098310
ORIGIN: ../../../third_party/skia/src/core/SkPathUtils.cpp + ../../../third_party/skia/LICENSE
@@ -8327,6 +8328,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h
83278328
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h + ../../../third_party/skia/LICENSE
83288329
ORIGIN: ../../../third_party/skia/src/gpu/graphite/AttachmentTypes.h + ../../../third_party/skia/LICENSE
83298330
ORIGIN: ../../../third_party/skia/src/gpu/graphite/BuiltInCodeSnippetID.h + ../../../third_party/skia/LICENSE
8331+
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ClearBuffersTask.cpp + ../../../third_party/skia/LICENSE
8332+
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ClearBuffersTask.h + ../../../third_party/skia/LICENSE
83308333
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.cpp + ../../../third_party/skia/LICENSE
83318334
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.h + ../../../third_party/skia/LICENSE
83328335
ORIGIN: ../../../third_party/skia/src/gpu/graphite/ClipStack.cpp + ../../../third_party/skia/LICENSE
@@ -8525,6 +8528,7 @@ FILE: ../../../third_party/skia/include/private/base/SkFeatures.h
85258528
FILE: ../../../third_party/skia/include/private/base/SkLoadUserConfig.h
85268529
FILE: ../../../third_party/skia/include/sksl/SkSLVersion.h
85278530
FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp
8531+
FILE: ../../../third_party/skia/src/android/SkAndroidFrameworkPerfettoStaticStorage.cpp
85288532
FILE: ../../../third_party/skia/src/core/SkCapabilities.cpp
85298533
FILE: ../../../third_party/skia/src/core/SkDebugUtils.h
85308534
FILE: ../../../third_party/skia/src/core/SkPathUtils.cpp
@@ -8548,6 +8552,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h
85488552
FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h
85498553
FILE: ../../../third_party/skia/src/gpu/graphite/AttachmentTypes.h
85508554
FILE: ../../../third_party/skia/src/gpu/graphite/BuiltInCodeSnippetID.h
8555+
FILE: ../../../third_party/skia/src/gpu/graphite/ClearBuffersTask.cpp
8556+
FILE: ../../../third_party/skia/src/gpu/graphite/ClearBuffersTask.h
85518557
FILE: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.cpp
85528558
FILE: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.h
85538559
FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack.cpp
@@ -8867,16 +8873,67 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
88678873
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
88688874
====================================================================================================
88698875

8876+
====================================================================================================
8877+
LIBRARY: skia
8878+
ORIGIN: ../../../third_party/skia/include/private/SkGainmapInfo.h + ../../../third_party/skia/LICENSE
8879+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp + ../../../third_party/skia/LICENSE
8880+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegGainmap.h + ../../../third_party/skia/LICENSE
8881+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../third_party/skia/LICENSE
8882+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h + ../../../third_party/skia/LICENSE
8883+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../third_party/skia/LICENSE
8884+
ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../third_party/skia/LICENSE
8885+
TYPE: LicenseType.bsd
8886+
FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h
8887+
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp
8888+
FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.h
8889+
FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp
8890+
FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h
8891+
FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp
8892+
FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h
8893+
----------------------------------------------------------------------------------------------------
8894+
Copyright 2023 Google Inc.
8895+
8896+
Redistribution and use in source and binary forms, with or without
8897+
modification, are permitted provided that the following conditions are
8898+
met:
8899+
8900+
* Redistributions of source code must retain the above copyright
8901+
notice, this list of conditions and the following disclaimer.
8902+
8903+
* Redistributions in binary form must reproduce the above copyright
8904+
notice, this list of conditions and the following disclaimer in
8905+
the documentation and/or other materials provided with the
8906+
distribution.
8907+
8908+
* Neither the name of the copyright holder nor the names of its
8909+
contributors may be used to endorse or promote products derived
8910+
from this software without specific prior written permission.
8911+
8912+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
8913+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
8914+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
8915+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
8916+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
8917+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
8918+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
8919+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
8920+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
8921+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
8922+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8923+
====================================================================================================
8924+
88708925
====================================================================================================
88718926
LIBRARY: skia
88728927
ORIGIN: ../../../third_party/skia/include/private/SkDeque.h + ../../../third_party/skia/LICENSE
88738928
ORIGIN: ../../../third_party/skia/include/private/SkMalloc.h + ../../../third_party/skia/LICENSE
88748929
ORIGIN: ../../../third_party/skia/include/private/SkTo.h + ../../../third_party/skia/LICENSE
8930+
ORIGIN: ../../../third_party/skia/src/core/SkDiscardableMemory.h + ../../../third_party/skia/LICENSE
88758931
ORIGIN: ../../../third_party/skia/src/core/SkFloatingPoint.cpp + ../../../third_party/skia/LICENSE
88768932
TYPE: LicenseType.bsd
88778933
FILE: ../../../third_party/skia/include/private/SkDeque.h
88788934
FILE: ../../../third_party/skia/include/private/SkMalloc.h
88798935
FILE: ../../../third_party/skia/include/private/SkTo.h
8936+
FILE: ../../../third_party/skia/src/core/SkDiscardableMemory.h
88808937
FILE: ../../../third_party/skia/src/core/SkFloatingPoint.cpp
88818938
----------------------------------------------------------------------------------------------------
88828939
Copyright 2023 Google LLC
@@ -8910,4 +8967,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
89108967
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
89118968
====================================================================================================
89128969

8913-
Total license count: 63
8970+
Total license count: 64

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27652,6 +27652,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2765227652
--------------------------------------------------------------------------------
2765327653
skia
2765427654

27655+
Copyright 2023 Google Inc.
27656+
27657+
Redistribution and use in source and binary forms, with or without
27658+
modification, are permitted provided that the following conditions are
27659+
met:
27660+
27661+
* Redistributions of source code must retain the above copyright
27662+
notice, this list of conditions and the following disclaimer.
27663+
27664+
* Redistributions in binary form must reproduce the above copyright
27665+
notice, this list of conditions and the following disclaimer in
27666+
the documentation and/or other materials provided with the
27667+
distribution.
27668+
27669+
* Neither the name of the copyright holder nor the names of its
27670+
contributors may be used to endorse or promote products derived
27671+
from this software without specific prior written permission.
27672+
27673+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27674+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27675+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
27676+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27677+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27678+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27679+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27680+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27681+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27682+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27683+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27684+
--------------------------------------------------------------------------------
27685+
skia
27686+
2765527687
Copyright 2023 Google LLC
2765627688

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

0 commit comments

Comments
 (0)