Skip to content

Commit

Permalink
Roll Skia from 2da029b28f97 to c1f641104531 (8 revisions) (#26195)
Browse files Browse the repository at this point in the history
  • Loading branch information
skia-flutter-autoroll committed May 17, 2021
1 parent 0594c63 commit 3cda7f5
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 42 deletions.
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -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': '2da029b28f9784b0a534e9d97d7c38f2ce151178',
'skia_revision': 'c1f6411045315743884561c03a96f1152038f0ec',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
84 changes: 43 additions & 41 deletions ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
Signature: 1f5f0d222dff919410d252f2d4e74a96
Signature: bf9f03d220057515f5dc02abb3e14ccf

UNUSED LICENSES:

Expand Down Expand Up @@ -1020,14 +1020,14 @@ FILE: ../../../third_party/skia/experimental/sktext/src/Wrapper.h
FILE: ../../../third_party/skia/experimental/tskit/.eslintignore
FILE: ../../../third_party/skia/experimental/tskit/.eslintrc.js
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.d.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/core.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/embind.d.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.d.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/load.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/memory.ts
FILE: ../../../third_party/skia/experimental/tskit/bindings/public_api.d.ts
FILE: ../../../third_party/skia/experimental/tskit/build/externs.js
FILE: ../../../third_party/skia/experimental/tskit/interface/core.ts
FILE: ../../../third_party/skia/experimental/tskit/interface/extension.ts
FILE: ../../../third_party/skia/experimental/tskit/interface/load.ts
FILE: ../../../third_party/skia/experimental/tskit/interface/memory.ts
FILE: ../../../third_party/skia/experimental/tskit/interface/public_api.d.ts
FILE: ../../../third_party/skia/experimental/tskit/npm_build/example.html
FILE: ../../../third_party/skia/experimental/tskit/npm_build/types/index.d.ts
FILE: ../../../third_party/skia/experimental/tskit/package-lock.json
Expand Down Expand Up @@ -5775,6 +5775,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/experimental/tskit/go/gen_types/gen_types.go + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go
FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types_test.go
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
----------------------------------------------------------------------------------------------------
Copyright 2021 The Chromium 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 Google Inc. 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/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -6661,41 +6698,6 @@ 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/infra/bots/gen_tasks_logic/skpbench_flags.go + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
----------------------------------------------------------------------------------------------------
Copyright 2021 The Chromium 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 Google Inc. 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/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1 + ../../../LICENSE
Expand Down

0 comments on commit 3cda7f5

Please sign in to comment.