未验证 提交 00d70696 编写于 作者: S skia-flutter-autoroll 提交者: GitHub

Roll src/third_party/skia 6ed63968a391..a9660ec89bc7 (14 commits) (#5993)

Auto-roller completed checks. Merging.
上级 a84b210b
...@@ -23,7 +23,7 @@ vars = { ...@@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com', 'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com', 'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com', 'skia_git': 'https://skia.googlesource.com',
'skia_revision': '6ed63968a39131df7a6b01600bf32c32800be05d', 'skia_revision': 'a9660ec89bc79f90c6d705baf65336195ea52307',
# When updating the Dart revision, ensure that all entries that are # When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the # dependencies of Dart are also updated to match the entries in the
......
Signature: 47715821607d8bd183d779f34e455565 Signature: 23488eb5053d0e9632b2f49ae29b8973
UNUSED LICENSES: UNUSED LICENSES:
...@@ -1481,6 +1481,7 @@ FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyManager.mm ...@@ -1481,6 +1481,7 @@ FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyManager.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.h FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.mm FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlGpuCommandBuffer.h FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlGpuCommandBuffer.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlGpuCommandBuffer.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineState.h FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineState.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h
...@@ -1879,11 +1880,15 @@ FILE: ../../../third_party/skia/docs/SkBlendMode_Reference.bmh ...@@ -1879,11 +1880,15 @@ FILE: ../../../third_party/skia/docs/SkBlendMode_Reference.bmh
FILE: ../../../third_party/skia/docs/SkCanvas_Reference.bmh FILE: ../../../third_party/skia/docs/SkCanvas_Reference.bmh
FILE: ../../../third_party/skia/docs/SkColor4f_Reference.bmh FILE: ../../../third_party/skia/docs/SkColor4f_Reference.bmh
FILE: ../../../third_party/skia/docs/SkColor_Reference.bmh FILE: ../../../third_party/skia/docs/SkColor_Reference.bmh
FILE: ../../../third_party/skia/docs/SkDynamicMemoryWStream_Reference.bmh
FILE: ../../../third_party/skia/docs/SkFILEStream_Reference.bmh
FILE: ../../../third_party/skia/docs/SkFILEWStream_Reference.bmh
FILE: ../../../third_party/skia/docs/SkIPoint_Reference.bmh FILE: ../../../third_party/skia/docs/SkIPoint_Reference.bmh
FILE: ../../../third_party/skia/docs/SkIRect_Reference.bmh FILE: ../../../third_party/skia/docs/SkIRect_Reference.bmh
FILE: ../../../third_party/skia/docs/SkImageInfo_Reference.bmh FILE: ../../../third_party/skia/docs/SkImageInfo_Reference.bmh
FILE: ../../../third_party/skia/docs/SkImage_Reference.bmh FILE: ../../../third_party/skia/docs/SkImage_Reference.bmh
FILE: ../../../third_party/skia/docs/SkMatrix_Reference.bmh FILE: ../../../third_party/skia/docs/SkMatrix_Reference.bmh
FILE: ../../../third_party/skia/docs/SkMemoryStream_Reference.bmh
FILE: ../../../third_party/skia/docs/SkPaint_Reference.bmh FILE: ../../../third_party/skia/docs/SkPaint_Reference.bmh
FILE: ../../../third_party/skia/docs/SkPath_Reference.bmh FILE: ../../../third_party/skia/docs/SkPath_Reference.bmh
FILE: ../../../third_party/skia/docs/SkPicture_Reference.bmh FILE: ../../../third_party/skia/docs/SkPicture_Reference.bmh
...@@ -1891,7 +1896,12 @@ FILE: ../../../third_party/skia/docs/SkPixmap_Reference.bmh ...@@ -1891,7 +1896,12 @@ FILE: ../../../third_party/skia/docs/SkPixmap_Reference.bmh
FILE: ../../../third_party/skia/docs/SkPoint_Reference.bmh FILE: ../../../third_party/skia/docs/SkPoint_Reference.bmh
FILE: ../../../third_party/skia/docs/SkRRect_Reference.bmh FILE: ../../../third_party/skia/docs/SkRRect_Reference.bmh
FILE: ../../../third_party/skia/docs/SkRect_Reference.bmh FILE: ../../../third_party/skia/docs/SkRect_Reference.bmh
FILE: ../../../third_party/skia/docs/SkRegion_Reference.bmh
FILE: ../../../third_party/skia/docs/SkStream_Reference.bmh
FILE: ../../../third_party/skia/docs/SkSurface_Reference.bmh FILE: ../../../third_party/skia/docs/SkSurface_Reference.bmh
FILE: ../../../third_party/skia/docs/SkTextBlobBuilder_Reference.bmh
FILE: ../../../third_party/skia/docs/SkTextBlob_Reference.bmh
FILE: ../../../third_party/skia/docs/SkWStream_Reference.bmh
FILE: ../../../third_party/skia/docs/illustrations.bmh FILE: ../../../third_party/skia/docs/illustrations.bmh
FILE: ../../../third_party/skia/docs/markup.bmh FILE: ../../../third_party/skia/docs/markup.bmh
FILE: ../../../third_party/skia/docs/overview.bmh FILE: ../../../third_party/skia/docs/overview.bmh
...@@ -3452,7 +3462,7 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp ...@@ -3452,7 +3462,7 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.cpp FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.h FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextUtils.h FILE: ../../../third_party/skia/src/gpu/text/GrTextTarget.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkCaps.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkCaps.cpp
......
...@@ -4147,6 +4147,30 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -4147,6 +4147,30 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
freetype2 freetype2
Copyright 2000 Computing Research Labs, New Mexico State University
Copyright 2001-2015
Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is 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 Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER 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.
--------------------------------------------------------------------------------
freetype2
Copyright 2000, 2001, 2004 by Copyright 2000, 2001, 2004 by
Francesco Zappa Nardelli Francesco Zappa Nardelli
...@@ -4437,7 +4461,7 @@ Legal Terms ...@@ -4437,7 +4461,7 @@ Legal Terms
Our home page can be found at Our home page can be found at
http://www.freetype.org https://www.freetype.org
--- end of FTL.TXT --- --- end of FTL.TXT ---
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册