From 32631e327e6ae2c98af824a24457361afcb8b130 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 8 Jan 2020 16:13:17 +0000 Subject: [PATCH] Roll src/third_party/skia 91e0d7526944..f811fc331a14 (32 commits) https://skia.googlesource.com/skia.git/+log/91e0d7526944..f811fc331a14 git log 91e0d7526944..f811fc331a14 --date=short --first-parent --format='%ad %ae %s' 2020-01-08 michaelludwig@google.com Avoid loop-dependent behavior in GrMemoryPoolBench 2020-01-08 borenet@google.com [infra] Fix build_task_drivers.sh, update infra dep 2020-01-08 brianosman@google.com Revert "Extend SkCanvas matrix stack to be 4x4, but with (basically) the same public API." 2020-01-08 jvanverth@google.com Revert "Move makeDeferredRenderTargetContext calls to factory on RTC." 2020-01-08 borenet@google.com [recipes] Remove unnecessary depot_tools dependency in flavor module 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 55a27186b7de..61f03e9a10c0 (434 commits) 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 51e653f03f26..db49bc7dd075 (8 commits) 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 068dd89cab31..45a4d0f36bd6 (5 commits) 2020-01-07 herb@google.com Seperate out quad updating from atlas updating 2020-01-07 herb@google.com regenTextureCoordinates is always true when calling doRegen 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-07 benjaminwagner@google.com Reland "Fixes for Vulkan Debug layers" 2020-01-07 mtklein@google.com bicubic in skvm image shader 2020-01-07 egdaniel@google.com Move makeDeferredRenderTargetContext calls to factory on RTC. 2020-01-07 herb@google.com Simplify the atlas update inner loop 2020-01-07 benjaminwagner@google.com Revert "Fixes for Vulkan Debug layers" 2020-01-07 csmartdalton@google.com Add a path renderer that uses GPU tessellation 2020-01-07 benjaminwagner@google.com Update remote access documentation for Win2019 2020-01-07 mtklein@google.com tolerate alpha slightly out of [0,1] 2020-01-07 brianosman@google.com In SkRuntimeEffect, guard against programs not compiling with GPU caps 2020-01-07 nifong@google.com Fix typo where width/height were swapped in new debug layer manager 2020-01-07 bsalomon@google.com Reland "Rename GrSimpleTextureEffect->GrTextureEffect" 2020-01-07 mtklein@google.com one option for fixing bilerp asserts 2020-01-07 mtklein@google.com upgrade debugging tools 2020-01-07 reed@google.com Extend SkCanvas matrix stack to be 4x4, but with (basically) the same public API. 2020-01-07 halcanary@google.com public.bzl: add SKOTTIE_IOS_LIB_SDK_FRAMEWORKS 2020-01-07 robertphillips@google.com Improve debug information provided when backend format and GrColorType don't match 2020-01-07 benjaminwagner@google.com Fixes for Vulkan Debug layers 2020-01-07 mtklein@google.com add SkVM_fwd.h 2020-01-07 mtklein@google.com handle kLow/kMedium in skvm image shader 2020-01-07 benjaminwagner@google.com Add NativeFonts job for Mac 10.15 CPU 2020-01-07 bsalomon@google.com Revert "Rename GrSimpleTextureEffect->GrTextureEffect" Created with: gclient setdep -r src/third_party/skia@f811fc331a14 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 jvanverth@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/+/master/autoroll/README.md Bug: None Tbr: jvanverth@google.com --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 52 ++++++++++++++++++++++++++++++-- sky/packages/sky_engine/LICENSE | 32 ++++++++++++++++++++ 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index a5486b9899a26..63c00b5c95391 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': '91e0d7526944f714706ec9510c346bd4eab3d5f1', + 'skia_revision': 'f811fc331a143631f3ba48a266336ccf18d5a459', # 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 516c6991eae69..89aa9592414e5 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 281b747ba0f64c8a40728d9c9b17b934 +Signature: e3b27c65b71c50777d6ba18a2f1c4fc1 UNUSED LICENSES: @@ -5071,6 +5071,7 @@ FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h +FILE: ../../../third_party/skia/samplecode/SampleTessellatedWedge.cpp FILE: ../../../third_party/skia/src/core/SkMalloc.cpp FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.cpp @@ -5085,6 +5086,16 @@ FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.cp FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.h FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.h FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.h FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.cpp @@ -6526,6 +6537,43 @@ 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/core/SkVM_fwd.h + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/core/SkVM_fwd.h +---------------------------------------------------------------------------------------------------- +Copyright 2020 Google LLC + +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/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE @@ -6764,4 +6812,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================================================== -Total license count: 54 +Total license count: 55 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index bbb992be8b3ec..6aebfd8345568 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -12551,6 +12551,38 @@ skia 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. +-------------------------------------------------------------------------------- +skia + +Copyright 2020 Google LLC + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: