Skip to content

Commit

Permalink
Roll src/third_party/skia 1e21d14f2b8b..c12aad9485a9 (20 commits) (fl…
Browse files Browse the repository at this point in the history 
…utter#17942)
  • Loading branch information
@skia-flutter-autoroll
skia-flutter-autoroll authored Apr 24, 2020
1 parent d01de3b commit 3999ef9
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 108 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
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': '1e21d14f2b8bb088be47b7787f4b4b7d38459a6b',
'skia_revision': 'c12aad9485a969c3a79173baac1ac12de45bbde9',

# 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
218 changes: 111 additions & 107 deletions ci/licenses_golden/licenses_skia
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: abfbdd9057ce2648064f6b0e8d9b5dba
Signature: f87308ff230f96f2849f7f42481e19e2

UNUSED LICENSES:

Expand Down Expand Up @@ -2638,6 +2638,9 @@ FILE: ../../../third_party/skia/bench/SortBench.cpp
FILE: ../../../third_party/skia/bench/TileBench.cpp
FILE: ../../../third_party/skia/bench/WritePixelsBench.cpp
FILE: ../../../third_party/skia/bench/gUniqueGlyphIDs.h
FILE: ../../../third_party/skia/client_utils/android/FrontBufferedStream.cpp
FILE: ../../../third_party/skia/client_utils/android/FrontBufferedStream.h
FILE: ../../../third_party/skia/client_utils/android/SkFrontBufferedStream.h
FILE: ../../../third_party/skia/dm/DM.cpp
FILE: ../../../third_party/skia/gm/alphagradients.cpp
FILE: ../../../third_party/skia/gm/arcofzorro.cpp
Expand Down Expand Up @@ -2715,7 +2718,6 @@ FILE: ../../../third_party/skia/include/private/SkOnce.h
FILE: ../../../third_party/skia/include/private/SkTFitsIn.h
FILE: ../../../third_party/skia/include/private/SkTLogic.h
FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
FILE: ../../../third_party/skia/include/utils/SkFrontBufferedStream.h
FILE: ../../../third_party/skia/include/utils/SkLua.h
FILE: ../../../third_party/skia/include/utils/SkLuaCanvas.h
FILE: ../../../third_party/skia/samplecode/SampleChart.cpp
Expand Down Expand Up @@ -2803,7 +2805,6 @@ FILE: ../../../third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
FILE: ../../../third_party/skia/src/utils/SkCanvasStack.cpp
FILE: ../../../third_party/skia/src/utils/SkCanvasStack.h
FILE: ../../../third_party/skia/src/utils/SkCanvasStateUtils.cpp
FILE: ../../../third_party/skia/src/utils/SkFrontBufferedStream.cpp
FILE: ../../../third_party/skia/src/utils/SkLua.cpp
FILE: ../../../third_party/skia/src/utils/SkLuaCanvas.cpp
----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -3087,12 +3088,12 @@ FILE: ../../../third_party/skia/src/gpu/GrOpsTask.cpp
FILE: ../../../third_party/skia/src/gpu/GrOpsTask.h
FILE: ../../../third_party/skia/src/gpu/GrRecordingContext.cpp
FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.h
FILE: ../../../third_party/skia/src/gpu/GrSPIRVUniformHandler.cpp
FILE: ../../../third_party/skia/src/gpu/GrSPIRVUniformHandler.h
FILE: ../../../third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp
FILE: ../../../third_party/skia/src/gpu/GrSPIRVVaryingHandler.h
FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.cpp
FILE: ../../../third_party/skia/src/gpu/GrSamplePatternDictionary.h
FILE: ../../../third_party/skia/src/gpu/GrSpirvUniformHandler.cpp
FILE: ../../../third_party/skia/src/gpu/GrSpirvUniformHandler.h
FILE: ../../../third_party/skia/src/gpu/GrSpirvVaryingHandler.cpp
FILE: ../../../third_party/skia/src/gpu/GrSpirvVaryingHandler.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrGSCoverageProcessor.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.cpp
FILE: ../../../third_party/skia/src/gpu/ccpr/GrOctoBounds.h
Expand Down Expand Up @@ -5169,6 +5170,109 @@ 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/TessellatePathBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/TessellatePathBench.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/compressed_textures.cpp
FILE: ../../../third_party/skia/gm/crbug_1073670.cpp
FILE: ../../../third_party/skia/gm/exoticformats.cpp
FILE: ../../../third_party/skia/gm/skbug_9819.cpp
FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.cpp
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.h
FILE: ../../../third_party/skia/include/core/SkM44.h
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
FILE: ../../../third_party/skia/modules/skottie/src/Path.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/ScalarKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/ShapeKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/TextKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/Vec2KeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.h
FILE: ../../../third_party/skia/modules/skottie/src/effects/CornerPinEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/GlowStyles.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/ShadowStyles.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/FillStroke.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp
FILE: ../../../third_party/skia/modules/sksg/include/SkSGDashEffect.h
FILE: ../../../third_party/skia/modules/sksg/src/SkSGDashEffect.cpp
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
FILE: ../../../third_party/skia/src/core/SkM44.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.h
FILE: ../../../third_party/skia/src/core/SkOpts_skx.cpp
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.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
FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrInnerPolygonContourParser.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrMidpointContourParser.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google Inc.

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
Expand Down Expand Up @@ -5593,106 +5697,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/verifiers/gmverifier.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
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/compressed_textures.cpp
FILE: ../../../third_party/skia/gm/exoticformats.cpp
FILE: ../../../third_party/skia/gm/skbug_9819.cpp
FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.cpp
FILE: ../../../third_party/skia/gm/verifiers/gmverifier.h
FILE: ../../../third_party/skia/include/core/SkM44.h
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
FILE: ../../../third_party/skia/modules/skottie/src/Path.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.h
FILE: ../../../third_party/skia/modules/skottie/src/animator/ScalarKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/ShapeKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/TextKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/Vec2KeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.cpp
FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.h
FILE: ../../../third_party/skia/modules/skottie/src/effects/CornerPinEffect.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/GlowStyles.cpp
FILE: ../../../third_party/skia/modules/skottie/src/effects/ShadowStyles.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/FillStroke.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h
FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp
FILE: ../../../third_party/skia/modules/sksg/include/SkSGDashEffect.h
FILE: ../../../third_party/skia/modules/sksg/src/SkSGDashEffect.cpp
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
FILE: ../../../third_party/skia/src/core/SkM44.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.cpp
FILE: ../../../third_party/skia/src/core/SkMarkerStack.h
FILE: ../../../third_party/skia/src/core/SkVerticesPriv.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
FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/dawn/GrDawnStagingBuffer.h
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrInnerPolygonContourParser.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrMidpointContourParser.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google Inc.

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
Expand Down

0 comments on commit 3999ef9

Please sign in to comment.