Skip to content

Commit

Permalink
Roll Skia from 88bdb0c778ed to 75e4b07cb82a (23 revisions) (flutter#4…
Browse files Browse the repository at this point in the history
…0252)

Roll Skia from 88bdb0c778ed to 75e4b07cb82a (23 revisions)
  • Loading branch information
skia-flutter-autoroll authored Mar 13, 2023
1 parent ce9fefc commit d70dee3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 76 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '88bdb0c778edc931e4c0aa6d9d13e32c36e8a123',
'skia_revision': '75e4b07cb82ad98ab138cc1a8cd6c12757ecc0e7',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,7 @@
../../../third_party/skia/src/encode/BUILD.bazel
../../../third_party/skia/src/fonts/BUILD.bazel
../../../third_party/skia/src/gpu/BUILD.bazel
../../../third_party/skia/src/gpu/dawn/BUILD.bazel
../../../third_party/skia/src/gpu/ganesh/BUILD.bazel
../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel
Expand Down
61 changes: 18 additions & 43 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: e9a091de214ed546edc0fcbcbc03a7c7
Signature: 3d23161c739fcdf8ba41a76c7519248a

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -5191,7 +5191,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkSafeRange.h + ../../../third_party/
ORIGIN: ../../../third_party/skia/src/core/SkStrikeCache.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkSurfaceCharacterization.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkTextBlobPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkTypeface_remote.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkTypeface_remote.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/effects/SkOpPE.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/effects/SkOpPathEffect.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -5411,7 +5410,6 @@ FILE: ../../../third_party/skia/src/core/SkSafeRange.h
FILE: ../../../third_party/skia/src/core/SkStrikeCache.cpp
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/effects/SkOpPE.h
FILE: ../../../third_party/skia/src/effects/SkOpPathEffect.cpp
Expand Down Expand Up @@ -5542,11 +5540,13 @@ ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/s
ORIGIN: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkTypeface_remote.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp
FILE: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp
FILE: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
FILE: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp
FILE: ../../../third_party/skia/src/core/SkTypeface_remote.cpp
----------------------------------------------------------------------------------------------------
Copyright 2018 Google LLC

Expand Down Expand Up @@ -8899,6 +8899,7 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegXmp.h + ../../../third_party/s
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/encode/SkJpegGainmapEncoder.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtils.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/coordclampshader.cpp
Expand All @@ -8919,6 +8920,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegXmp.h
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpContexts.h
FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h
FILE: ../../../third_party/skia/src/encode/SkJpegGainmapEncoder.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtils.cpp
FILE: ../../../third_party/skia/src/shaders/SkGainmapShader.cpp
----------------------------------------------------------------------------------------------------
Copyright 2023 Google Inc.
Expand Down Expand Up @@ -8957,6 +8959,7 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/gm/graphite_replay.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/android/SkImageAndroid.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/include/private/base/SkCPUTypes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkBezierCurves.h + ../../../third_party/skia/LICENSE
Expand All @@ -8966,12 +8969,16 @@ ORIGIN: ../../../third_party/skia/src/base/SkFloatingPoint.cpp + ../../../third_
ORIGIN: ../../../third_party/skia/src/base/SkQuads.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkQuads.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkSafeMath.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkPixmapDraw.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkRSXform.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkReadPixelsRec.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/encode/SkEncoder.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrPinnableImage.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp + ../../../third_party/skia/LICENSE
Expand All @@ -8983,6 +8990,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/YUVATextureProxies.h + ../../
ORIGIN: ../../../third_party/skia/src/gpu/graphite/compute/ComputeStep.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/compute/ComputeStep.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/image/SkImage_AndroidFactories.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/image/SkImage_Base.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/image/SkImage_Raster.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/image/SkSurface_Base.cpp + ../../../third_party/skia/LICENSE
Expand All @@ -8994,6 +9002,7 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzCubicQuadRoots.cpp
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCubicQuadRoots.cpp
FILE: ../../../third_party/skia/gm/graphite_replay.cpp
FILE: ../../../third_party/skia/include/android/SkImageAndroid.h
FILE: ../../../third_party/skia/include/gpu/graphite/YUVABackendTextures.h
FILE: ../../../third_party/skia/include/private/base/SkCPUTypes.h
FILE: ../../../third_party/skia/src/base/SkBezierCurves.h
Expand All @@ -9003,12 +9012,16 @@ FILE: ../../../third_party/skia/src/base/SkFloatingPoint.cpp
FILE: ../../../third_party/skia/src/base/SkQuads.cpp
FILE: ../../../third_party/skia/src/base/SkQuads.h
FILE: ../../../third_party/skia/src/base/SkSafeMath.cpp
FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp
FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.h
FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.cpp
FILE: ../../../third_party/skia/src/core/SkPixmapDraw.cpp
FILE: ../../../third_party/skia/src/core/SkRSXform.cpp
FILE: ../../../third_party/skia/src/core/SkReadPixelsRec.cpp
FILE: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp
FILE: ../../../third_party/skia/src/encode/SkEncoder.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h
FILE: ../../../third_party/skia/src/gpu/ganesh/GrPinnableImage.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/Image_Base_Graphite.h
FILE: ../../../third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp
Expand All @@ -9020,6 +9033,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/YUVATextureProxies.h
FILE: ../../../third_party/skia/src/gpu/graphite/compute/ComputeStep.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/compute/ComputeStep.h
FILE: ../../../third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.h
FILE: ../../../third_party/skia/src/image/SkImage_AndroidFactories.cpp
FILE: ../../../third_party/skia/src/image/SkImage_Base.cpp
FILE: ../../../third_party/skia/src/image/SkImage_Raster.h
FILE: ../../../third_party/skia/src/image/SkSurface_Base.cpp
Expand Down Expand Up @@ -9059,45 +9073,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/core/SkFontMetricsPriv.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFontMetricsPriv.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.cpp
FILE: ../../../third_party/skia/src/core/SkFontMetricsPriv.h
----------------------------------------------------------------------------------------------------
Copyright 2023 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/shaders/SkCoordClampShader.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -9135,4 +9110,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

Total license count: 67
Total license count: 66
32 changes: 0 additions & 32 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -28049,38 +28049,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia

Copyright 2023 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.
--------------------------------------------------------------------------------
skia

Copyright 2023 The Android Open Source Project

Redistribution and use in source and binary forms, with or without
Expand Down

0 comments on commit d70dee3

Please sign in to comment.