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

Commit b5eb147

Browse files
Roll Skia from ecd2a66e6f82 to c71ae5140090 (1 revision)
https://skia.googlesource.com/skia.git/+log/ecd2a66e6f82..c71ae5140090 2022-03-21 [email protected] [graphite] Implement stencil wedge tessellated path rendering If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
1 parent 9326fa6 commit b5eb147

File tree

2 files changed

+41
-38
lines changed

2 files changed

+41
-38
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': 'ecd2a66e6f8229d5658f56cc21c3b5106e06602f',
30+
'skia_revision': 'c71ae5140090290ad16b73bdb0aa6f4543c64a78',
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: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 233d087933806aaff4a7e5ff25c29d0c
1+
Signature: bf29309505065797ffef77b5ad71374d
22

33
UNUSED LICENSES:
44

@@ -6097,6 +6097,8 @@ FILE: ../../../third_party/skia/experimental/graphite/src/render/MiddleOutFanRen
60976097
FILE: ../../../third_party/skia/experimental/graphite/src/render/StencilAndCoverDSS.h
60986098
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateCurvesRenderStep.cpp
60996099
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateCurvesRenderStep.h
6100+
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateWedgesRenderStep.cpp
6101+
FILE: ../../../third_party/skia/experimental/graphite/src/render/TessellateWedgesRenderStep.h
61006102
FILE: ../../../third_party/skia/gm/bug12866.cpp
61016103
FILE: ../../../third_party/skia/include/core/SkAlphaType.h
61026104
FILE: ../../../third_party/skia/include/core/SkColorType.h
@@ -7773,13 +7775,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
77737775

77747776
====================================================================================================
77757777
LIBRARY: skia
7776-
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
7778+
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE
77777779
TYPE: LicenseType.bsd
7778-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
7779-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
7780-
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
7780+
FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
7781+
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
77817782
----------------------------------------------------------------------------------------------------
7782-
Copyright 2009-2015 Google Inc.
7783+
Copyright 2022 Google LLC.
77837784

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

78137814
====================================================================================================
78147815
LIBRARY: skia
7815-
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
7816+
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
78167817
TYPE: LicenseType.bsd
7817-
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
7818-
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
7818+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
7819+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
7820+
FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
78197821
----------------------------------------------------------------------------------------------------
7820-
Copyright 2006-2012 The Android Open Source Project
7821-
Copyright 2012 Mozilla Foundation
7822+
Copyright 2009-2015 Google Inc.
78227823

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

78527853
====================================================================================================
78537854
LIBRARY: skia
7854-
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
7855+
ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
78557856
TYPE: LicenseType.bsd
7856-
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
7857+
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
7858+
FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
78577859
----------------------------------------------------------------------------------------------------
7858-
Copyright 2011 Google Inc.
7860+
Copyright 2006-2012 The Android Open Source Project
78597861
Copyright 2012 Mozilla Foundation
78607862

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

78907892
====================================================================================================
78917893
LIBRARY: skia
7892-
ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7893-
TYPE: LicenseType.unknown
7894-
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7895-
FILE: ../../../third_party/skia/src/sksl/spirv.h
7896-
----------------------------------------------------------------------------------------------------
7897-
Copyright (c) 2014-2016 The Khronos Group Inc.
7898-
7899-
Permission is hereby granted, free of charge, to any person obtaining a copy
7900-
of this software and/or associated documentation files (the "Materials"),
7901-
to deal in the Materials without restriction, including without limitation
7902-
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7903-
and/or sell copies of the Materials, and to permit persons to whom the
7904-
Materials are furnished to do so, subject to the following conditions:
7905-
7906-
The above copyright notice and this permission notice shall be included in
7907-
all copies or substantial portions of the Materials.
7908-
====================================================================================================
7909-
7910-
====================================================================================================
7911-
LIBRARY: skia
7912-
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE
7894+
ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
79137895
TYPE: LicenseType.bsd
7914-
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
7896+
FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
79157897
----------------------------------------------------------------------------------------------------
7916-
Copyright 2022 Google LLC.
7898+
Copyright 2011 Google Inc.
7899+
Copyright 2012 Mozilla Foundation
79177900

79187901
Redistribution and use in source and binary forms, with or without
79197902
modification, are permitted provided that the following conditions are
@@ -7944,6 +7927,26 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
79447927
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
79457928
====================================================================================================
79467929

7930+
====================================================================================================
7931+
LIBRARY: skia
7932+
ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7933+
TYPE: LicenseType.unknown
7934+
FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
7935+
FILE: ../../../third_party/skia/src/sksl/spirv.h
7936+
----------------------------------------------------------------------------------------------------
7937+
Copyright (c) 2014-2016 The Khronos Group Inc.
7938+
7939+
Permission is hereby granted, free of charge, to any person obtaining a copy
7940+
of this software and/or associated documentation files (the "Materials"),
7941+
to deal in the Materials without restriction, including without limitation
7942+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
7943+
and/or sell copies of the Materials, and to permit persons to whom the
7944+
Materials are furnished to do so, subject to the following conditions:
7945+
7946+
The above copyright notice and this permission notice shall be included in
7947+
all copies or substantial portions of the Materials.
7948+
====================================================================================================
7949+
79477950
====================================================================================================
79487951
LIBRARY: vulkanmemoryallocator
79497952
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h

0 commit comments

Comments
 (0)