Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f205ced

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from f3087d8297fe to e0fe62adaa3e (9 revisions) (#23781)
1 parent df5f3b0 commit f205ced

File tree

2 files changed

+40
-39
lines changed

2 files changed

+40
-39
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': 'f3087d8297feb2478849f4a2e69f367da6ceb779',
30+
'skia_revision': 'e0fe62adaa3e737b2b86d9d398d3ed3bcd4d506c',
3131

3232
# When updating the Dart revision, ensure that all entries that are
3333
# dependencies of Dart are also updated to match the entries in the

‎ci/licenses_golden/licenses_skia‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 0073a800595f6cecd572d7d4b775d1ac
1+
Signature: d11d4db872b54de304570d132aa29fc0
22

33
UNUSED LICENSES:
44

@@ -4218,7 +4218,6 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
42184218
FILE: ../../../third_party/skia/src/gpu/tessellate/GrDrawAtlasPathOp.h
42194219
FILE: ../../../third_party/skia/src/gpu/tessellate/GrMiddleOutPolygonTriangulator.h
42204220
FILE: ../../../third_party/skia/src/gpu/tessellate/GrMidpointContourParser.h
4221-
FILE: ../../../third_party/skia/src/gpu/tessellate/GrResolveLevelCounter.h
42224221
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIndirectOp.cpp
42234222
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIndirectOp.h
42244223
FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeIterator.h
@@ -7248,13 +7247,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
72487247

72497248
====================================================================================================
72507249
LIBRARY: skia
7251-
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
7250+
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp + ../../../third_party/skia/LICENSE
72527251
TYPE: LicenseType.bsd
7253-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
7254-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
7255-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
7252+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.cpp
7253+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrPathTessellator.h
7254+
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
72567255
----------------------------------------------------------------------------------------------------
7257-
Copyright 2009-2015 Google Inc.
7256+
Copyright 2021 Google LLC.
72587257

72597258
Redistribution and use in source and binary forms, with or without
72607259
modification, are permitted provided that the following conditions are
@@ -7287,13 +7286,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
72877286

72887287
====================================================================================================
72897288
LIBRARY: skia
7290-
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
7289+
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
72917290
TYPE: LicenseType.bsd
7292-
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
7293-
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
7291+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
7292+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
7293+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
72947294
----------------------------------------------------------------------------------------------------
7295-
Copyright 2006-2012 The Android Open Source Project
7296-
Copyright 2012 Mozilla Foundation
7295+
Copyright 2009-2015 Google Inc.
72977296

72987297
Redistribution and use in source and binary forms, with or without
72997298
modification, are permitted provided that the following conditions are
@@ -7326,11 +7325,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
73267325

73277326
====================================================================================================
73287327
LIBRARY: skia
7329-
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
7328+
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
73307329
TYPE: LicenseType.bsd
7331-
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
7330+
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
7331+
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
73327332
----------------------------------------------------------------------------------------------------
7333-
Copyright 2011 Google Inc.
7333+
Copyright 2006-2012 The Android Open Source Project
73347334
Copyright 2012 Mozilla Foundation
73357335

73367336
Redistribution and use in source and binary forms, with or without
@@ -7364,31 +7364,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
73647364

73657365
====================================================================================================
73667366
LIBRARY: skia
7367-
ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7368-
TYPE: LicenseType.unknown
7369-
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7370-
FILE: ../../../third_party/skia/src/sksl/spirv.h
7371-
----------------------------------------------------------------------------------------------------
7372-
Copyright (c) 2014-2016 The Khronos Group Inc.
7373-
7374-
Permission is hereby granted, free of charge, to any person obtaining a copy
7375-
of this software and/or associated documentation files (the "Materials"),
7376-
to deal in the Materials without restriction, including without limitation
7377-
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7378-
and/or sell copies of the Materials, and to permit persons to whom the
7379-
Materials are furnished to do so, subject to the following conditions:
7380-
7381-
The above copyright notice and this permission notice shall be included in
7382-
all copies or substantial portions of the Materials.
7383-
====================================================================================================
7384-
7385-
====================================================================================================
7386-
LIBRARY: skia
7387-
ORIGIN: ../../../third_party/skia/src/sksl/SkSLMangler.cpp + ../../../third_party/skia/LICENSE
7367+
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
73887368
TYPE: LicenseType.bsd
7389-
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
7369+
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
73907370
----------------------------------------------------------------------------------------------------
7391-
Copyright 2021 Google LLC.
7371+
Copyright 2011 Google Inc.
7372+
Copyright 2012 Mozilla Foundation
73927373

73937374
Redistribution and use in source and binary forms, with or without
73947375
modification, are permitted provided that the following conditions are
@@ -7419,6 +7400,26 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
74197400
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
74207401
====================================================================================================
74217402

7403+
====================================================================================================
7404+
LIBRARY: skia
7405+
ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7406+
TYPE: LicenseType.unknown
7407+
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7408+
FILE: ../../../third_party/skia/src/sksl/spirv.h
7409+
----------------------------------------------------------------------------------------------------
7410+
Copyright (c) 2014-2016 The Khronos Group Inc.
7411+
7412+
Permission is hereby granted, free of charge, to any person obtaining a copy
7413+
of this software and/or associated documentation files (the "Materials"),
7414+
to deal in the Materials without restriction, including without limitation
7415+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7416+
and/or sell copies of the Materials, and to permit persons to whom the
7417+
Materials are furnished to do so, subject to the following conditions:
7418+
7419+
The above copyright notice and this permission notice shall be included in
7420+
all copies or substantial portions of the Materials.
7421+
====================================================================================================
7422+
74227423
====================================================================================================
74237424
LIBRARY: vulkanmemoryallocator
74247425
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h

0 commit comments

Comments
 (0)