From 6533a3fca72d0675cb6e7ed18539f1d90d823367 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sat, 6 Jun 2020 02:58:03 -0400 Subject: [PATCH] Roll Skia from aa10dfeec96a to 0ef90dd5e9c6 (7 revisions) (#18862) --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 21 +++-- sky/packages/sky_engine/LICENSE | 141 +++++++++++++++---------------- 3 files changed, 85 insertions(+), 79 deletions(-) diff --git a/DEPS b/DEPS index 87ef28eb1..8ba78c703 100644 --- a/DEPS +++ b/DEPS @@ -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': 'aa10dfeec96ade0f45927c7d8408034131e00cc8', + 'skia_revision': '0ef90dd5e9c6526530f14f6943f304515140165a', # 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 f93bcf3c6..0b57eb823 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,9 +1,9 @@ -Signature: ca6b7fe8a3e0fabd002e696b1808f441 +Signature: 22e1918de05c05c9fae1329f028cd38b UNUSED LICENSES: ==================================================================================================== -ORIGIN: ../../../third_party/skia/third_party/aosp/LICENSE +ORIGIN: ../../../third_party/skia/third_party/etc1/LICENSE TYPE: LicenseType.apache ---------------------------------------------------------------------------------------------------- Apache License @@ -197,7 +197,6 @@ THE SOFTWARE. USED LICENSES: ==================================================================================================== -LIBRARY: aosp LIBRARY: etc1 LIBRARY: vulkan ORIGIN: ../../../flutter/third_party/txt/LICENSE @@ -210,8 +209,6 @@ FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_ios.h 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 ---------------------------------------------------------------------------------------------------- @@ -3649,6 +3646,7 @@ FILE: ../../../third_party/skia/include/gpu/GrBackendSemaphore.h FILE: ../../../third_party/skia/include/gpu/GrBackendSurface.h FILE: ../../../third_party/skia/include/gpu/mock/GrMockTypes.h FILE: ../../../third_party/skia/include/gpu/mtl/GrMtlTypes.h +FILE: ../../../third_party/skia/include/ports/SkFontMgr_mac_ct.h FILE: ../../../third_party/skia/include/private/GrSharedEnums.h FILE: ../../../third_party/skia/include/private/SkImageInfoPriv.h FILE: ../../../third_party/skia/include/private/SkMalloc.h @@ -3822,6 +3820,7 @@ FILE: ../../../third_party/skia/src/pdf/SkPDFGradientShader.h FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_directory.cpp FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_empty.cpp +FILE: ../../../third_party/skia/src/ports/SkFontMgr_mac_ct_factory.cpp FILE: ../../../third_party/skia/src/ports/SkOSFile_ios.h FILE: ../../../third_party/skia/src/sfnt/SkOTTable_fvar.h FILE: ../../../third_party/skia/src/shaders/SkShaderBase.h @@ -5273,7 +5272,6 @@ 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 @@ -5293,6 +5291,13 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrResolveLevelCounter.h 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 +FILE: ../../../third_party/skia/src/utils/mac/SkCGGeometry.h +FILE: ../../../third_party/skia/src/utils/mac/SkCTFontSmoothBehavior.cpp +FILE: ../../../third_party/skia/src/utils/mac/SkCTFontSmoothBehavior.h ---------------------------------------------------------------------------------------------------- Copyright 2020 Google Inc. @@ -5880,11 +5885,13 @@ FILE: ../../../third_party/skia/src/images/SkPngEncoder.cpp FILE: ../../../third_party/skia/src/ports/SkDebug_android.cpp FILE: ../../../third_party/skia/src/ports/SkDebug_stdio.cpp FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType.cpp -FILE: ../../../third_party/skia/src/ports/SkFontHost_mac.cpp FILE: ../../../third_party/skia/src/ports/SkFontHost_win.cpp FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom.cpp FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom.h +FILE: ../../../third_party/skia/src/ports/SkFontMgr_mac_ct.cpp FILE: ../../../third_party/skia/src/ports/SkOSFile_stdio.cpp +FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.cpp +FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.cpp FILE: ../../../third_party/skia/src/shaders/SkBitmapProcShader.h FILE: ../../../third_party/skia/src/shaders/SkComposeShader.cpp FILE: ../../../third_party/skia/src/shaders/SkComposeShader.h diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 71e938159..acc4a96d0 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -349,7 +349,76 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- angle -aosp +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 boringssl engine etc1 @@ -561,76 +630,6 @@ See the License for the specific language governing permissions and 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. -- GitLab