summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>2017-08-09 18:19:14 +0200
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>2017-08-09 18:19:14 +0200
commitcf850a99f3338b701743094973e6b734b5bab9bd (patch)
treee1f875bb2cdf23d4e0373b89249fea70d1d12daa /www-client/chromium/files
parentapp-laptop/batti: Drop old (diff)
downloadgentoo-cf850a99f3338b701743094973e6b734b5bab9bd.tar.gz
gentoo-cf850a99f3338b701743094973e6b734b5bab9bd.tar.bz2
gentoo-cf850a99f3338b701743094973e6b734b5bab9bd.zip
www-client/chromium: dev channel bump (62.0.3178.0)
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-gn-bootstrap-r15.patch11
-rw-r--r--www-client/chromium/files/chromium-system-zlib-r1.patch22
2 files changed, 33 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r15.patch b/www-client/chromium/files/chromium-gn-bootstrap-r15.patch
new file mode 100644
index 000000000000..726dca2e903b
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r15.patch
@@ -0,0 +1,11 @@
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -550,8 +550,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/trace_event/memory_peak_detector.cc',
+ 'base/trace_event/memory_usage_estimator.cc',
+ 'base/trace_event/process_memory_dump.cc',
+- 'base/trace_event/process_memory_maps.cc',
+- 'base/trace_event/process_memory_totals.cc',
+ 'base/trace_event/sharded_allocation_register.cc',
+ 'base/trace_event/trace_buffer.cc',
+ 'base/trace_event/trace_config.cc',
diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch
new file mode 100644
index 000000000000..23ee934b5222
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-zlib-r1.patch
@@ -0,0 +1,22 @@
+--- a/gpu/command_buffer/service/memory_program_cache.cc
++++ b/gpu/command_buffer/service/memory_program_cache.cc
+@@ -226,7 +226,7 @@ bool ProgramBinaryExtensionsAvailable() {
+ // Returns an empty vector if compression fails.
+ std::vector<uint8_t> CompressData(const std::vector<uint8_t>& data) {
+ auto start_time = base::TimeTicks::Now();
+- Cr_z_uLongf compressed_size = compressBound(data.size());
++ uLongf compressed_size = compressBound(data.size());
+ std::vector<uint8_t> compressed_data(compressed_size);
+ // Level indicates a trade-off between compression and speed. Level 1
+ // indicates fastest speed (with worst compression).
+@@ -256,8 +256,8 @@ std::vector<uint8_t> DecompressData(const std::vector<uint8_t>& data,
+ size_t max_size_bytes) {
+ auto start_time = base::TimeTicks::Now();
+ std::vector<uint8_t> decompressed_data(decompressed_size);
+- Cr_z_uLongf decompressed_size_out =
+- static_cast<Cr_z_uLongf>(decompressed_size);
++ uLongf decompressed_size_out =
++ static_cast<uLongf>(decompressed_size);
+ auto result = uncompress(decompressed_data.data(), &decompressed_size_out,
+ data.data(), data.size());
+