mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Roll Skia from dfa91793f8e9 to c616e1c1791c (16 revisions) (flutter/engine#24361)
This commit is contained in:
parent
d37c9eb651
commit
1eb82066f9
2
DEPS
2
DEPS
@ -27,7 +27,7 @@ vars = {
|
||||
'skia_git': 'https://skia.googlesource.com',
|
||||
# OCMock is for testing only so there is no google clone
|
||||
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
|
||||
'skia_revision': 'dfa91793f8e91741a67a0598078a3afb35bb95fa',
|
||||
'skia_revision': 'c616e1c1791c79a8cdec0d6c23dcb3b172228b96',
|
||||
|
||||
# When updating the Dart revision, ensure that all entries that are
|
||||
# dependencies of Dart are also updated to match the entries in the
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Signature: bdc925904f19ee6d852e0c5870675474
|
||||
Signature: 36f62a413b82c3f5fe5c8743d28ceba8
|
||||
|
||||
UNUSED LICENSES:
|
||||
|
||||
@ -3857,6 +3857,7 @@ FILE: ../../../third_party/skia/fuzz/FuzzSkParagraph.cpp
|
||||
FILE: ../../../third_party/skia/gm/3d.cpp
|
||||
FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
|
||||
FILE: ../../../third_party/skia/gm/bicubic.cpp
|
||||
FILE: ../../../third_party/skia/gm/colrv1.cpp
|
||||
FILE: ../../../third_party/skia/gm/compressed_textures.cpp
|
||||
FILE: ../../../third_party/skia/gm/crbug_1073670.cpp
|
||||
FILE: ../../../third_party/skia/gm/crbug_1086705.cpp
|
||||
@ -6021,6 +6022,58 @@ 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: ../../../third_party/skia/gm/dsl_processor_test.cpp + ../../../third_party/skia/LICENSE
|
||||
TYPE: LicenseType.bsd
|
||||
FILE: ../../../third_party/skia/gm/dsl_processor_test.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.h
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLCase.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.h
|
||||
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp
|
||||
----------------------------------------------------------------------------------------------------
|
||||
Copyright 2021 Google LLC.
|
||||
|
||||
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: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE
|
||||
@ -7132,12 +7185,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
====================================================================================================
|
||||
LIBRARY: skia
|
||||
ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkPictureImageFilter.cpp + ../../../third_party/skia/LICENSE
|
||||
ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp + ../../../third_party/skia/LICENSE
|
||||
TYPE: LicenseType.bsd
|
||||
FILE: ../../../third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp
|
||||
FILE: ../../../third_party/skia/src/effects/imagefilters/SkPictureImageFilter.cpp
|
||||
FILE: ../../../third_party/skia/src/effects/imagefilters/SkPictureImageFilter.h
|
||||
FILE: ../../../third_party/skia/src/effects/imagefilters/SkXfermodeImageFilter.cpp
|
||||
FILE: ../../../third_party/skia/src/effects/imagefilters/SkXfermodeImageFilter.h
|
||||
----------------------------------------------------------------------------------------------------
|
||||
Copyright 2013 The Android Open Source Project
|
||||
|
||||
@ -7246,57 +7298,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: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp + ../../../third_party/skia/LICENSE
|
||||
TYPE: LicenseType.bsd
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.h
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatingStencilFillOp.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLCase.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLFPs.h
|
||||
FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp
|
||||
----------------------------------------------------------------------------------------------------
|
||||
Copyright 2021 Google LLC.
|
||||
|
||||
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: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user