mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Roll Skia from c09761f57605 to 450f8565c7f3 (5 revisions) (flutter/engine#23851)
This commit is contained in:
parent
10bab4efbb
commit
c7e43241e9
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': 'c09761f57605f408e473a73fbfe25a2636676bfa',
|
||||
'skia_revision': '450f8565c7f36205cc72e5f7f5e01eb024e8c38a',
|
||||
|
||||
# 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: 4c6610f0219dce60017a88c13387fc5a
|
||||
Signature: 3813f6b2dde61189709dfb18f3ce2608
|
||||
|
||||
UNUSED LICENSES:
|
||||
|
||||
@ -5459,6 +5459,53 @@ 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/bench/TriangulatorBench.cpp + ../../../third_party/skia/LICENSE
|
||||
TYPE: LicenseType.bsd
|
||||
FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
|
||||
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
|
||||
FILE: ../../../third_party/skia/gm/lazytiling.cpp
|
||||
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
|
||||
FILE: ../../../third_party/skia/src/gpu/GrInnerFanTriangulator.h
|
||||
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
|
||||
----------------------------------------------------------------------------------------------------
|
||||
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/docs/examples/50_percent_gray.cpp + ../../../third_party/skia/LICENSE
|
||||
@ -5982,51 +6029,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/gm/crbug_1167277.cpp + ../../../third_party/skia/LICENSE
|
||||
TYPE: LicenseType.bsd
|
||||
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
|
||||
FILE: ../../../third_party/skia/gm/lazytiling.cpp
|
||||
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
|
||||
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
|
||||
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
|
||||
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
|
||||
----------------------------------------------------------------------------------------------------
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user