Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll Skia from 93c2d81f199a to 9fd75e96d712 (29 revisions) #23635

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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': '93c2d81f199a70ebbd1eb21b8f89b1b13a95714c',
'skia_revision': '9fd75e96d712c3339b393464200b469735000a92',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
88 changes: 46 additions & 42 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 84140fb7d65f27df2843eae193e385f4
Signature: 08ddd0c49dbfdd8018be56a7f0161178

UNUSED LICENSES:

Expand Down Expand Up @@ -492,7 +492,6 @@ FILE: ../../../third_party/skia/include/core/SkMilestone.h
FILE: ../../../third_party/skia/include/core/SkOverdrawCanvas.h
FILE: ../../../third_party/skia/include/core/SkRasterHandleAllocator.h
FILE: ../../../third_party/skia/include/core/SkSwizzle.h
FILE: ../../../third_party/skia/include/core/SkYUVASizeInfo.h
FILE: ../../../third_party/skia/include/effects/SkArithmeticImageFilter.h
FILE: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h
FILE: ../../../third_party/skia/include/effects/SkPaintImageFilter.h
Expand Down Expand Up @@ -3263,7 +3262,6 @@ FILE: ../../../third_party/skia/include/core/SkCubicMap.h
FILE: ../../../third_party/skia/include/core/SkFontMetrics.h
FILE: ../../../third_party/skia/include/core/SkFontParameters.h
FILE: ../../../third_party/skia/include/core/SkFontTypes.h
FILE: ../../../third_party/skia/include/core/SkYUVAIndex.h
FILE: ../../../third_party/skia/include/effects/SkOpPathEffect.h
FILE: ../../../third_party/skia/include/effects/SkShaderMaskFilter.h
FILE: ../../../third_party/skia/include/effects/SkTrimPathEffect.h
Expand Down Expand Up @@ -3345,7 +3343,6 @@ FILE: ../../../third_party/skia/src/core/SkSurfaceCharacterization.cpp
FILE: ../../../third_party/skia/src/core/SkTextBlobPriv.h
FILE: ../../../third_party/skia/src/core/SkTypeface_remote.cpp
FILE: ../../../third_party/skia/src/core/SkTypeface_remote.h
FILE: ../../../third_party/skia/src/core/SkYUVASizeInfo.cpp
FILE: ../../../third_party/skia/src/effects/SkOpPE.h
FILE: ../../../third_party/skia/src/effects/SkOpPathEffect.cpp
FILE: ../../../third_party/skia/src/effects/SkShaderMaskFilter.cpp
Expand Down Expand Up @@ -4016,6 +4013,8 @@ FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.h
FILE: ../../../third_party/skia/src/sksl/dsl/DSLVar.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/DSLVar.h
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp
FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.h
FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
Expand Down Expand Up @@ -4152,13 +4151,15 @@ FILE: ../../../third_party/skia/modules/svg/include/SkSVGFe.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeColorMatrix.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeComposite.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeFlood.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeGaussianBlur.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeTurbulence.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilter.h
FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilterContext.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFe.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeColorMatrix.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeComposite.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeFlood.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeGaussianBlur.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeTurbulence.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilter.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
Expand All @@ -4180,6 +4181,8 @@ FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.h
FILE: ../../../third_party/skia/src/core/SkOpts_erms.cpp
FILE: ../../../third_party/skia/src/core/SkSamplingPriv.h
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.cpp
FILE: ../../../third_party/skia/src/gpu/GrAATriangulator.h
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp
FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h
FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h
Expand Down Expand Up @@ -7118,6 +7121,45 @@ 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/core/SkYUVAInfoLocation.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.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/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7330,44 +7372,6 @@ The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Materials.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/sksl/SkSLContext.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
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/src/sksl/SkSLMangler.cpp + ../../../third_party/skia/LICENSE
Expand Down