Skip to content

Commit

Permalink
Roll src/third_party/skia 846bb41..14538dd (8 commits) (flutter#5575)
Browse files Browse the repository at this point in the history 
Auto-roller completed checks. Merging.
  • Loading branch information
@skia-flutter-autoroll
skia-flutter-autoroll authored Jun 20, 2018
1 parent 964569b commit e398152
Show file tree
Hide file tree
Showing 2 changed files with 159 additions and 34 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
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': '846bb413e161cb556f1afdbf07f3e637bff44432',
'skia_revision': '14538ddf874e1a146487dad02709929c4b63baf5',

# 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
191 changes: 158 additions & 33 deletions travis/licenses_golden/licenses_third_party
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 493ff7b41e2ce6a053ba89eff4558265
Signature: 1570c26fb3ac06244ab79c9de27df68a

UNUSED LICENSES:

Expand Down Expand Up @@ -14383,6 +14383,36 @@ FILE: ../../../third_party/skia/src/codec/SkRawCodec.cpp
FILE: ../../../third_party/skia/src/codec/SkRawCodec.h
FILE: ../../../third_party/skia/src/codec/SkStreamBuffer.cpp
FILE: ../../../third_party/skia/src/codec/SkStreamBuffer.h
FILE: ../../../third_party/skia/src/compute/common/cl/assert_cl.c
FILE: ../../../third_party/skia/src/compute/common/cl/assert_cl.h
FILE: ../../../third_party/skia/src/compute/common/macros.h
FILE: ../../../third_party/skia/src/compute/common/util.c
FILE: ../../../third_party/skia/src/compute/common/util.h
FILE: ../../../third_party/skia/src/compute/hs/cl/bench/main.c
FILE: ../../../third_party/skia/src/compute/hs/cl/hs_cl_launcher.c
FILE: ../../../third_party/skia/src/compute/hs/cl/hs_cl_launcher.h
FILE: ../../../third_party/skia/src/compute/hs/gen/gen.h
FILE: ../../../third_party/skia/src/compute/hs/gen/main.c
FILE: ../../../third_party/skia/src/compute/hs/gen/networks.h
FILE: ../../../third_party/skia/src/compute/hs/gen/networks_merging.c
FILE: ../../../third_party/skia/src/compute/hs/gen/networks_sorting.c
FILE: ../../../third_party/skia/src/compute/hs/gen/target_cuda_sm3x.c
FILE: ../../../third_party/skia/src/compute/hs/gen/target_igp_genx.c
FILE: ../../../third_party/skia/src/compute/sk/SkContext_Compute.cpp
FILE: ../../../third_party/skia/src/compute/sk/SkContext_Compute.h
FILE: ../../../third_party/skia/src/compute/sk/SkDevice_Compute.cpp
FILE: ../../../third_party/skia/src/compute/sk/SkImage_Compute.cpp
FILE: ../../../third_party/skia/src/compute/sk/SkImage_Compute.h
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/styling.c
FILE: ../../../third_party/skia/src/compute/skc/styling.h
FILE: ../../../third_party/skia/src/compute/skc/styling_types.h
FILE: ../../../third_party/skia/src/compute/skc/tile.h
FILE: ../../../third_party/skia/src/compute/skc/util.c
FILE: ../../../third_party/skia/src/core/Sk4x4f.h
FILE: ../../../third_party/skia/src/core/SkATrace.cpp
FILE: ../../../third_party/skia/src/core/SkATrace.h
Expand Down Expand Up @@ -17224,6 +17254,24 @@ FILE: ../../../third_party/skia/samplecode/SampleFlutterAnimate.cpp
FILE: ../../../third_party/skia/samplecode/SampleGlyphTransform.cpp
FILE: ../../../third_party/skia/samplecode/SampleNima.cpp
FILE: ../../../third_party/skia/src/android/SkAnimatedImage.cpp
FILE: ../../../third_party/skia/src/compute/common/cl/find_cl.c
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/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
FILE: ../../../third_party/skia/src/compute/ts/transform_stack.h
FILE: ../../../third_party/skia/src/core/SkBlurPriv.h
FILE: ../../../third_party/skia/src/core/SkCanvasPriv.cpp
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.cpp
Expand Down Expand Up @@ -19520,6 +19568,82 @@ FILE: ../../../third_party/skia/src/codec/SkHeifCodec.h
FILE: ../../../third_party/skia/src/codec/SkJpegPriv.h
FILE: ../../../third_party/skia/src/codec/SkPngPriv.h
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/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
FILE: ../../../third_party/skia/src/compute/skc/weakref.h
FILE: ../../../third_party/skia/src/core/SkArenaAllocList.h
FILE: ../../../third_party/skia/src/core/SkAutoBlitterChoose.h
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_utils.h
Expand Down Expand Up @@ -20644,11 +20768,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/compute/sk/SkDevice_Compute.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
FILE: ../../../third_party/skia/src/compute/sk/SkDevice_Compute.h
FILE: ../../../third_party/skia/src/core/SkScan_AAAPath.cpp
FILE: ../../../third_party/skia/src/core/SkScan_DAAPath.cpp
----------------------------------------------------------------------------------------------------
NEON optimized code (C) COPYRIGHT 2009 Motorola
Copyright 2016 The Android Open Source Project

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -20682,9 +20808,8 @@ LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
FILE: ../../../third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp
----------------------------------------------------------------------------------------------------
Copyright 2008 Google Inc.
NEON optimized code (C) COPYRIGHT 2009 Motorola

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -20715,21 +20840,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkDevice.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkDevice.h
FILE: ../../../third_party/skia/src/core/SkScalar.cpp
FILE: ../../../third_party/skia/src/core/SkTextFormatParams.h
FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.cpp
FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.h
FILE: ../../../third_party/skia/src/pdf/SkDeflate.cpp
FILE: ../../../third_party/skia/src/pdf/SkDeflate.h
FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.h
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicState.h
FILE: ../../../third_party/skia/src/pdf/SkPDFTypes.h
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
FILE: ../../../third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp
----------------------------------------------------------------------------------------------------
Copyright 2010 The Android Open Source Project
Copyright 2008 Google Inc.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -20760,13 +20876,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkFlattenablePriv.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkDevice.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkFlattenablePriv.h
FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp
FILE: ../../../third_party/skia/src/core/SkGlyphRun.h
FILE: ../../../third_party/skia/src/core/SkDevice.h
FILE: ../../../third_party/skia/src/core/SkScalar.cpp
FILE: ../../../third_party/skia/src/core/SkTextFormatParams.h
FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.cpp
FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.h
FILE: ../../../third_party/skia/src/pdf/SkDeflate.cpp
FILE: ../../../third_party/skia/src/pdf/SkDeflate.h
FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.h
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicState.h
FILE: ../../../third_party/skia/src/pdf/SkPDFTypes.h
----------------------------------------------------------------------------------------------------
Copyright 2018 The Android Open Source Project
Copyright 2010 The Android Open Source Project

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -20797,13 +20921,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkMatrixImageFilter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkFlattenablePriv.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkMatrixImageFilter.cpp
FILE: ../../../third_party/skia/src/core/SkMatrixImageFilter.h
FILE: ../../../third_party/skia/src/opts/SkColor_opts_SSE2.h
FILE: ../../../third_party/skia/src/core/SkFlattenablePriv.h
FILE: ../../../third_party/skia/src/core/SkGlyphRun.cpp
FILE: ../../../third_party/skia/src/core/SkGlyphRun.h
----------------------------------------------------------------------------------------------------
Copyright 2014 The Android Open Source Project
Copyright 2018 The Android Open Source Project

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -20834,12 +20958,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkScan_AAAPath.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkMatrixImageFilter.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkScan_AAAPath.cpp
FILE: ../../../third_party/skia/src/core/SkScan_DAAPath.cpp
FILE: ../../../third_party/skia/src/core/SkMatrixImageFilter.cpp
FILE: ../../../third_party/skia/src/core/SkMatrixImageFilter.h
FILE: ../../../third_party/skia/src/opts/SkColor_opts_SSE2.h
----------------------------------------------------------------------------------------------------
Copyright 2016 The Android Open Source Project
Copyright 2014 The Android Open Source Project

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

0 comments on commit e398152

Please sign in to comment.