From 16922dd4125fd30c96c183b36bbc4d3ea826996c Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Thu, 16 Aug 2018 13:43:46 -0400 Subject: [PATCH 1/7] Roll src/third_party/skia cbd83bbd77d1..cbb7d572aaa1 (5 commits) (#6033) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index d528b87c5ab9d..5e15f54a7ea39 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'cbd83bbd77d1c8a56ed3547548dcf11ef8e60d2e', + 'skia_revision': 'cbb7d572aaa10c6f4c35d7d52268abedf4e7bf62', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index cf1fbf1d5a423..7d915ebf74e99 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 1901c651ec2a8f303d0c09c37259d02e +Signature: cbefcff25f3e835e3ae031d403989d5a UNUSED LICENSES: From 9ec11b8d24bcf2a138491bc32058665bacfa5a31 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Thu, 16 Aug 2018 17:07:46 -0400 Subject: [PATCH 2/7] Roll src/third_party/skia cbb7d572aaa1..8d77d1d85e2f (12 commits) (#6034) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 224 +++++++++++++++++++++++++++++-- 2 files changed, 211 insertions(+), 15 deletions(-) diff --git a/DEPS b/DEPS index 5e15f54a7ea39..41e24ab0f0a86 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'cbb7d572aaa10c6f4c35d7d52268abedf4e7bf62', + 'skia_revision': '8d77d1d85e2fad56f7cb802ce3fd4248384c3254', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 7d915ebf74e99..04cc19f8156c4 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: cbefcff25f3e835e3ae031d403989d5a +Signature: 8ff2189f19683e715c5cb642d8581e73 UNUSED LICENSES: @@ -872,17 +872,33 @@ 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/cuda/assert_cuda.c +FILE: ../../../third_party/skia/src/compute/common/cuda/assert_cuda.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/common/vk/assert_vk.c +FILE: ../../../third_party/skia/src/compute/common/vk/assert_vk.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/cl/hs_cl.c +FILE: ../../../third_party/skia/src/compute/hs/cl/hs_cl.h FILE: ../../../third_party/skia/src/compute/hs/cl/hs_cl_target.h -FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_cl.cl -FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_cl.h -FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_cl_macros.h +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_intel_gen8_u32.c +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.cl +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_target.h +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_intel_gen8_u64.c +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.cl FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_target.h +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/hs_cl_macros.h +FILE: ../../../third_party/skia/src/compute/hs/cuda/bench/main.c +FILE: ../../../third_party/skia/src/compute/hs/cuda/hs_cuda.inl +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/hs_cuda_macros.h +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u32/hs_cuda_config.h +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u32/hs_cuda_u32.cu +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u64/hs_cuda_config.h +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u64/hs_cuda_u64.cu 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 @@ -891,13 +907,29 @@ FILE: ../../../third_party/skia/src/compute/hs/gen/networks_sorting.c FILE: ../../../third_party/skia/src/compute/hs/gen/target_cuda.c FILE: ../../../third_party/skia/src/compute/hs/gen/target_glsl.c FILE: ../../../third_party/skia/src/compute/hs/gen/target_opencl.c -FILE: ../../../third_party/skia/src/compute/hs/vk/hs_spirv_target.h -FILE: ../../../third_party/skia/src/compute/hs/vk/hs_vk_launcher.c -FILE: ../../../third_party/skia/src/compute/hs/vk/hs_vk_launcher.h -FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_glsl.h -FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_glsl_macros.h -FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_kernels.h +FILE: ../../../third_party/skia/src/compute/hs/vk/bench/main.c +FILE: ../../../third_party/skia/src/compute/hs/vk/hs_glsl_macros.h +FILE: ../../../third_party/skia/src/compute/hs/vk/hs_vk.c +FILE: ../../../third_party/skia/src/compute/hs/vk/hs_vk.h +FILE: ../../../third_party/skia/src/compute/hs/vk/hs_vk_target.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_intel_gen8_u32.c +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_modules.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_target.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_intel_gen8_u64.c +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_modules.h FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_target.h +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/hs_glsl_macros.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/hs_glsl_macros.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_modules.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_nvidia_sm35_u32.c +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_target.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_config.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_modules.h +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_nvidia_sm35_u64.c +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_target.h 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 @@ -912,7 +944,6 @@ 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 @@ -1357,10 +1388,18 @@ FILE: ../../../third_party/skia/samplecode/SampleNimaActor.h 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/common/vk/event_pool.c +FILE: ../../../third_party/skia/src/compute/common/vk/event_pool.h +FILE: ../../../third_party/skia/src/compute/common/vk/host_alloc.c +FILE: ../../../third_party/skia/src/compute/common/vk/host_alloc.h FILE: ../../../third_party/skia/src/compute/hs/cl/bench/sort.cpp +FILE: ../../../third_party/skia/src/compute/hs/cuda/bench/sort.cpp +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u32/hs_cuda.h +FILE: ../../../third_party/skia/src/compute/hs/cuda/sm_35/u64/hs_cuda.h FILE: ../../../third_party/skia/src/compute/hs/gen/target_debug.c 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/hs/vk/bench/sort.cpp 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.h @@ -2301,6 +2340,164 @@ FILE: ../../../third_party/skia/site/user/sample/gamut_wrong.png FILE: ../../../third_party/skia/site/user/sample/gradient_correct.png FILE: ../../../third_party/skia/site/user/sample/gradient_wrong.png FILE: ../../../third_party/skia/site/user/sample/transfer_fn.png +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.bin +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.bin.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.bin.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.pre.cl +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.src.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u32/hs_kernels.src.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.bin +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.bin.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.bin.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.pre.cl +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.src.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/cl/intel/gen8/u64/hs_kernels.src.xxd +FILE: ../../../third_party/skia/src/compute/hs/images/hs_32_mkeys.svg +FILE: ../../../third_party/skia/src/compute/hs/images/hs_32_msecs.svg +FILE: ../../../third_party/skia/src/compute/hs/images/hs_64_mkeys.svg +FILE: ../../../third_party/skia/src/compute/hs/images/hs_64_msecs.svg +FILE: ../../../third_party/skia/src/compute/hs/images/hs_flip_merge.svg +FILE: ../../../third_party/skia/src/compute/hs/images/hs_sorted_slab.svg +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bc_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_bs_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_fm_0_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_hm_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_hm_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_transpose.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u32/hs_transpose.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bc_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_bs_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_fm_1_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_hm_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_hm_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_transpose.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/intel/gen8/u64/hs_transpose.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_5.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bc_5.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_5.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_bs_5.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_5.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_fm_1_5.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_hm_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_hm_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_transpose.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u32/hs_transpose.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bc_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_bs_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_0.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_0.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_2.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_2.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_3.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_3.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_4.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_fm_1_4.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_hm_1.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_hm_1.spv.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_transpose.len.xxd +FILE: ../../../third_party/skia/src/compute/hs/vk/nvidia/sm_35/u64/hs_transpose.spv.xxd FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex FILE: ../../../third_party/skia/src/sksl/sksl.inc @@ -4034,7 +4231,6 @@ 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/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 From 9e26174597b1f1aa420ffedd6515cf79fe932028 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Thu, 16 Aug 2018 20:31:46 -0400 Subject: [PATCH 3/7] Roll src/third_party/skia 8d77d1d85e2f..e21f0ec04e98 (5 commits) (#6036) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 41e24ab0f0a86..aa766c5664b4e 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '8d77d1d85e2fad56f7cb802ce3fd4248384c3254', + 'skia_revision': 'e21f0ec04e9886ca86af1ad47bcbbf367ab6858b', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 04cc19f8156c4..e27263b23693e 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 8ff2189f19683e715c5cb642d8581e73 +Signature: ed5b9cbbaf920d988cd683f238d7b846 UNUSED LICENSES: From 4ff4a5cc995ee7ff7403b21189fa3e9234a5638f Mon Sep 17 00:00:00 2001 From: "James D. Lin" Date: Thu, 16 Aug 2018 17:40:33 -0700 Subject: [PATCH 4/7] Fix potential null pointer dereference in FlutterDartProject (#6035) If `FlutterDartProject` found an `FLTLibraryPath` entry in an iOS application's `Info.plist`, it assumed that values that were valid filesystem paths were paths to bundles. If the attempt to retrieve the `NSBundle` fails, `FlutterDartProject` ignored the failure and then would assign `nil` to a C++ `std::string`, resulting in a null pointer dereference. Add some failure checks to prevent this. --- .../ios/framework/Source/FlutterDartProject.mm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm index d2073fabc2e3d..a89c61acfccb7 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm @@ -73,8 +73,10 @@ NSString* libraryName = [mainBundle objectForInfoDictionaryKey:@"FLTLibraryPath"]; NSString* libraryPath = [mainBundle pathForResource:libraryName ofType:@""]; if (libraryPath.length > 0) { - settings.application_library_path = - [NSBundle bundleWithPath:libraryPath].executablePath.UTF8String; + NSString* executablePath = [NSBundle bundleWithPath:libraryPath].executablePath; + if (executablePath.length > 0) { + settings.application_library_path = executablePath.UTF8String; + } } } @@ -84,8 +86,11 @@ NSString* applicationFrameworkPath = [mainBundle pathForResource:@"Frameworks/App.framework" ofType:@""]; if (applicationFrameworkPath.length > 0) { - settings.application_library_path = - [NSBundle bundleWithPath:applicationFrameworkPath].executablePath.UTF8String; + NSString* executablePath = + [NSBundle bundleWithPath:applicationFrameworkPath].executablePath; + if (executablePath.length > 0) { + settings.application_library_path = executablePath.UTF8String; + } } } } From 6381bea25a5e37c28ec16a64418e68e30885899c Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Thu, 16 Aug 2018 23:54:46 -0400 Subject: [PATCH 5/7] Roll src/third_party/skia e21f0ec04e98..bc414ed5dec5 (2 commits) (#6037) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index aa766c5664b4e..25cc5d44bf670 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'e21f0ec04e9886ca86af1ad47bcbbf367ab6858b', + 'skia_revision': 'bc414ed5dec50cd31210a430d87c9d638560220d', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index e27263b23693e..aae9733ad317f 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: ed5b9cbbaf920d988cd683f238d7b846 +Signature: be55d315fb73f59c29b20c2a5d2e0421 UNUSED LICENSES: From 6b94957a8186a5fb521dbc49987807d84d95d2fb Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Fri, 17 Aug 2018 08:40:46 -0400 Subject: [PATCH 6/7] Roll src/third_party/skia bc414ed5dec5..da135c397356 (1 commits) (#6038) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 25cc5d44bf670..922f234296dfb 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'bc414ed5dec50cd31210a430d87c9d638560220d', + 'skia_revision': 'da135c397356c75d6d0d990945b748d37eae6121', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index aae9733ad317f..aa0f9e1019faf 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: be55d315fb73f59c29b20c2a5d2e0421 +Signature: 2e9a1f69e8319a9b8ff6ebb6d4fbc20e UNUSED LICENSES: From 93efa7ea1ca1a74163924e7729cb0d1a231f4ff3 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Fri, 17 Aug 2018 12:05:46 -0400 Subject: [PATCH 7/7] Roll src/third_party/skia da135c397356..12d13ae7f4e6 (7 commits) (#6039) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 922f234296dfb..e2bd050c24ea1 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'da135c397356c75d6d0d990945b748d37eae6121', + 'skia_revision': '12d13ae7f4e67fcbf2668bef01a65860f20b54e2', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index aa0f9e1019faf..083ba5e7d0174 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2e9a1f69e8319a9b8ff6ebb6d4fbc20e +Signature: abb465841eff11cdfb568a7cdaaa370e UNUSED LICENSES: @@ -803,7 +803,6 @@ FILE: ../../../third_party/skia/gm/imagemakewithfilter.cpp FILE: ../../../third_party/skia/gm/imagemasksubset.cpp FILE: ../../../third_party/skia/gm/lattice.cpp FILE: ../../../third_party/skia/gm/lightingshader2.cpp -FILE: ../../../third_party/skia/gm/occludedrrectblur.cpp FILE: ../../../third_party/skia/gm/overdrawcolorfilter.cpp FILE: ../../../third_party/skia/gm/pathmaskcache.cpp FILE: ../../../third_party/skia/gm/readpixels.cpp @@ -1552,6 +1551,7 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkPipelineLayout.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkTypesPriv.cpp FILE: ../../../third_party/skia/src/opts/SkOpts_hsw.cpp FILE: ../../../third_party/skia/src/opts/SkRasterPipeline_opts.h +FILE: ../../../third_party/skia/src/pathops/SkPathOpsAsWinding.cpp FILE: ../../../third_party/skia/src/pdf/SkClusterator.cpp FILE: ../../../third_party/skia/src/pdf/SkClusterator.h FILE: ../../../third_party/skia/src/sksl/SkSLInterpreter.cpp @@ -2332,6 +2332,7 @@ FILE: ../../../third_party/skia/site/favicon.ico FILE: ../../../third_party/skia/site/user/METADATA FILE: ../../../third_party/skia/site/user/api/METADATA FILE: ../../../third_party/skia/site/user/api/catalog.htm +FILE: ../../../third_party/skia/site/user/modules/PathKit_effects.png FILE: ../../../third_party/skia/site/user/sample/architecture.png FILE: ../../../third_party/skia/site/user/sample/detail_correct.png FILE: ../../../third_party/skia/site/user/sample/detail_wrong.png