Skip to content

Commit

Permalink
Roll src/third_party/skia 6c56055..8c5f9ef (12 commits) (flutter#5577)
Browse files Browse the repository at this point in the history
Auto-roller completed checks. Merging.
  • Loading branch information
skia-flutter-autoroll authored Jun 20, 2018
1 parent 015a6fa commit 18debbb
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 54 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': '6c56055f65fc5a64a6124929f6313892cea18fe0',
'skia_revision': '8c5f9ef801793ec8a95918ad25729de847b119eb',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
30 changes: 30 additions & 0 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -10557,6 +10557,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia

Copyright 2018 Google LLC.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia

Copyright 2018 Google, LLC

Redistribution and use in source and binary forms, with or without
Expand Down
137 changes: 84 additions & 53 deletions travis/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 4496b02fa0d9cc770662ab523b6bcf2e
Signature: 959fb3fb7500bd9187794c2971d76d2c

UNUSED LICENSES:

Expand Down Expand Up @@ -14407,7 +14407,7 @@ FILE: ../../../third_party/skia/src/compute/sk/SkSurface_Compute.cpp
FILE: ../../../third_party/skia/src/compute/sk/SkSurface_Compute.h
FILE: ../../../third_party/skia/src/compute/skc/assert_skc.c
FILE: ../../../third_party/skia/src/compute/skc/assert_skc.h
FILE: ../../../third_party/skia/src/compute/skc/render.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/render.cl
FILE: ../../../third_party/skia/src/compute/skc/styling.c
FILE: ../../../third_party/skia/src/compute/skc/styling.h
FILE: ../../../third_party/skia/src/compute/skc/styling_types.h
Expand Down Expand Up @@ -17259,15 +17259,15 @@ FILE: ../../../third_party/skia/src/compute/common/cl/find_cl.h
FILE: ../../../third_party/skia/src/compute/hs/cl/bench/sort.cpp
FILE: ../../../third_party/skia/src/compute/hs/gen/transpose.c
FILE: ../../../third_party/skia/src/compute/hs/gen/transpose.h
FILE: ../../../third_party/skia/src/compute/skc/allocator_device_cl.c
FILE: ../../../third_party/skia/src/compute/skc/allocator_device_cl.h
FILE: ../../../third_party/skia/src/compute/skc/allocator_host.c
FILE: ../../../third_party/skia/src/compute/skc/allocator_host.h
FILE: ../../../third_party/skia/src/compute/skc/interop.c
FILE: ../../../third_party/skia/src/compute/skc/interop.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/allocator_device_cl.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/allocator_device_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/gl/interop.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/gl/interop.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/segment_ttck.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/segment_ttrk.cl
FILE: ../../../third_party/skia/src/compute/skc/runtime.h
FILE: ../../../third_party/skia/src/compute/skc/segment_ttck.cl
FILE: ../../../third_party/skia/src/compute/skc/segment_ttrk.cl
FILE: ../../../third_party/skia/src/compute/skc/suballocator.c
FILE: ../../../third_party/skia/src/compute/skc/suballocator.h
FILE: ../../../third_party/skia/src/compute/ts/transform_stack.c
Expand Down Expand Up @@ -19280,6 +19280,7 @@ FILE: ../../../third_party/skia/gm/xfermodes3.cpp
FILE: ../../../third_party/skia/include/core/SkDataTable.h
FILE: ../../../third_party/skia/include/core/SkDocument.h
FILE: ../../../third_party/skia/include/core/SkFontLCDConfig.h
FILE: ../../../third_party/skia/include/core/SkFontMgr.h
FILE: ../../../third_party/skia/include/core/SkFontStyle.h
FILE: ../../../third_party/skia/include/core/SkImageGenerator.h
FILE: ../../../third_party/skia/include/core/SkImageInfo.h
Expand All @@ -19293,7 +19294,6 @@ FILE: ../../../third_party/skia/include/effects/SkTileImageFilter.h
FILE: ../../../third_party/skia/include/gpu/GrBlend.h
FILE: ../../../third_party/skia/include/gpu/gl/GrGLExtensions.h
FILE: ../../../third_party/skia/include/ports/SkFontConfigInterface.h
FILE: ../../../third_party/skia/include/ports/SkFontMgr.h
FILE: ../../../third_party/skia/include/private/GrTypesPriv.h
FILE: ../../../third_party/skia/include/private/SkMessageBus.h
FILE: ../../../third_party/skia/include/private/SkOnce.h
Expand Down Expand Up @@ -19573,75 +19573,71 @@ FILE: ../../../third_party/skia/src/codec/SkStubHeifDecoderAPI.h
FILE: ../../../third_party/skia/src/compute/color/color.c
FILE: ../../../third_party/skia/src/compute/color/color.h
FILE: ../../../third_party/skia/src/compute/skc/assert_state.h
FILE: ../../../third_party/skia/src/compute/skc/atomic_cl.h
FILE: ../../../third_party/skia/src/compute/skc/block.h
FILE: ../../../third_party/skia/src/compute/skc/block_pool_cl.h
FILE: ../../../third_party/skia/src/compute/skc/block_pool_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/block_pool_init.cl
FILE: ../../../third_party/skia/src/compute/skc/cl_20/extent.c
FILE: ../../../third_party/skia/src/compute/skc/cl_20/extent.h
FILE: ../../../third_party/skia/src/compute/skc/cl_20/ring_cl_svm_fine.cpp
FILE: ../../../third_party/skia/src/compute/skc/cl_20/ring_cl_svm_fine.h
FILE: ../../../third_party/skia/src/compute/skc/common.h
FILE: ../../../third_party/skia/src/compute/skc/composition.c
FILE: ../../../third_party/skia/src/compute/skc/composition.h
FILE: ../../../third_party/skia/src/compute/skc/composition_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/composition_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/config_cl.h
FILE: ../../../third_party/skia/src/compute/skc/context.c
FILE: ../../../third_party/skia/src/compute/skc/context.h
FILE: ../../../third_party/skia/src/compute/skc/cq_pool_cl.c
FILE: ../../../third_party/skia/src/compute/skc/cq_pool_cl.h
FILE: ../../../third_party/skia/src/compute/skc/device_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/device_cl_12_avx2.h
FILE: ../../../third_party/skia/src/compute/skc/device_cl_12_gen9.c
FILE: ../../../third_party/skia/src/compute/skc/device_cl_12_gen9.h
FILE: ../../../third_party/skia/src/compute/skc/export_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/extent_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/extent_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/extent_cl_12_unified.c
FILE: ../../../third_party/skia/src/compute/skc/extent_ring.c
FILE: ../../../third_party/skia/src/compute/skc/extent_ring.h
FILE: ../../../third_party/skia/src/compute/skc/fills_expand.cl
FILE: ../../../third_party/skia/src/compute/skc/grid.c
FILE: ../../../third_party/skia/src/compute/skc/grid.h
FILE: ../../../third_party/skia/src/compute/skc/handle.h
FILE: ../../../third_party/skia/src/compute/skc/handle_pool_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/handle_pool_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/macros.h
FILE: ../../../third_party/skia/src/compute/skc/main.c
FILE: ../../../third_party/skia/src/compute/skc/path.h
FILE: ../../../third_party/skia/src/compute/skc/path_builder.c
FILE: ../../../third_party/skia/src/compute/skc/path_builder.h
FILE: ../../../third_party/skia/src/compute/skc/path_builder_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/path_builder_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/paths_copy.cl
FILE: ../../../third_party/skia/src/compute/skc/paths_reclaim.cl
FILE: ../../../third_party/skia/src/compute/skc/place.cl
FILE: ../../../third_party/skia/src/compute/skc/prefix.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/atomic_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/block_pool_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/block_pool_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/composition_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/composition_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/config_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/cq_pool_cl.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/cq_pool_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/device_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/export_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/extent_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/extent_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/extent_cl_12_unified.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/handle_pool_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/handle_pool_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/block_pool_init.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/devices/avx2/device_cl_12_avx2.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/devices/gen9/device_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/devices/gen9/device_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/fills_expand.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/paths_copy.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/paths_reclaim.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/place.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/prefix.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/rasterize.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/rasters_alloc.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/kernels/rasters_reclaim.cl
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/path_builder_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/path_builder_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/raster_builder_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/raster_builder_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/runtime_cl.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/runtime_cl.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/runtime_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/runtime_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/styling_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/styling_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/surface_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/platforms/cl_12/surface_cl_12_buffer.c
FILE: ../../../third_party/skia/src/compute/skc/raster.h
FILE: ../../../third_party/skia/src/compute/skc/raster_builder.c
FILE: ../../../third_party/skia/src/compute/skc/raster_builder.h
FILE: ../../../third_party/skia/src/compute/skc/raster_builder_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/raster_builder_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/rasterize.cl
FILE: ../../../third_party/skia/src/compute/skc/rasters_alloc.cl
FILE: ../../../third_party/skia/src/compute/skc/rasters_reclaim.cl
FILE: ../../../third_party/skia/src/compute/skc/runtime_cl.c
FILE: ../../../third_party/skia/src/compute/skc/runtime_cl.h
FILE: ../../../third_party/skia/src/compute/skc/runtime_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/runtime_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/scheduler.cpp
FILE: ../../../third_party/skia/src/compute/skc/scheduler.h
FILE: ../../../third_party/skia/src/compute/skc/skc.h
FILE: ../../../third_party/skia/src/compute/skc/skc_styling.h
FILE: ../../../third_party/skia/src/compute/skc/styling_cl_12.c
FILE: ../../../third_party/skia/src/compute/skc/styling_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/subblock.h
FILE: ../../../third_party/skia/src/compute/skc/surface.c
FILE: ../../../third_party/skia/src/compute/skc/surface.h
FILE: ../../../third_party/skia/src/compute/skc/surface_cl_12.h
FILE: ../../../third_party/skia/src/compute/skc/surface_cl_12_buffer.c
FILE: ../../../third_party/skia/src/compute/skc/types.h
FILE: ../../../third_party/skia/src/compute/skc/util.h
FILE: ../../../third_party/skia/src/compute/skc/weakref.c
Expand Down Expand Up @@ -20582,6 +20578,41 @@ 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/include/ports/SkFontMgr.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/ports/SkFontMgr.h
----------------------------------------------------------------------------------------------------
Copyright 2018 Google LLC.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/include/utils/SkEventTracer.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -22102,4 +22133,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 323
Total license count: 324

0 comments on commit 18debbb

Please sign in to comment.