From edaa650f190fa6f9fd1affd2152b5b21353b452d Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 12 Jun 2020 17:07:39 +0000 Subject: [PATCH] Roll Skia from 30212b7941d6 to 3d6bf04366f6 (17 revisions) https://skia.googlesource.com/skia.git/+log/30212b7941d6..3d6bf04366f6 2020-06-12 herb@google.com make options robust 2020-06-12 djsollen@google.com Skottie example app to copy InputStreams in Java. 2020-06-12 adlai@google.com Cache last-accessed entry in lastRenderTask table. 2020-06-12 brianosman@google.com Move all SkReadBuffer member initialization to header 2020-06-12 fmalita@chromium.org [skjson] Use lower bits for tagging 2020-06-12 herb@google.com Make explicit SDF default values. 2020-06-12 kjlubick@google.com [canvaskit] Fix bug with TextStyle color 2020-06-12 bsalomon@google.com Make ColorTableEffect use child processor 2020-06-12 brianosman@google.com Initialize SkReadBuffer pointers 2020-06-12 johnstiles@google.com Reland "Fetch clang-format automatically when compiling .fp files." 2020-06-12 zepenghu@google.com add svg fuzzer 2020-06-12 reed@google.com remove (unused) duplicate field of fUniqueID 2020-06-12 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Chromium from 3f86fb2f52c2 to 0f6d038f871a (417 revisions) 2020-06-12 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from db3ef87243d0 to ff2ebce4b230 (16 revisions) 2020-06-12 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SwiftShader from 45510ad8a778 to a6940c8e6eb0 (1 revision) 2020-06-12 skia-autoroll@skia-public.iam.gserviceaccount.com Roll dawn from b6eff5acf06f to 5fafb49c7b4d (11 revisions) 2020-06-11 michaelludwig@google.com GrClips know their device dimensions 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 bungeman@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 | 42 ++++++++++++++++++++++++++++++-- sky/packages/sky_engine/LICENSE | 32 ++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 482a64c13c2b5..2af21fd468070 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': '30212b7941d6aa3b50978bac103f3c5b1b8cd20a', + 'skia_revision': '3d6bf04366f6bb33b058b39066dd92334c185a66', # 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 65d59b00868d7..a12fb1bcf002f 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 1627ef956dbb3f190d56cedf42ae5d78 +Signature: f80526dd737771501e0edc84c3944355 UNUSED LICENSES: @@ -2458,6 +2458,7 @@ FILE: ../../../third_party/skia/src/gpu/GrDrawingManager.cpp FILE: ../../../third_party/skia/src/gpu/GrDrawingManager.h FILE: ../../../third_party/skia/src/gpu/GrFragmentProcessor.cpp FILE: ../../../third_party/skia/src/gpu/GrGpuResourcePriv.h +FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h FILE: ../../../third_party/skia/src/gpu/GrManagedResource.h FILE: ../../../third_party/skia/src/gpu/GrNonAtomicRef.h FILE: ../../../third_party/skia/src/gpu/GrOpFlushState.cpp @@ -5723,6 +5724,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/fuzz/oss_fuzz/FuzzSVG.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp +---------------------------------------------------------------------------------------------------- +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/gm/circles.cpp + ../../../third_party/skia/LICENSE @@ -7134,4 +7172,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: 58 +Total license count: 59 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 2ba6eebdeed0e..7bfea21a6239d 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -12684,6 +12684,38 @@ 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: + + * 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 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without