diff options
author | Yuriy Taraday <yorik.sar@gmail.com> | 2017-10-20 15:02:15 +0400 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2017-10-21 15:55:42 +0200 |
commit | f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3 (patch) | |
tree | 5ae42610b8ad60123c919071f1bbd1e641881376 /pkgs/applications/networking/browsers | |
parent | 2656237ac94971dd7c1b24f9ed1865095dc4908f (diff) | |
download | nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar.gz nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar.bz2 nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar.lz nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar.xz nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.tar.zst nixlib-f0a0f02b226be1f81bb6181d073ce3c2e59d8ee3.zip |
chromium: 61.0.3163.100 -> 62.0.3202.62
Also updated most of patches according to their state in Gentoo repository, deleted ones that are not applicable anymore.
Diffstat (limited to 'pkgs/applications/networking/browsers')
12 files changed, 306 insertions, 198 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f6f9a829c2d1..63483b4da710 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -133,22 +133,14 @@ let # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - ++ optionals (versionRange "61" "62") [ - ./patches/chromium-gn-bootstrap-r14.patch - ./patches/chromium-gcc-r1.patch - ./patches/chromium-atk-r1.patch - ./patches/chromium-gcc5-r1.patch - ] ++ optionals (versionRange "62" "63") [ ./patches/chromium-gn-bootstrap-r17.patch - ./patches/chromium-gcc5-r2.patch + ./patches/chromium-gcc5-r3.patch ./patches/chromium-glibc2.26-r1.patch ] ++ optionals (versionAtLeast version "63") [ - ./patches/chromium-gn-bootstrap-r19.patch - ./patches/chromium-gcc5-r2.patch - ./patches/chromium-glibc2.26-r1.patch - ./patches/chromium-sysroot-r1.patch + ./patches/chromium-gcc5-r4.patch + ./patches/constexpr-fix.patch ] ++ optional enableWideVine ./patches/widevine.patch; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch deleted file mode 100644 index 602be1e3ba74..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 -+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 -@@ -571,7 +571,7 @@ - // it's best to leave this out rather than break people's builds: - #if defined(ATK_CHECK_VERSION) - #if ATK_CHECK_VERSION(2, 16, 0) -- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); -+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); - #endif - #endif - break; \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch deleted file mode 100644 index 036d57b601da..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h -index 99f230ce7e9a..de2415d402f5 100644 ---- a/base/numerics/safe_math_shared_impl.h -+++ b/base/numerics/safe_math_shared_impl.h -@@ -21,8 +21,7 @@ - #if !defined(__native_client__) && \ - ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -- (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) - #else \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch deleted file mode 100644 index 8d2886fbfa94..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/chrome/browser/devtools/devtools_file_system_indexer.cc -+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc -@@ -34,7 +34,6 @@ using base::TimeDelta; - using base::TimeTicks; - using content::BrowserThread; - using std::map; --using std::set; - using std::string; - using std::vector; - -@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) { - if (trigram != kUndefinedTrigram) - trigrams.push_back(trigram); - } -- set<FileId> file_ids; -+ std::set<FileId> file_ids; - bool first = true; - vector<Trigram>::const_iterator it = trigrams.begin(); - for (; it != trigrams.end(); ++it) { -@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) { - first = false; - continue; - } -- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( -+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( - file_ids, index_[trigram]); - file_ids.swap(intersection); - } -diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -index 94bb9161ec85..e40c6387f72e 100644 ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast<uintptr_t>(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include <math.h> -+#include <cmath> - #include <numeric> - #include <vector> - \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch deleted file mode 100644 index f2be2d5b8aeb..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast<uintptr_t>(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include <math.h> -+#include <cmath> - #include <numeric> - #include <vector> - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch new file mode 100644 index 000000000000..7605df6b145a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { + static base::span<const float> matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span<const float>(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span<const gfx::Rect> shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -284,7 +284,7 @@ + + static base::span<const float> vertex_opacity(const cc::DrawQuad& input) { + const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const cc::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch new file mode 100644 index 000000000000..cb978d58a060 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { + static base::span<const float> matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span<const float>(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span<const gfx::Rect> shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> { + static base::span<const float> vertex_opacity(const viz::DrawQuad& input) { + const viz::TextureDrawQuad* quad = + viz::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const viz::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch deleted file mode 100644 index 624267153669..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 -Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org> -Date: Wed Jul 26 21:51:54 2017 +0000 - - wip - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 1390560f8e37..ff2ae57c46b0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch deleted file mode 100644 index 999fdb7eda76..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/trace_log.cc', - 'base/trace_event/trace_log_constants.cc', - 'base/trace_event/tracing_agent.cc', -- 'base/tracked_objects.cc', - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch deleted file mode 100644 index b5ff0d8cba11..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/chrome/installer/BUILD.gn -+++ b/chrome/installer/BUILD.gn -@@ -3,9 +3,10 @@ - # found in the LICENSE file. - - import("//build/config/chrome_build.gni") -+import("//build/config/sysroot.gni") - - declare_args() { -- enable_linux_installer = is_linux && !is_component_build -+ enable_linux_installer = is_linux && !is_component_build && use_sysroot - } - - # Meta-target that forwards to the installer of the correct type (if any). diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch new file mode 100644 index 000000000000..9f187752ea67 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch @@ -0,0 +1,98 @@ +From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001 +From: Tomas Popela <tomas.popela@gmail.com> +Date: Fri, 20 Oct 2017 14:06:42 +0200 +Subject: [PATCH] Fix the build of base/numerics with GCC + +Initialize the uninitialized variables where the build is failing. + +BUG=776705 + +Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad +--- + base/numerics/checked_math_impl.h | 6 +++--- + base/numerics/clamped_math_impl.h | 10 +++++----- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h +index 2926b37b5e..e083389ebf 100644 +--- a/base/numerics/checked_math_impl.h ++++ b/base/numerics/checked_math_impl.h +@@ -67,7 +67,7 @@ struct CheckedAddOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (IsIntegerArithmeticSafe<Promotion, T, U>::value) { + presult = static_cast<Promotion>(x) + static_cast<Promotion>(y); +@@ -127,7 +127,7 @@ struct CheckedSubOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (IsIntegerArithmeticSafe<Promotion, T, U>::value) { + presult = static_cast<Promotion>(x) - static_cast<Promotion>(y); +@@ -183,7 +183,7 @@ struct CheckedMulOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (CheckedMulFastOp<Promotion, Promotion>::is_supported) { + // The fast op may be available with the promoted type. +diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h +index 7b5e4346f2..303a7e945a 100644 +--- a/base/numerics/clamped_math_impl.h ++++ b/base/numerics/clamped_math_impl.h +@@ -87,7 +87,7 @@ struct ClampedAddOp<T, + "The saturation result cannot be determined from the " + "provided types."); + const V saturated = CommonMaxOrMin<V>(IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedAddOp<T, U>::Do(x, y, &result))) + ? result + : saturated; +@@ -114,7 +114,7 @@ struct ClampedSubOp<T, + "The saturation result cannot be determined from the " + "provided types."); + const V saturated = CommonMaxOrMin<V>(!IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedSubOp<T, U>::Do(x, y, &result))) + ? result + : saturated; +@@ -136,7 +136,7 @@ struct ClampedMulOp<T, + if (ClampedMulFastOp<T, U>::is_supported) + return ClampedMulFastOp<T, U>::template Do<V>(x, y); + +- V result; ++ V result = {}; + const V saturated = + CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y)); + return BASE_NUMERICS_LIKELY((CheckedMulOp<T, U>::Do(x, y, &result))) +@@ -156,7 +156,7 @@ struct ClampedDivOp<T, + using result_type = typename MaxExponentPromotion<T, U>::type; + template <typename V = result_type> + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + if (BASE_NUMERICS_LIKELY((CheckedDivOp<T, U>::Do(x, y, &result)))) + return result; + // Saturation goes to max, min, or NaN (if x is zero). +@@ -176,7 +176,7 @@ struct ClampedModOp<T, + using result_type = typename MaxExponentPromotion<T, U>::type; + template <typename V = result_type> + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedModOp<T, U>::Do(x, y, &result))) + ? result + : x; +-- +2.14.2 + diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index af4c30b431f6..5fe20b9a9818 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0c8qn2i7iygl3kgrdwwd8h3l5j8hg66dw99qgr618cgca1b4im68"; - sha256bin64 = "04mfg18zpx19ha0mrlwx2aabn0vhl08n9c60hazivmw99pzlg8dn"; - version = "62.0.3202.29"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; + version = "62.0.3202.62"; }; dev = { - sha256 = "1zd7rid626fglbyrp7c6517jldhgfk3vjn357vhlhy6pgj1ydrrn"; - sha256bin64 = "0hqb5prf0ags4bnla6skyi5vmkrazhd8n3ri4ijhbqjbb536bfpb"; - version = "63.0.3218.0"; + sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; + sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; + version = "63.0.3239.9"; }; stable = { - sha256 = "06r89jim9cq87668ya8wwk69hh17rl04cj94nb9c28v6mj69cda1"; - sha256bin64 = "1cm9snw29nkzq4bafqgi6fd0gqcc3jp60y6vfsrf9k4dvdard2sv"; - version = "61.0.3163.100"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; + version = "62.0.3202.62"; }; } |