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

Commit f2acd0a

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll src/third_party/skia/ f31fece..1d686a9 (10 commits) (#5228)
Auto-roller completed checks. Merging.
1 parent fade83c commit f2acd0a

File tree

2 files changed

+39
-40
lines changed

2 files changed

+39
-40
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vars = {
2323
'fuchsia_git': 'https://fuchsia.googlesource.com',
2424
'github_git': 'https://github.com',
2525
'skia_git': 'https://skia.googlesource.com',
26-
'skia_revision': 'f31fece6581a46b40403fc78c83c7eebe50816ba',
26+
'skia_revision': '1d686a962c775a69b54f165a23c20c57e506023b',
2727

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

‎travis/licenses_golden/licenses_third_party‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5db29e66257aa1c8a2ac53d069aeb153
1+
Signature: a21b2333b39745cc2457c3e4eb0801e3
22

33
UNUSED LICENSES:
44

@@ -17215,7 +17215,6 @@ FILE: ../../../third_party/skia/include/core/SkCanvasVirtualEnforcer.h
1721517215
FILE: ../../../third_party/skia/include/core/SkCoverageMode.h
1721617216
FILE: ../../../third_party/skia/include/effects/SkShaderMaskFilter.h
1721717217
FILE: ../../../third_party/skia/include/effects/SkTrimPathEffect.h
17218-
FILE: ../../../third_party/skia/include/gpu/GrDriverBugWorkarounds.h
1721917218
FILE: ../../../third_party/skia/include/private/GrSurfaceProxyRef.h
1722017219
FILE: ../../../third_party/skia/include/private/GrVkTypesPriv.h
1722117220
FILE: ../../../third_party/skia/include/private/SkSafe32.h
@@ -17246,9 +17245,11 @@ FILE: ../../../third_party/skia/src/core/SkTypeface_remote.h
1724617245
FILE: ../../../third_party/skia/src/effects/SkShaderMaskFilter.cpp
1724717246
FILE: ../../../third_party/skia/src/effects/SkTrimPE.h
1724817247
FILE: ../../../third_party/skia/src/effects/SkTrimPathEffect.cpp
17248+
FILE: ../../../third_party/skia/src/gpu/GrContextThreadSafeProxyPriv.h
1724917249
FILE: ../../../third_party/skia/src/gpu/GrDDLContext.cpp
1725017250
FILE: ../../../third_party/skia/src/gpu/GrDirectContext.cpp
1725117251
FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkarounds.cpp
17252+
FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkarounds.h
1725217253
FILE: ../../../third_party/skia/src/gpu/GrFPArgs.h
1725317254
FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.cpp
1725417255
FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.h
@@ -19589,8 +19590,6 @@ FILE: ../../../third_party/skia/src/core/SkClipStackDevice.h
1958919590
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformCanvas.cpp
1959019591
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformer.cpp
1959119592
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformer.h
19592-
FILE: ../../../third_party/skia/src/core/SkColorSpace_New.cpp
19593-
FILE: ../../../third_party/skia/src/core/SkColorSpace_New.h
1959419593
FILE: ../../../third_party/skia/src/core/SkCoverageDelta.cpp
1959519594
FILE: ../../../third_party/skia/src/core/SkCoverageDelta.h
1959619595
FILE: ../../../third_party/skia/src/core/SkDeferredDisplayListRecorder.cpp
@@ -20484,41 +20483,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2048420483
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2048520484
====================================================================================================
2048620485

20487-
====================================================================================================
20488-
LIBRARY: skia
20489-
ORIGIN: ../../../third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
20490-
TYPE: LicenseType.bsd
20491-
FILE: ../../../third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h
20492-
----------------------------------------------------------------------------------------------------
20493-
Copyright 2018 The Chromium Authors. All rights reserved.
20494-
20495-
Redistribution and use in source and binary forms, with or without
20496-
modification, are permitted provided that the following conditions are
20497-
met:
20498-
20499-
* Redistributions of source code must retain the above copyright
20500-
notice, this list of conditions and the following disclaimer.
20501-
* Redistributions in binary form must reproduce the above
20502-
copyright notice, this list of conditions and the following disclaimer
20503-
in the documentation and/or other materials provided with the
20504-
distribution.
20505-
* Neither the name of Google Inc. nor the names of its
20506-
contributors may be used to endorse or promote products derived from
20507-
this software without specific prior written permission.
20508-
20509-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20510-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20511-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20512-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
20513-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20514-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
20515-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20516-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20517-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
20518-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
20519-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20520-
====================================================================================================
20521-
2052220486
====================================================================================================
2052320487
LIBRARY: skia
2052420488
ORIGIN: ../../../third_party/skia/include/utils/SkEventTracer.h + ../../../third_party/skia/LICENSE
@@ -20965,6 +20929,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2096520929
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2096620930
====================================================================================================
2096720931

20932+
====================================================================================================
20933+
LIBRARY: skia
20934+
ORIGIN: ../../../third_party/skia/src/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
20935+
TYPE: LicenseType.bsd
20936+
FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkaroundsAutogen.h
20937+
----------------------------------------------------------------------------------------------------
20938+
Copyright 2018 The Chromium Authors. All rights reserved.
20939+
20940+
Redistribution and use in source and binary forms, with or without
20941+
modification, are permitted provided that the following conditions are
20942+
met:
20943+
20944+
* Redistributions of source code must retain the above copyright
20945+
notice, this list of conditions and the following disclaimer.
20946+
* Redistributions in binary form must reproduce the above
20947+
copyright notice, this list of conditions and the following disclaimer
20948+
in the documentation and/or other materials provided with the
20949+
distribution.
20950+
* Neither the name of Google Inc. nor the names of its
20951+
contributors may be used to endorse or promote products derived from
20952+
this software without specific prior written permission.
20953+
20954+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20955+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20956+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20957+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
20958+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20959+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
20960+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20961+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20962+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
20963+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
20964+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20965+
====================================================================================================
20966+
2096820967
====================================================================================================
2096920968
LIBRARY: skia
2097020969
ORIGIN: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)