Roll Skia from 6e659e960945 to 7910a8f76121 (32 revisions) (#18927)
diff --git a/DEPS b/DEPS
index 87fe8ca..a2ecff8 100644
--- a/DEPS
+++ b/DEPS
@@ -26,7 +26,7 @@
'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': '6e659e960945fde35832b0a50c7b5a837f2fcb82',
+ 'skia_revision': '7910a8f76121695f3832f57f54b2a735235668b8',
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
index 2c353ea..2e1952b 100644
--- a/ci/licenses_golden/licenses_skia
+++ b/ci/licenses_golden/licenses_skia
@@ -1,9 +1,9 @@
-Signature: a9f3c55a8d98e5d2a50dd6631e1ffae6
+Signature: 0892d34712a66928b9b8f4d681bfb2ed
UNUSED LICENSES:
====================================================================================================
-ORIGIN: ../../../third_party/skia/third_party/etc1/LICENSE
+ORIGIN: ../../../third_party/skia/third_party/aosp/LICENSE
TYPE: LicenseType.apache
----------------------------------------------------------------------------------------------------
Apache License
@@ -197,6 +197,7 @@
USED LICENSES:
====================================================================================================
+LIBRARY: aosp
LIBRARY: etc1
LIBRARY: vulkan
ORIGIN: ../../../flutter/third_party/txt/LICENSE
@@ -209,6 +210,8 @@
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_macos.h
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_win32.h
FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_xcb.h
+FILE: ../../../third_party/skia/third_party/aosp/JavaInputStreamAdaptor.cpp
+FILE: ../../../third_party/skia/third_party/aosp/JavaInputStreamAdaptor.h
FILE: ../../../third_party/skia/third_party/etc1/etc1.cpp
FILE: ../../../third_party/skia/third_party/etc1/etc1.h
----------------------------------------------------------------------------------------------------
@@ -668,7 +671,6 @@
FILE: ../../../third_party/skia/src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw.cpp
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h
FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLProgramDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ops/GrClearStencilClipOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrPathStencilSettings.h
FILE: ../../../third_party/skia/src/gpu/ops/GrRegionOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrRegionOp.h
@@ -2207,7 +2209,6 @@
FILE: ../../../third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.h
FILE: ../../../third_party/skia/src/utils/SkFloatUtils.h
FILE: ../../../third_party/skia/src/utils/SkNullCanvas.cpp
-FILE: ../../../third_party/skia/src/utils/mac/SkStream_mac.cpp
FILE: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp
FILE: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.h
FILE: ../../../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp
@@ -3403,7 +3404,6 @@
FILE: ../../../third_party/skia/src/gpu/effects/GrConstColorProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrLumaColorFilterEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrMagnifierEffect.fp
-FILE: ../../../third_party/skia/src/gpu/effects/GrPremulInputFragmentProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrRRectBlurEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrRectBlurEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrSkSLFP.cpp
@@ -3424,8 +3424,6 @@
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrLumaColorFilterEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMagnifierEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrMagnifierEffect.h
-FILE: ../../../third_party/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRRectBlurEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRRectBlurEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrRectBlurEffect.cpp
@@ -3489,7 +3487,6 @@
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlUniformHandler.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.mm
-FILE: ../../../third_party/skia/src/gpu/ops/GrClearStencilClipOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawableOp.cpp
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawableOp.h
FILE: ../../../third_party/skia/src/gpu/ops/GrFillRRectOp.cpp
@@ -5217,6 +5214,12 @@
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/experimental/skrive/include/SkRive.h
+FILE: ../../../third_party/skia/experimental/skrive/src/SkRive.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/reader/BinaryReader.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/reader/JsonReader.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.cpp
+FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.h
FILE: ../../../third_party/skia/gm/3d.cpp
FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
FILE: ../../../third_party/skia/gm/bicubic.cpp
@@ -5291,7 +5294,6 @@
FILE: ../../../third_party/skia/src/gpu/tessellate/GrVectorXform.h
FILE: ../../../third_party/skia/src/gpu/tessellate/GrWangsFormula.h
FILE: ../../../third_party/skia/src/opts/SkOpts_skx.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontHost_mac.cpp
FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.h
FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.h
FILE: ../../../third_party/skia/src/utils/mac/SkCGBase.h
diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE
index acc4a96..71e9381 100644
--- a/sky/packages/sky_engine/LICENSE
+++ b/sky/packages/sky_engine/LICENSE
@@ -349,76 +349,7 @@
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
angle
-base
-
-Copyright 2016 The ANGLE Project Authors. 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 TransGaming Inc., Google Inc., 3DLabs Inc.
- Ltd., nor the names of their 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.
---------------------------------------------------------------------------------
-angle
-base
-
-Copyright 2017 The ANGLE Project Authors. 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 TransGaming Inc., Google Inc., 3DLabs Inc.
- Ltd., nor the names of their 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.
---------------------------------------------------------------------------------
-angle
+aosp
boringssl
engine
etc1
@@ -630,6 +561,76 @@
limitations under the License.
--------------------------------------------------------------------------------
angle
+base
+
+Copyright 2016 The ANGLE Project Authors. 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 TransGaming Inc., Google Inc., 3DLabs Inc.
+ Ltd., nor the names of their 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.
+--------------------------------------------------------------------------------
+angle
+base
+
+Copyright 2017 The ANGLE Project Authors. 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 TransGaming Inc., Google Inc., 3DLabs Inc.
+ Ltd., nor the names of their 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.
+--------------------------------------------------------------------------------
+angle
fuchsia_sdk
Copyright 2019 The Fuchsia Authors. All rights reserved.
