automatic version update by autodist [release 83.0.4103.61-1mamba;Wed May 27 2020]
This commit is contained in:
parent
11144b0c5c
commit
f33f68076d
@ -0,0 +1,29 @@
|
|||||||
|
From 2b9d6daa0ab5ce45ec5555466d5a5a583a020ea8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
|
||||||
|
Date: Sat, 18 Apr 2020 00:27:38 +0000
|
||||||
|
Subject: [PATCH] Add missing algorithm header in crx_install_error.cc
|
||||||
|
|
||||||
|
This is needed for the use of std::find.
|
||||||
|
|
||||||
|
Change-Id: I2dc43b3887c467986c5346be5a9e27a987e1e5b3
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152333
|
||||||
|
Reviewed-by: Ken Rockot <rockot@google.com>
|
||||||
|
Commit-Queue: Ken Rockot <rockot@google.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#760272}
|
||||||
|
---
|
||||||
|
extensions/browser/install/crx_install_error.cc | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/extensions/browser/install/crx_install_error.cc b/extensions/browser/install/crx_install_error.cc
|
||||||
|
index a9765bb0a5a..bd0d3e35a16 100644
|
||||||
|
--- a/extensions/browser/install/crx_install_error.cc
|
||||||
|
+++ b/extensions/browser/install/crx_install_error.cc
|
||||||
|
@@ -4,6 +4,8 @@
|
||||||
|
|
||||||
|
#include "extensions/browser/install/crx_install_error.h"
|
||||||
|
|
||||||
|
+#include <algorithm>
|
||||||
|
+
|
||||||
|
#include "base/logging.h"
|
||||||
|
#include "extensions/browser/install/sandboxed_unpacker_failure_reason.h"
|
||||||
|
|
64
chromium-83.0.4103.61-gcc-10.1.0.patch
Normal file
64
chromium-83.0.4103.61-gcc-10.1.0.patch
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
From e473f41284ccc8fa4bc4622d087194b18a1ec23a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Tue, 7 Apr 2020 16:37:10 +0000
|
||||||
|
Subject: [PATCH] GCC: fix includes for gcc-10
|
||||||
|
|
||||||
|
---
|
||||||
|
chrome/browser/search/background/ntp_backgrounds.h | 1 +
|
||||||
|
third_party/webrtc/call/rtx_receive_stream.h | 1 +
|
||||||
|
.../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
|
||||||
|
ui/gfx/linux/drm_util_linux.h | 2 ++
|
||||||
|
5 files changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
|
||||||
|
index 7afc0a2..ea5818e 100644
|
||||||
|
--- a/chrome/browser/search/background/ntp_backgrounds.h
|
||||||
|
+++ b/chrome/browser/search/background/ntp_backgrounds.h
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
#define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
class GURL;
|
||||||
|
|
||||||
|
diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
|
||||||
|
index 8ffa440..113a816 100644
|
||||||
|
--- a/third_party/webrtc/call/rtx_receive_stream.h
|
||||||
|
+++ b/third_party/webrtc/call/rtx_receive_stream.h
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define CALL_RTX_RECEIVE_STREAM_H_
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
+#include <cstdint>
|
||||||
|
|
||||||
|
#include "call/rtp_packet_sink_interface.h"
|
||||||
|
|
||||||
|
diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||||
|
index 22528c9..69e624e 100644
|
||||||
|
--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||||
|
+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
namespace webrtc {
|
||||||
|
|
||||||
|
diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
|
||||||
|
index 86ff2eb..990f12c 100644
|
||||||
|
--- a/ui/gfx/linux/drm_util_linux.h
|
||||||
|
+++ b/ui/gfx/linux/drm_util_linux.h
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
#include "ui/gfx/buffer_types.h"
|
||||||
|
|
||||||
|
+#include <cstdint>
|
||||||
|
+
|
||||||
|
namespace ui {
|
||||||
|
|
||||||
|
int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
62
chromium-83.0.4103.61-libstdc++6-10.1.0.patch
Normal file
62
chromium-83.0.4103.61-libstdc++6-10.1.0.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
From aeef68888d4c00b69facead2b934095a8cd17329 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Mon, 20 Apr 2020 18:21:43 +0000
|
||||||
|
Subject: [PATCH] libstdc++: fix incomplete-type in AXTree for
|
||||||
|
NodeSetSizePosInSetInfo
|
||||||
|
|
||||||
|
has only forward declaration of NodeSetSizePosInSetInfo. Therefore,
|
||||||
|
move declaration from ax_tree.cc.
|
||||||
|
|
||||||
|
std: :unordered_map<T, U> requires U to be fully declared. ax_tree.h
|
||||||
|
Bug: 957519
|
||||||
|
Change-Id: Ic1f4bf3ebfea229ece84251e46d4461b31873868
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132403
|
||||||
|
Reviewed-by: David Tseng <dtseng@chromium.org>
|
||||||
|
Commit-Queue: David Tseng <dtseng@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#760588}
|
||||||
|
---
|
||||||
|
ui/accessibility/ax_tree.cc | 10 ++--------
|
||||||
|
ui/accessibility/ax_tree.h | 9 ++++++++-
|
||||||
|
2 files changed, 10 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
|
||||||
|
index 7b8d9b1b161..e9154028d66 100644
|
||||||
|
--- a/ui/accessibility/ax_tree.cc
|
||||||
|
+++ b/ui/accessibility/ax_tree.cc
|
||||||
|
@@ -567,14 +567,8 @@ struct AXTreeUpdateState {
|
||||||
|
const AXTree& tree;
|
||||||
|
};
|
||||||
|
|
||||||
|
-struct AXTree::NodeSetSizePosInSetInfo {
|
||||||
|
- NodeSetSizePosInSetInfo() = default;
|
||||||
|
- ~NodeSetSizePosInSetInfo() = default;
|
||||||
|
-
|
||||||
|
- int32_t pos_in_set = 0;
|
||||||
|
- int32_t set_size = 0;
|
||||||
|
- base::Optional<int> lowest_hierarchical_level;
|
||||||
|
-};
|
||||||
|
+AXTree::NodeSetSizePosInSetInfo::NodeSetSizePosInSetInfo() = default;
|
||||||
|
+AXTree::NodeSetSizePosInSetInfo::~NodeSetSizePosInSetInfo() = default;
|
||||||
|
|
||||||
|
struct AXTree::OrderedSetContent {
|
||||||
|
explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
|
||||||
|
diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
|
||||||
|
index a51ca8de4c8..8c1c57517ac 100644
|
||||||
|
--- a/ui/accessibility/ax_tree.h
|
||||||
|
+++ b/ui/accessibility/ax_tree.h
|
||||||
|
@@ -328,7 +328,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
|
||||||
|
bool enable_extra_mac_nodes_ = false;
|
||||||
|
|
||||||
|
// Contains pos_in_set and set_size data for an AXNode.
|
||||||
|
- struct NodeSetSizePosInSetInfo;
|
||||||
|
+ struct NodeSetSizePosInSetInfo {
|
||||||
|
+ NodeSetSizePosInSetInfo();
|
||||||
|
+ ~NodeSetSizePosInSetInfo();
|
||||||
|
+
|
||||||
|
+ int32_t pos_in_set = 0;
|
||||||
|
+ int32_t set_size = 0;
|
||||||
|
+ base::Optional<int> lowest_hierarchical_level;
|
||||||
|
+ };
|
||||||
|
|
||||||
|
// Represents the content of an ordered set which includes the ordered set
|
||||||
|
// items and the ordered set container if it exists.
|
@ -0,0 +1,95 @@
|
|||||||
|
From d3cabbc7321d349a9bffda482df5afc0d4df1ac2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Piotr Tworek <ptworek@vewd.com>
|
||||||
|
Date: Thu, 30 Apr 2020 21:33:47 +0000
|
||||||
|
Subject: [PATCH] Make some of blink custom iterators STL compatible.
|
||||||
|
|
||||||
|
Blink has recently started using functions like std::any_of with some of
|
||||||
|
the custom iterators it provides. On Linux this works in the default
|
||||||
|
setup using libcxx, but fails with even the most recent versions of
|
||||||
|
libstdc++. In all cases the error message (text in bug report) complains
|
||||||
|
about lack of matching std::__iterator_category definition.
|
||||||
|
|
||||||
|
From what I understand the error message is basically saying those
|
||||||
|
iterators are not STL compatible due to missing traits as described
|
||||||
|
in https://en.cppreference.com/w/cpp/iterator/iterator_traits. Such
|
||||||
|
traits are provided by custom iterators defined in //base, or //cc.
|
||||||
|
|
||||||
|
This patch adds the necessary traits to iterators that are currently
|
||||||
|
affected by this problem.
|
||||||
|
|
||||||
|
Bug: 1076869
|
||||||
|
Change-Id: I9950a7100c32499ba96647317fa70b87dc22eaf9
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2174199
|
||||||
|
Reviewed-by: Kentaro Hara <haraken@chromium.org>
|
||||||
|
Commit-Queue: Piotr Tworek <ptworek@vewd.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#764426}
|
||||||
|
---
|
||||||
|
.../core/layout/ng/ng_physical_container_fragment.h | 6 ++++++
|
||||||
|
.../blink/renderer/platform/wtf/hash_iterators.h | 12 ++++++++++++
|
||||||
|
third_party/blink/renderer/platform/wtf/hash_table.h | 6 ++++++
|
||||||
|
3 files changed, 24 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
|
||||||
|
index 1256e77c146..8b93107f2fc 100644
|
||||||
|
--- a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
|
||||||
|
+++ b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
|
||||||
|
@@ -38,6 +38,12 @@ class CORE_EXPORT NGPhysicalContainerFragment : public NGPhysicalFragment {
|
||||||
|
STACK_ALLOCATED();
|
||||||
|
|
||||||
|
public:
|
||||||
|
+ using iterator_category = std::bidirectional_iterator_tag;
|
||||||
|
+ using value_type = NGLink;
|
||||||
|
+ using difference_type = ptrdiff_t;
|
||||||
|
+ using pointer = value_type*;
|
||||||
|
+ using reference = value_type&;
|
||||||
|
+
|
||||||
|
ConstIterator(const NGLink* current) : current_(current) {}
|
||||||
|
|
||||||
|
const NGLink& operator*() const { return *PostLayoutOrCurrent(); }
|
||||||
|
diff --git a/third_party/blink/renderer/platform/wtf/hash_iterators.h b/third_party/blink/renderer/platform/wtf/hash_iterators.h
|
||||||
|
index f8e66e6be85..6003d02c509 100644
|
||||||
|
--- a/third_party/blink/renderer/platform/wtf/hash_iterators.h
|
||||||
|
+++ b/third_party/blink/renderer/platform/wtf/hash_iterators.h
|
||||||
|
@@ -53,6 +53,12 @@ struct HashTableConstIteratorAdapter<HashTableType,
|
||||||
|
typedef HashTableConstValuesIterator<HashTableType, KeyType, MappedType>
|
||||||
|
ValuesIterator;
|
||||||
|
|
||||||
|
+ using iterator_category = std::bidirectional_iterator_tag;
|
||||||
|
+ using value_type = HashTableType;
|
||||||
|
+ using difference_type = ptrdiff_t;
|
||||||
|
+ using pointer = value_type*;
|
||||||
|
+ using reference = value_type&;
|
||||||
|
+
|
||||||
|
HashTableConstIteratorAdapter() = default;
|
||||||
|
HashTableConstIteratorAdapter(
|
||||||
|
const typename HashTableType::const_iterator& impl)
|
||||||
|
@@ -94,6 +100,12 @@ struct HashTableIteratorAdapter<HashTableType,
|
||||||
|
typedef HashTableValuesIterator<HashTableType, KeyType, MappedType>
|
||||||
|
ValuesIterator;
|
||||||
|
|
||||||
|
+ using iterator_category = std::bidirectional_iterator_tag;
|
||||||
|
+ using value_type = HashTableType;
|
||||||
|
+ using difference_type = ptrdiff_t;
|
||||||
|
+ using pointer = value_type*;
|
||||||
|
+ using reference = value_type&;
|
||||||
|
+
|
||||||
|
HashTableIteratorAdapter() = default;
|
||||||
|
HashTableIteratorAdapter(const typename HashTableType::iterator& impl)
|
||||||
|
: impl_(impl) {}
|
||||||
|
diff --git a/third_party/blink/renderer/platform/wtf/hash_table.h b/third_party/blink/renderer/platform/wtf/hash_table.h
|
||||||
|
index f596fb5d41e..5a4468d6bd1 100644
|
||||||
|
--- a/third_party/blink/renderer/platform/wtf/hash_table.h
|
||||||
|
+++ b/third_party/blink/renderer/platform/wtf/hash_table.h
|
||||||
|
@@ -2204,6 +2204,12 @@ struct HashTableConstIteratorAdapter {
|
||||||
|
STACK_ALLOCATED();
|
||||||
|
|
||||||
|
public:
|
||||||
|
+ using iterator_category = std::bidirectional_iterator_tag;
|
||||||
|
+ using value_type = HashTableType;
|
||||||
|
+ using difference_type = ptrdiff_t;
|
||||||
|
+ using pointer = value_type*;
|
||||||
|
+ using reference = value_type&;
|
||||||
|
+
|
||||||
|
HashTableConstIteratorAdapter() = default;
|
||||||
|
HashTableConstIteratorAdapter(
|
||||||
|
const typename HashTableType::const_iterator& impl)
|
@ -0,0 +1,32 @@
|
|||||||
|
From 40d994e4aa2e4d5077c1810e4623549618a19c05 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Piotr Tworek <ptworek@vewd.com>
|
||||||
|
Date: Mon, 27 Apr 2020 16:31:46 +0000
|
||||||
|
Subject: [PATCH] Include "memory" header to get the definition of
|
||||||
|
std::unique_ptr.
|
||||||
|
|
||||||
|
Right now the code im the affected fails to build when using libstdc++
|
||||||
|
instead of bundled libcxx. Apparently libcxx pulls the necessary header
|
||||||
|
indirectly.
|
||||||
|
|
||||||
|
Change-Id: Ie5e86f228434ab16d622ae7a912d9ce607258931
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164645
|
||||||
|
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
|
||||||
|
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#762881}
|
||||||
|
---
|
||||||
|
.../blink/renderer/core/html/trust_token_attribute_parsing.h | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h b/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
|
||||||
|
index f5a7ab03892..ef19cfaf680 100644
|
||||||
|
--- a/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
|
||||||
|
+++ b/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
|
||||||
|
@@ -5,6 +5,8 @@
|
||||||
|
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
|
||||||
|
#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
|
||||||
|
|
||||||
|
+#include <memory>
|
||||||
|
+
|
||||||
|
#include "base/optional.h"
|
||||||
|
#include "services/network/public/mojom/trust_tokens.mojom-blink-forward.h"
|
||||||
|
#include "third_party/blink/renderer/core/core_export.h"
|
@ -0,0 +1,10 @@
|
|||||||
|
--- chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc.orig 2020-05-27 09:17:40.101000000 +0200
|
||||||
|
+++ chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc 2020-05-27 09:18:35.953000000 +0200
|
||||||
|
@@ -3,6 +3,7 @@
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
|
||||||
|
+#include <limits>
|
||||||
|
#include "base/logging.h"
|
||||||
|
|
||||||
|
namespace performance_manager {
|
@ -0,0 +1,172 @@
|
|||||||
|
From 3f8dc4b2e5baf77b463334c769af85b79d8c1463 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Frank Tang <ftang@chromium.org>
|
||||||
|
Date: Fri, 3 Apr 2020 23:13:54 -0700
|
||||||
|
Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions
|
||||||
|
|
||||||
|
Needed to land ICU67.1 soon.
|
||||||
|
|
||||||
|
Bug: v8:10393
|
||||||
|
Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
|
||||||
|
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
|
||||||
|
Commit-Queue: Frank Tang <ftang@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#67027}
|
||||||
|
---
|
||||||
|
src/objects/js-number-format.cc | 77 +++++++++++++++++----------------
|
||||||
|
1 file changed, 39 insertions(+), 38 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/objects/js-number-format.cc b/src/objects/js-number-format.cc
|
||||||
|
index ad831c5c36..bcd44031d5 100644
|
||||||
|
--- a/src/objects/js-number-format.cc
|
||||||
|
+++ b/src/objects/js-number-format.cc
|
||||||
|
@@ -1241,44 +1241,33 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
-Maybe<icu::UnicodeString> IcuFormatNumber(
|
||||||
|
+Maybe<bool> IcuFormatNumber(
|
||||||
|
Isolate* isolate,
|
||||||
|
const icu::number::LocalizedNumberFormatter& number_format,
|
||||||
|
- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
|
||||||
|
+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
|
||||||
|
// If it is BigInt, handle it differently.
|
||||||
|
UErrorCode status = U_ZERO_ERROR;
|
||||||
|
- icu::number::FormattedNumber formatted;
|
||||||
|
if (numeric_obj->IsBigInt()) {
|
||||||
|
Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
|
||||||
|
Handle<String> big_int_string;
|
||||||
|
ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
|
||||||
|
BigInt::ToString(isolate, big_int),
|
||||||
|
- Nothing<icu::UnicodeString>());
|
||||||
|
- formatted = number_format.formatDecimal(
|
||||||
|
+ Nothing<bool>());
|
||||||
|
+ *formatted = number_format.formatDecimal(
|
||||||
|
{big_int_string->ToCString().get(), big_int_string->length()}, status);
|
||||||
|
} else {
|
||||||
|
double number = numeric_obj->IsNaN()
|
||||||
|
? std::numeric_limits<double>::quiet_NaN()
|
||||||
|
: numeric_obj->Number();
|
||||||
|
- formatted = number_format.formatDouble(number, status);
|
||||||
|
+ *formatted = number_format.formatDouble(number, status);
|
||||||
|
}
|
||||||
|
if (U_FAILURE(status)) {
|
||||||
|
// This happen because of icu data trimming trim out "unit".
|
||||||
|
// See https://bugs.chromium.org/p/v8/issues/detail?id=8641
|
||||||
|
- THROW_NEW_ERROR_RETURN_VALUE(isolate,
|
||||||
|
- NewTypeError(MessageTemplate::kIcuError),
|
||||||
|
- Nothing<icu::UnicodeString>());
|
||||||
|
- }
|
||||||
|
- if (fp_iter) {
|
||||||
|
- formatted.getAllFieldPositions(*fp_iter, status);
|
||||||
|
- }
|
||||||
|
- icu::UnicodeString result = formatted.toString(status);
|
||||||
|
- if (U_FAILURE(status)) {
|
||||||
|
- THROW_NEW_ERROR_RETURN_VALUE(isolate,
|
||||||
|
- NewTypeError(MessageTemplate::kIcuError),
|
||||||
|
- Nothing<icu::UnicodeString>());
|
||||||
|
+ THROW_NEW_ERROR_RETURN_VALUE(
|
||||||
|
+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
|
||||||
|
}
|
||||||
|
- return Just(result);
|
||||||
|
+ return Just(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
@@ -1289,10 +1278,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
|
||||||
|
Handle<Object> numeric_obj) {
|
||||||
|
DCHECK(numeric_obj->IsNumeric());
|
||||||
|
|
||||||
|
- Maybe<icu::UnicodeString> maybe_format =
|
||||||
|
- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
|
||||||
|
+ icu::number::FormattedNumber formatted;
|
||||||
|
+ Maybe<bool> maybe_format =
|
||||||
|
+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
|
||||||
|
MAYBE_RETURN(maybe_format, Handle<String>());
|
||||||
|
- return Intl::ToString(isolate, maybe_format.FromJust());
|
||||||
|
+ UErrorCode status = U_ZERO_ERROR;
|
||||||
|
+ icu::UnicodeString result = formatted.toString(status);
|
||||||
|
+ if (U_FAILURE(status)) {
|
||||||
|
+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
|
||||||
|
+ }
|
||||||
|
+ return Intl::ToString(isolate, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
@@ -1405,12 +1400,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
|
||||||
|
- icu::FieldPositionIterator* fp_iter,
|
||||||
|
+Maybe<int> ConstructParts(Isolate* isolate,
|
||||||
|
+ icu::number::FormattedNumber* formatted,
|
||||||
|
Handle<JSArray> result, int start_index,
|
||||||
|
Handle<Object> numeric_obj, bool style_is_unit) {
|
||||||
|
+ UErrorCode status = U_ZERO_ERROR;
|
||||||
|
+ icu::UnicodeString formatted_text = formatted->toString(status);
|
||||||
|
+ if (U_FAILURE(status)) {
|
||||||
|
+ THROW_NEW_ERROR_RETURN_VALUE(
|
||||||
|
+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
|
||||||
|
+ }
|
||||||
|
DCHECK(numeric_obj->IsNumeric());
|
||||||
|
- int32_t length = formatted.length();
|
||||||
|
+ int32_t length = formatted_text.length();
|
||||||
|
int index = start_index;
|
||||||
|
if (length == 0) return Just(index);
|
||||||
|
|
||||||
|
@@ -1419,13 +1420,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
|
||||||
|
// other region covers some part of the formatted string. It's possible
|
||||||
|
// there's another field with exactly the same begin and end as this backdrop,
|
||||||
|
// in which case the backdrop's field_id of -1 will give it lower priority.
|
||||||
|
- regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
|
||||||
|
+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
|
||||||
|
|
||||||
|
{
|
||||||
|
- icu::FieldPosition fp;
|
||||||
|
- while (fp_iter->next(fp)) {
|
||||||
|
- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
|
||||||
|
- fp.getEndIndex()));
|
||||||
|
+ icu::ConstrainedFieldPosition cfp;
|
||||||
|
+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
|
||||||
|
+ while (formatted->nextPosition(cfp, status)) {
|
||||||
|
+ regions.push_back(
|
||||||
|
+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1447,7 +1449,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
|
||||||
|
Handle<String> substring;
|
||||||
|
ASSIGN_RETURN_ON_EXCEPTION_VALUE(
|
||||||
|
isolate, substring,
|
||||||
|
- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
|
||||||
|
+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
|
||||||
|
Nothing<int>());
|
||||||
|
Intl::AddElement(isolate, result, index, field_type_string, substring);
|
||||||
|
++index;
|
||||||
|
@@ -1467,20 +1469,19 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
|
||||||
|
number_format->icu_number_formatter().raw();
|
||||||
|
CHECK_NOT_NULL(fmt);
|
||||||
|
|
||||||
|
- icu::FieldPositionIterator fp_iter;
|
||||||
|
- Maybe<icu::UnicodeString> maybe_format =
|
||||||
|
- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
|
||||||
|
+ icu::number::FormattedNumber formatted;
|
||||||
|
+ Maybe<bool> maybe_format =
|
||||||
|
+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
|
||||||
|
MAYBE_RETURN(maybe_format, Handle<JSArray>());
|
||||||
|
-
|
||||||
|
UErrorCode status = U_ZERO_ERROR;
|
||||||
|
+
|
||||||
|
bool style_is_unit =
|
||||||
|
Style::UNIT == StyleFromSkeleton(fmt->toSkeleton(status));
|
||||||
|
CHECK(U_SUCCESS(status));
|
||||||
|
|
||||||
|
Handle<JSArray> result = factory->NewJSArray(0);
|
||||||
|
- Maybe<int> maybe_format_to_parts =
|
||||||
|
- ConstructParts(isolate, maybe_format.FromJust(), &fp_iter, result, 0,
|
||||||
|
- numeric_obj, style_is_unit);
|
||||||
|
+ Maybe<int> maybe_format_to_parts = ConstructParts(
|
||||||
|
+ isolate, &formatted, result, 0, numeric_obj, style_is_unit);
|
||||||
|
MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
|
||||||
|
|
||||||
|
return result;
|
@ -1,6 +1,6 @@
|
|||||||
Name: chromium
|
Name: chromium
|
||||||
Epoch: 3
|
Epoch: 3
|
||||||
Version: 81.0.4044.138
|
Version: 83.0.4103.61
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||||
Group: Graphical Desktop/Applications/Internet
|
Group: Graphical Desktop/Applications/Internet
|
||||||
@ -59,6 +59,13 @@ Patch53: chromium-80.0.3987.106-fix-building-with-system-zlib.patch
|
|||||||
Patch54: chromium-80.0.3987.106-Include-cmath-for-std-pow.patch
|
Patch54: chromium-80.0.3987.106-Include-cmath-for-std-pow.patch
|
||||||
Patch55: chromium-80.0.3987.106-move-RemoteTreeNode-declaration.patch
|
Patch55: chromium-80.0.3987.106-move-RemoteTreeNode-declaration.patch
|
||||||
Patch56: chromium-80.0.3987.122-x86-v8_context_snapsht-pic-error.patch
|
Patch56: chromium-80.0.3987.122-x86-v8_context_snapsht-pic-error.patch
|
||||||
|
Patch57: chromium-83.0.4103.61-add-missing-algorithm-header-in-crx_install_error.cc.patch
|
||||||
|
Patch58: chromium-83.0.4103.61-gcc-10.1.0.patch
|
||||||
|
Patch59: chromium-83.0.4103.61-libstdc++6-10.1.0.patch
|
||||||
|
Patch60: chromium-83.0.4103.61-std-numeric_limits-is-defined-in-limits.patch
|
||||||
|
Patch61: chromium-83.0.4103.61-make-some-of-blink-custom-iterators-STL-compatible.patch
|
||||||
|
Patch62: chromium-83.0.4103.61-nclude-memory-header-to-get-the-definition-of-std-u.patch
|
||||||
|
Patch63: chromium-83.0.4103.61-v8-remove-soon-to-be-removed-getAllFieldPositions.patch
|
||||||
License: BSD
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -174,6 +181,13 @@ Chromium is an open-source browser project that aims to build a safer, faster, a
|
|||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
%patch56 -p1
|
%patch56 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%patch57 -p1
|
||||||
|
%patch58 -p1
|
||||||
|
%patch59 -p1
|
||||||
|
%patch60 -p0
|
||||||
|
%patch61 -p1
|
||||||
|
%patch62 -p1
|
||||||
|
%patch63 -p1 -d v8
|
||||||
|
|
||||||
# Allow building against system libraries in official builds
|
# Allow building against system libraries in official builds
|
||||||
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||||
@ -231,6 +245,7 @@ for l in ${_unwanted_bundled_libs[@]}; do
|
|||||||
find "third_party/${l}" -type f \
|
find "third_party/${l}" -type f \
|
||||||
\! -path "third_party/${l}/chromium/*" \
|
\! -path "third_party/${l}/chromium/*" \
|
||||||
\! -path "third_party/${l}/google/*" \
|
\! -path "third_party/${l}/google/*" \
|
||||||
|
\! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
|
||||||
\! -path 'third_party/yasm/run_yasm.py' \
|
\! -path 'third_party/yasm/run_yasm.py' \
|
||||||
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||||
-delete
|
-delete
|
||||||
@ -447,6 +462,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
|||||||
%{_mandir}/man1/chromium.1*
|
%{_mandir}/man1/chromium.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 27 2020 Automatic Build System <autodist@mambasoft.it> 83.0.4103.61-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Wed May 06 2020 Automatic Build System <autodist@mambasoft.it> 81.0.4044.138-1mamba
|
* Wed May 06 2020 Automatic Build System <autodist@mambasoft.it> 81.0.4044.138-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user