From cd774d1008f3988b14c409b8f79c885a9079d8eb Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 20 Jan 2021 00:16:43 +0000 Subject: [PATCH] Roll Skia from f3087d8297fe to e0fe62adaa3e (9 revisions) https://skia.googlesource.com/skia.git/+log/f3087d8297fe..e0fe62adaa3e 2021-01-20 mtklein@google.com use fourth arg in store128 2021-01-19 johnstiles@google.com Add GrSL enums for uint3 and uint4. 2021-01-19 herb@google.com pull out clip code that will be shared 2021-01-19 jlavrova@google.com Include placeholder widths in minIntrinsicWidth 2021-01-19 brianosman@google.com Reland "Support indexing by loop variables in SkVMGenerator" 2021-01-19 mtklein@google.com Revert "Support indexing by loop variables in SkVMGenerator" 2021-01-19 bsalomon@google.com Reland "Test all YUVA image factories with different encoded origins." 2021-01-19 brianosman@google.com Support indexing by loop variables in SkVMGenerator 2021-01-19 csmartdalton@google.com Extract some GrPathTessellatoOp logic into virtual helper classes If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC scroggo@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 77 ++++++++++++++++---------------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/DEPS b/DEPS index 1b5e8e3c6fdde..f9f6a1ffeaaca 100644 --- a/DEPS +++ b/DEPS @@ -27,7 +27,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': 'f3087d8297feb2478849f4a2e69f367da6ceb779', + 'skia_revision': 'e0fe62adaa3e737b2b86d9d398d3ed3bcd4d506c', # 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 f27dee8978139..14acc0f75e6b5 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 0073a800595f6cecd572d7d4b775d1ac +Signature: d11d4db872b54de304570d132aa29fc0 UNUSED LICENSES: @@ -4218,7 +4218,6 @@ 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/GrMiddleOutPolygonTriangulator.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrMidpointContourParser.h -FILE: ../../../third_party/skia/src/gpu/tessellate/GrResolveLevelCounter.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIndirectOp.cpp FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIndirectOp.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIterator.h @@ -7248,13 +7247,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp -FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h -FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.h +FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp ---------------------------------------------------------------------------------------------------- -Copyright 2009-2015 Google Inc. +Copyright 2021 Google LLC. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -7287,13 +7286,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp -FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h +FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp +FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h +FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp ---------------------------------------------------------------------------------------------------- -Copyright 2006-2012 The Android Open Source Project -Copyright 2012 Mozilla Foundation +Copyright 2009-2015 Google Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -7326,11 +7325,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp +FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp +FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h ---------------------------------------------------------------------------------------------------- -Copyright 2011 Google Inc. +Copyright 2006-2012 The Android Open Source Project Copyright 2012 Mozilla Foundation Redistribution and use in source and binary forms, with or without @@ -7364,31 +7364,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h -TYPE: LicenseType.unknown -FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h -FILE: ../../../third_party/skia/src/sksl/spirv.h ----------------------------------------------------------------------------------------------------- -Copyright (c) 2014-2016 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and/or associated documentation files (the "Materials"), -to deal in the Materials without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Materials, and to permit persons to whom the -Materials are furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Materials. -==================================================================================================== - -==================================================================================================== -LIBRARY: skia -ORIGIN: ../../../third_party/skia/src/sksl/SkSLMangler.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp +FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp ---------------------------------------------------------------------------------------------------- -Copyright 2021 Google LLC. +Copyright 2011 Google Inc. +Copyright 2012 Mozilla Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -7419,6 +7400,26 @@ 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/sksl/GLSL.std.450.h +TYPE: LicenseType.unknown +FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h +FILE: ../../../third_party/skia/src/sksl/spirv.h +---------------------------------------------------------------------------------------------------- +Copyright (c) 2014-2016 The Khronos Group Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and/or associated documentation files (the "Materials"), +to deal in the Materials without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Materials, and to permit persons to whom the +Materials are furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Materials. +==================================================================================================== + ==================================================================================================== LIBRARY: vulkanmemoryallocator ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h