diff --git a/DEPS b/DEPS index 072abbe06b052..676a4583cbf3b 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': 'ce49ff6520fa5ef11b6172aa7803695a77520446', + 'skia_revision': '73657689b6cb53d20ee6a1d9f34bdb5679fd78c4', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 6c3398a937696..5a161bd6698cb 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: faaf788db3a8b702df0d8c755dd082c0 +Signature: 61137a47a458c586e7310543a026dc2a UNUSED LICENSES: @@ -728,6 +728,7 @@ FILE: ../../../third_party/skia/docker/skia-release/Dockerfile FILE: ../../../third_party/skia/docker/skia-wasm-release/Dockerfile FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/Dockerfile FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/build-with-swift-shader-and-run +FILE: ../../../third_party/skia/example/BUILD.bazel FILE: ../../../third_party/skia/experimental/bazel_test/BUILD.bazel FILE: ../../../third_party/skia/experimental/docs/animationCommon.js FILE: ../../../third_party/skia/experimental/docs/backend.js @@ -790,6 +791,8 @@ FILE: ../../../third_party/skia/experimental/tskit/npm_build/types/index.d.ts FILE: ../../../third_party/skia/experimental/tskit/package-lock.json FILE: ../../../third_party/skia/experimental/tskit/package.json FILE: ../../../third_party/skia/experimental/tskit/tsconfig.json +FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel +FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/cpu.js FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp FILE: ../../../third_party/skia/experimental/wasm-skp-debugger/debugger/index.html @@ -2973,8 +2976,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.cpp FILE: ../../../third_party/skia/src/gpu/ops/DashLinePathRenderer.h FILE: ../../../third_party/skia/src/gpu/ops/DrawAtlasOp.cpp FILE: ../../../third_party/skia/src/gpu/ops/DrawAtlasOp.h -FILE: ../../../third_party/skia/src/gpu/ops/DrawVerticesOp.cpp -FILE: ../../../third_party/skia/src/gpu/ops/DrawVerticesOp.h FILE: ../../../third_party/skia/src/gpu/ops/GrDrawOp.h FILE: ../../../third_party/skia/src/gpu/ops/GrMeshDrawOp.cpp FILE: ../../../third_party/skia/src/gpu/ops/GrMeshDrawOp.h @@ -6061,6 +6062,44 @@ 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/graphite/src/Resource.cpp + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/experimental/graphite/src/Resource.cpp +FILE: ../../../third_party/skia/experimental/graphite/src/Resource.h +---------------------------------------------------------------------------------------------------- +Copyright 2022 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/experimental/sorttoy/Cmds.cpp + ../../../third_party/skia/LICENSE @@ -7842,4 +7881,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: 67 +Total license count: 68 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 629d36304bf43..5279e8a63c6de 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -14751,6 +14751,38 @@ skia Copyright 2021 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 2022 Google LLC + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: