Skip to content

Commit afb9ce6

Browse files
skia-flutter-autorollJsouLiang
authored andcommitted
Roll Skia from ce49ff6520fa to 73657689b6cb (5 revisions) (flutter#30718)
1 parent c3f572f commit afb9ce6

File tree

3 files changed

+76
-5
lines changed

3 files changed

+76
-5
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': 'ce49ff6520fa5ef11b6172aa7803695a77520446',
30+
'skia_revision': '73657689b6cb53d20ee6a1d9f34bdb5679fd78c4',
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/licenses_skia

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: faaf788db3a8b702df0d8c755dd082c0
1+
Signature: 61137a47a458c586e7310543a026dc2a
22

33
UNUSED LICENSES:
44

@@ -728,6 +728,7 @@ FILE: ../../../third_party/skia/docker/skia-release/Dockerfile
728728
FILE: ../../../third_party/skia/docker/skia-wasm-release/Dockerfile
729729
FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/Dockerfile
730730
FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/build-with-swift-shader-and-run
731+
FILE: ../../../third_party/skia/example/BUILD.bazel
731732
FILE: ../../../third_party/skia/experimental/bazel_test/BUILD.bazel
732733
FILE: ../../../third_party/skia/experimental/docs/animationCommon.js
733734
FILE: ../../../third_party/skia/experimental/docs/backend.js
@@ -790,6 +791,8 @@ FILE: ../../../third_party/skia/experimental/tskit/npm_build/types/index.d.ts
790791
FILE: ../../../third_party/skia/experimental/tskit/package-lock.json
791792
FILE: ../../../third_party/skia/experimental/tskit/package.json
792793
FILE: ../../../third_party/skia/experimental/tskit/tsconfig.json
794+
FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel
795+
FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html
793796
FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/cpu.js
794797
FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp
795798
FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/index.html
@@ -2973,8 +2976,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.cpp
29732976
FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.h
29742977
FILE: ../../../third_party/skia/src/gpu/ops/DrawAtlasOp.cpp
29752978
FILE: ../../../third_party/skia/src/gpu/ops/DrawAtlasOp.h
2976-
FILE: ../../../third_party/skia/src/gpu/ops/DrawVerticesOp.cpp
2977-
FILE: ../../../third_party/skia/src/gpu/ops/DrawVerticesOp.h
29782979
FILE: ../../../third_party/skia/src/gpu/ops/GrDrawOp.h
29792980
FILE: ../../../third_party/skia/src/gpu/ops/GrMeshDrawOp.cpp
29802981
FILE: ../../../third_party/skia/src/gpu/ops/GrMeshDrawOp.h
@@ -6061,6 +6062,44 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
60616062
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
60626063
====================================================================================================
60636064

6065+
====================================================================================================
6066+
LIBRARY: skia
6067+
ORIGIN: ../../../third_party/skia/experimental/graphite/src/Resource.cpp + ../../../third_party/skia/LICENSE
6068+
TYPE: LicenseType.bsd
6069+
FILE: ../../../third_party/skia/experimental/graphite/src/Resource.cpp
6070+
FILE: ../../../third_party/skia/experimental/graphite/src/Resource.h
6071+
----------------------------------------------------------------------------------------------------
6072+
Copyright 2022 Google LLC
6073+
6074+
Redistribution and use in source and binary forms, with or without
6075+
modification, are permitted provided that the following conditions are
6076+
met:
6077+
6078+
* Redistributions of source code must retain the above copyright
6079+
notice, this list of conditions and the following disclaimer.
6080+
6081+
* Redistributions in binary form must reproduce the above copyright
6082+
notice, this list of conditions and the following disclaimer in
6083+
the documentation and/or other materials provided with the
6084+
distribution.
6085+
6086+
* Neither the name of the copyright holder nor the names of its
6087+
contributors may be used to endorse or promote products derived
6088+
from this software without specific prior written permission.
6089+
6090+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6091+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6092+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6093+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6094+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6095+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6096+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6097+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6098+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6099+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6100+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6101+
====================================================================================================
6102+
60646103
====================================================================================================
60656104
LIBRARY: skia
60666105
ORIGIN: ../../../third_party/skia/experimental/sorttoy/Cmds.cpp + ../../../third_party/skia/LICENSE
@@ -7842,4 +7881,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
78427881
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
78437882
THE SOFTWARE.
78447883
====================================================================================================
7845-
Total license count: 67
7884+
Total license count: 68

sky/packages/sky_engine/LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14751,6 +14751,38 @@ skia
1475114751

1475214752
Copyright 2021 Google, LLC
1475314753

14754+
Redistribution and use in source and binary forms, with or without
14755+
modification, are permitted provided that the following conditions are
14756+
met:
14757+
14758+
* Redistributions of source code must retain the above copyright
14759+
notice, this list of conditions and the following disclaimer.
14760+
14761+
* Redistributions in binary form must reproduce the above copyright
14762+
notice, this list of conditions and the following disclaimer in
14763+
the documentation and/or other materials provided with the
14764+
distribution.
14765+
14766+
* Neither the name of the copyright holder nor the names of its
14767+
contributors may be used to endorse or promote products derived
14768+
from this software without specific prior written permission.
14769+
14770+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
14771+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
14772+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
14773+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
14774+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
14775+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
14776+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
14777+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
14778+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
14779+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
14780+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14781+
--------------------------------------------------------------------------------
14782+
skia
14783+
14784+
Copyright 2022 Google LLC
14785+
1475414786
Redistribution and use in source and binary forms, with or without
1475514787
modification, are permitted provided that the following conditions are
1475614788
met:

0 commit comments

Comments
 (0)