Skip to content

Commit

Permalink
Roll Skia from ecd2a66e6f82 to c71ae5140090 (1 revision) (flutter#32150)
Browse files Browse the repository at this point in the history
  • Loading branch information
skia-flutter-autoroll authored Mar 21, 2022
1 parent 84da861 commit adafc53
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 38 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
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': 'ecd2a66e6f8229d5658f56cc21c3b5106e06602f',
'skia_revision': 'c71ae5140090290ad16b73bdb0aa6f4543c64a78',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
77 changes: 40 additions & 37 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 233d087933806aaff4a7e5ff25c29d0c
Signature: bf29309505065797ffef77b5ad71374d

UNUSED LICENSES:

Expand Down Expand Up @@ -6097,6 +6097,8 @@ FILE: ../../../third_party/skia/experimental/graphite/src/render/MiddleOutFanRen
FILE: ../../../third_party/skia/experimental/graphite/src/render/StencilAndCoverDSS.h
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateCurvesRenderStep.cpp
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateCurvesRenderStep.h
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateWedgesRenderStep.cpp
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateWedgesRenderStep.h
FILE: ../../../third_party/skia/gm/bug12866.cpp
FILE: ../../../third_party/skia/include/core/SkAlphaType.h
FILE: ../../../third_party/skia/include/core/SkColorType.h
Expand Down Expand Up @@ -7773,13 +7775,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
----------------------------------------------------------------------------------------------------
Copyright 2009-2015 Google Inc.
Copyright 2022 Google LLC.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -7812,13 +7813,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
----------------------------------------------------------------------------------------------------
Copyright 2006-2012 The Android Open Source Project
Copyright 2012 Mozilla Foundation
Copyright 2009-2015 Google Inc.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -7851,11 +7852,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
----------------------------------------------------------------------------------------------------
Copyright 2011 Google Inc.
Copyright 2006-2012 The Android Open Source Project
Copyright 2012 Mozilla Foundation

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -7889,31 +7891,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
TYPE: LicenseType.unknown
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
FILE: ../../../third_party/skia/src/sksl/spirv.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2014-2016 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and/or associated documentation files (the "Materials"),
to deal in the Materials without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Materials, and to permit persons to whom the
Materials are furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Materials.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
----------------------------------------------------------------------------------------------------
Copyright 2022 Google LLC.
Copyright 2011 Google Inc.
Copyright 2012 Mozilla Foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -7944,6 +7927,26 @@ 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/sksl/GLSL.std.450.h
TYPE: LicenseType.unknown
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
FILE: ../../../third_party/skia/src/sksl/spirv.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2014-2016 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and/or associated documentation files (the "Materials"),
to deal in the Materials without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Materials, and to permit persons to whom the
Materials are furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Materials.
====================================================================================================

====================================================================================================
LIBRARY: vulkanmemoryallocator
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
Expand Down

0 comments on commit adafc53

Please sign in to comment.