提交 17e3e696 编写于 作者: S skia-flutter-autoroll 提交者: Brian Osman

Roll src/third_party/skia/ c4e384e5a..3d0e8507f (18 commits) (#5056)

https://skia.googlesource.com/skia.git/+log/c4e384e5ad85..3d0e8507face

$ git log c4e384e5a..3d0e8507f --date=short --no-merges --format='%ad %ae %s'
2018-04-20 robertphillips Prevent matrix stack from being corrupted if a rotated image filter is clipped out
2018-04-20 caryclark guard against NaN in path is rect
2018-04-19 fmalita Fix use-of-uninitialized-value in SkPictureShader::onMakeContext
2018-04-19 benjaminwagner Disable retries for Build, CT, and Calmbench tasks.
2018-04-20 angle-skia-autoroll Roll third_party/externals/angle2/ b0f917fa6..3ec304dba (1 commit)
2018-04-20 angle-skia-autoroll Roll third_party/externals/angle2/ e24032a2c..b0f917fa6 (3 commits)
2018-04-19 csmartdalton ccpr: Don't preempt the convex path renderer
2018-04-19 benjaminwagner Add more angle_gl_* configs for NVIDIA.
2018-04-19 jvanverth Remove ambient clamp hack for analytic shadows.
2018-04-19 brianosman Remove duplicate predefined configs
2018-04-18 csmartdalton ccpr: Clean up GrCCGeometry
2018-04-19 herb Adding pinning to the strike cache
2018-04-19 bsalomon Fix double counting of coverage in analytic round capped stroked circles.
2018-04-11 bungeman Document minimum OS requirements.
2018-04-19 angle-skia-autoroll Roll third_party/externals/angle2/ eeec3b14c..e24032a2c (2 commits)
2018-04-18 robertphillips rm SkRRectsGaussianEdgeMaskFilter
2018-04-19 borenet [skcms] Add version.sha1
2018-04-19 mtklein crash rather than overflow in SkTDArray

Created with:
  roll-dep src/third_party/skia
上级 09d05a38
......@@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': 'c4e384e5ad85250920cac6e8ee0e2a14b69d67e0',
'skia_revision': '3d0e8507face451a4b17698beb6ad0ea51b9ef1d',
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
......
......@@ -15237,6 +15237,36 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
defined by the Mozilla Public License, v. 2.0.
--------------------------------------------------------------------------------
skcms
Copyright (c) 2018 Google Inc. All rights reserved.
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 Google Inc. 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.
--------------------------------------------------------------------------------
skcms
skia
Copyright 2018 Google Inc.
......
Signature: a3b93d6693661a99bccda168147b2ae6
Signature: f6b276036e543bc2ddf0a09253044a51
UNUSED LICENSES:
......@@ -111,39 +111,6 @@ and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
====================================================================================================
====================================================================================================
ORIGIN: ../../../third_party/skia/third_party/skcms/LICENSE
TYPE: LicenseType.bsd
----------------------------------------------------------------------------------------------------
Copyright (c) 2018 Google Inc. All rights reserved.
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 Google Inc. 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.
====================================================================================================
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
USED LICENSES:
......@@ -14104,7 +14071,6 @@ FILE: ../../../third_party/skia/gm/overdrawcolorfilter.cpp
FILE: ../../../third_party/skia/gm/pathmaskcache.cpp
FILE: ../../../third_party/skia/gm/readpixels.cpp
FILE: ../../../third_party/skia/gm/rectangletexture.cpp
FILE: ../../../third_party/skia/gm/reveal.cpp
FILE: ../../../third_party/skia/gm/rrectclipdrawpaint.cpp
FILE: ../../../third_party/skia/gm/shapes.cpp
FILE: ../../../third_party/skia/gm/showmiplevels.cpp
......@@ -14130,7 +14096,6 @@ FILE: ../../../third_party/skia/include/core/SkYUVSizeInfo.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
FILE: ../../../third_party/skia/include/effects/SkRRectsGaussianEdgeMaskFilter.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkDefines.h
FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h
......@@ -14231,7 +14196,6 @@ FILE: ../../../third_party/skia/src/core/SkSwizzle.cpp
FILE: ../../../third_party/skia/src/effects/SkArithmeticImageFilter.cpp
FILE: ../../../third_party/skia/src/effects/SkOverdrawColorFilter.cpp
FILE: ../../../third_party/skia/src/effects/SkPaintImageFilter.cpp
FILE: ../../../third_party/skia/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp
FILE: ../../../third_party/skia/src/gpu/GrAppliedClip.h
FILE: ../../../third_party/skia/src/gpu/GrAuditTrail.cpp
FILE: ../../../third_party/skia/src/gpu/GrBitmapTextureMaker.cpp
......@@ -17196,8 +17160,9 @@ Exhibit B - “Incompatible With Secondary Licenses” Notice
====================================================================================================
LIBRARY: skcms
LIBRARY: skia
ORIGIN: ../../../third_party/skia/bench/ShaderMaskFilterBench.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/bench/GrCCGeometryBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/GrCCGeometryBench.cpp
FILE: ../../../third_party/skia/bench/ShaderMaskFilterBench.cpp
FILE: ../../../third_party/skia/experimental/skottie/SkottieAdapter.cpp
FILE: ../../../third_party/skia/experimental/skottie/SkottieAdapter.h
......@@ -17389,6 +17354,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: skcms
ORIGIN: ../../../third_party/skia/third_party/skcms/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/third_party/skcms/version.sha1
----------------------------------------------------------------------------------------------------
Copyright (c) 2018 Google Inc. All rights reserved.
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 Google Inc. 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/LICENSE
......@@ -17700,6 +17700,7 @@ FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Ubuntu17-G
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json
FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册