From 9e5464d7589d80721308e7e29ba5f64cd40a5e1f Mon Sep 17 00:00:00 2001 From: Maya Rashish Date: Sat, 15 Aug 2020 14:43:22 +0300 Subject: [PATCH] chromium: reference skia upstream patch review --- chromium/distinfo | 12 ++++++------ chromium/patches/patch-third__party_skia_BUILD.gn | 2 ++ chromium/patches/patch-third__party_skia_gn_BUILD.gn | 2 ++ chromium/patches/patch-third__party_skia_gn_skia.gni | 2 ++ ...ch-third__party_skia_third__party_angle2_BUILD.gn | 2 ++ ...ch-third__party_skia_third__party_libsdl_BUILD.gn | 2 ++ ...ch-third__party_skia_third__party_opencl_BUILD.gn | 2 ++ 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/chromium/distinfo b/chromium/distinfo index 6d1cdd5362..e53acf83ab 100644 --- a/chromium/distinfo +++ b/chromium/distinfo @@ -783,15 +783,15 @@ SHA1 (patch-third__party_perfetto_src_base_BUILD.gn) = e942923edfe5148e4cf9e9ab4 SHA1 (patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc) = 7341369e056fce3bd32a0a8a4eb94f19acc5dc23 SHA1 (patch-third__party_perfetto_tools_BUILD.gn) = 44f0ef2452d8ab1d7f9a95ac0a666d2e419ebe3b SHA1 (patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h) = 95e780bbc128fc1980b4958408b729525137206c -SHA1 (patch-third__party_skia_BUILD.gn) = a5de28cc8875eff7e46ce0dad3b5e766b656d3ec -SHA1 (patch-third__party_skia_gn_BUILD.gn) = 7bc846c1b969334a534578b3360c8ef345be9f39 -SHA1 (patch-third__party_skia_gn_skia.gni) = e8e5e7c8ea05e83d3bb696ea6b28636b7f8ea3b5 +SHA1 (patch-third__party_skia_BUILD.gn) = a5d12d33c1d74901df2b0643b19537a76c4d52a5 +SHA1 (patch-third__party_skia_gn_BUILD.gn) = 08da6598ae1b1b7b5d0e54affbc94c0603e73654 +SHA1 (patch-third__party_skia_gn_skia.gni) = efd2059c6ef099cfb498d428cb5c4a56c25cdd5d SHA1 (patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h) = eeefaecfe8d0f5096642e00a77be7b1170bfec7b SHA1 (patch-third__party_skia_src_images_SkJpegEncoder.cpp) = 5663487963cf8e29a10f6d581dff6ddcbb79a3fe SHA1 (patch-third__party_skia_src_sksl_SkSLString.h) = 8841c541326e18df2410b3ea3981141018a68feb -SHA1 (patch-third__party_skia_third__party_angle2_BUILD.gn) = cade424bb3f334ab3df74dbf0540c23189920426 -SHA1 (patch-third__party_skia_third__party_libsdl_BUILD.gn) = a7700a340ad1632c0a048918965e98bb0372dcdb -SHA1 (patch-third__party_skia_third__party_opencl_BUILD.gn) = c047bedba1e8d7353c62ac9ad590289df98523a3 +SHA1 (patch-third__party_skia_third__party_angle2_BUILD.gn) = 55dd3e8b6552e977a1a7cd5fa47fb55bfa036725 +SHA1 (patch-third__party_skia_third__party_libsdl_BUILD.gn) = 285a16766f49d549bb7b2e74de74b625b40de1ed +SHA1 (patch-third__party_skia_third__party_opencl_BUILD.gn) = e6621cd68694d5029d78c0da9c8554daea757d1b SHA1 (patch-third__party_sqlite_BUILD.gn) = 314e9668c6d07417eb6619010ac92e60374d815e SHA1 (patch-third__party_swiftshader_BUILD.gn) = ee9869cad207a669efea8c06b91b17868fcaba28 SHA1 (patch-third__party_swiftshader_src_Common_Configurator.cpp) = b0b08e070f4e11dc21747229b952a426e34a7b5d diff --git a/chromium/patches/patch-third__party_skia_BUILD.gn b/chromium/patches/patch-third__party_skia_BUILD.gn index ca57d8dac6..6b76ff74fd 100644 --- a/chromium/patches/patch-third__party_skia_BUILD.gn +++ b/chromium/patches/patch-third__party_skia_BUILD.gn @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/BUILD.gn.orig 2020-07-15 19:01:38.000000000 +0000 +++ third_party/skia/BUILD.gn @@ -32,7 +32,7 @@ config("skia_public") { diff --git a/chromium/patches/patch-third__party_skia_gn_BUILD.gn b/chromium/patches/patch-third__party_skia_gn_BUILD.gn index f064e6cdb0..e7b8eb2b90 100644 --- a/chromium/patches/patch-third__party_skia_gn_BUILD.gn +++ b/chromium/patches/patch-third__party_skia_gn_BUILD.gn @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/gn/BUILD.gn.orig 2020-07-15 19:01:39.000000000 +0000 +++ third_party/skia/gn/BUILD.gn @@ -211,7 +211,7 @@ config("default") { diff --git a/chromium/patches/patch-third__party_skia_gn_skia.gni b/chromium/patches/patch-third__party_skia_gn_skia.gni index 04c3653041..106b8ac44a 100644 --- a/chromium/patches/patch-third__party_skia_gn_skia.gni +++ b/chromium/patches/patch-third__party_skia_gn_skia.gni @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/gn/skia.gni.orig 2020-07-15 19:01:39.000000000 +0000 +++ third_party/skia/gn/skia.gni @@ -26,7 +26,7 @@ declare_args() { diff --git a/chromium/patches/patch-third__party_skia_third__party_angle2_BUILD.gn b/chromium/patches/patch-third__party_skia_third__party_angle2_BUILD.gn index fced1fe518..7e091e7fe4 100644 --- a/chromium/patches/patch-third__party_skia_third__party_angle2_BUILD.gn +++ b/chromium/patches/patch-third__party_skia_third__party_angle2_BUILD.gn @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/third_party/angle2/BUILD.gn.orig 2020-07-15 19:01:41.000000000 +0000 +++ third_party/skia/third_party/angle2/BUILD.gn @@ -37,8 +37,8 @@ config("common") { diff --git a/chromium/patches/patch-third__party_skia_third__party_libsdl_BUILD.gn b/chromium/patches/patch-third__party_skia_third__party_libsdl_BUILD.gn index c592410fcb..c097f3489d 100644 --- a/chromium/patches/patch-third__party_skia_third__party_libsdl_BUILD.gn +++ b/chromium/patches/patch-third__party_skia_third__party_libsdl_BUILD.gn @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/third_party/libsdl/BUILD.gn.orig 2020-07-15 19:01:41.000000000 +0000 +++ third_party/skia/third_party/libsdl/BUILD.gn @@ -125,7 +125,7 @@ third_party("libsdl") { diff --git a/chromium/patches/patch-third__party_skia_third__party_opencl_BUILD.gn b/chromium/patches/patch-third__party_skia_third__party_opencl_BUILD.gn index fbd9cf6711..0a2e28c594 100644 --- a/chromium/patches/patch-third__party_skia_third__party_opencl_BUILD.gn +++ b/chromium/patches/patch-third__party_skia_third__party_opencl_BUILD.gn @@ -1,5 +1,7 @@ $NetBSD$ +https://skia-review.googlesource.com/c/skia/+/310856 + --- third_party/skia/third_party/opencl/BUILD.gn.orig 2020-07-15 19:01:41.000000000 +0000 +++ third_party/skia/third_party/opencl/BUILD.gn @@ -5,7 +5,7 @@ third_party("opencl") {