mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-23 09:32:47 +00:00
Merge remote-tracking branch 'origin/rosa2021.1' into rosa2021.15
This commit is contained in:
slava86
commit
4a60588d9f
9 changed files with 281 additions and 160 deletions
6
.abf.yml
6
.abf.yml
|
|
@ -1,7 +1,7 @@
|
|||
sources:
|
||||
chromium-119.0.6045.199.tar.xz: 539783cdd4346898aaade0280945ed631f53c78d
|
||||
chromium-gost-96244d8ca3767690b23324bf63b43d1860b36301.tar.gz: 3f31e6aa53b920755b056549296b9fa77fed0a1e
|
||||
chromium-120.0.6099.71.tar.xz: edcfe1eec21ecfee709a1783199797ca5d7760a2
|
||||
chromium-gost-acea4dd67875ea46a340f6fd2274c631ab132523.tar.gz: 511df3accd6823b50b133a5548670098ae1afddc
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
msspi-3c50c2d33a4bdf4effb01aaeb9ff5d5b67635a18.tar.gz: 36abebc8fd96cdcb5bf8ecd598055586ec434380
|
||||
msspi-061bce0709523afaad3ea4ffa7c0bff96b5592c0.tar.gz: 6b05665ad62c12ff4ef7dc056a95e012221dee5a
|
||||
xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ if they want to use their own API keys.
|
|||
3 files changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/resources/settings/people_page/sync_account_control.html b/chrome/browser/resources/settings/people_page/sync_account_control.html
|
||||
index 3e54b152a5979..ff41b31cb47f5 100644
|
||||
index 3e54b15..ff41b31 100644
|
||||
--- a/chrome/browser/resources/settings/people_page/sync_account_control.html
|
||||
+++ b/chrome/browser/resources/settings/people_page/sync_account_control.html
|
||||
@@ -117,6 +117,7 @@
|
||||
|
|
@ -43,7 +43,7 @@ index 3e54b152a5979..ff41b31cb47f5 100644
|
|||
<div class="cr-row first two-line" id="avatar-row">
|
||||
<div id="avatar-container">
|
||||
diff --git a/chrome/browser/resources/welcome/signin_view.html b/chrome/browser/resources/welcome/signin_view.html
|
||||
index 9311059b41ead..0f697ffb44310 100644
|
||||
index 9311059..0f697ff 100644
|
||||
--- a/chrome/browser/resources/welcome/signin_view.html
|
||||
+++ b/chrome/browser/resources/welcome/signin_view.html
|
||||
@@ -9,6 +9,7 @@
|
||||
|
|
@ -60,10 +60,10 @@ index 9311059b41ead..0f697ffb44310 100644
|
|||
</div>
|
||||
+-->
|
||||
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
index 047e22de8fc4d..430f20a92b1b4 100644
|
||||
index b0b9006..3daf6ef 100644
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
@@ -171,9 +171,7 @@
|
||||
@@ -177,9 +177,7 @@ gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
|
||||
if (profile->IsOffTheRecord() || profile->IsGuestSession())
|
||||
return gfx::ImageSkia();
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ index 047e22de8fc4d..430f20a92b1b4 100644
|
|||
if (!is_sync_feature_enabled) {
|
||||
// This is done regardless of GetAvatarSyncErrorType() because the icon
|
||||
// should reflect that sync-the-feature is off. The error will still be
|
||||
@@ -568,8 +566,7 @@
|
||||
@@ -595,8 +593,7 @@ void ProfileMenuView::BuildSyncInfo() {
|
||||
|
||||
signin::IdentityManager* identity_manager =
|
||||
IdentityManagerFactory::GetForProfile(profile);
|
||||
|
|
@ -84,23 +84,19 @@ index 047e22de8fc4d..430f20a92b1b4 100644
|
|||
// First, check for sync errors. They may exist even if sync-the-feature is
|
||||
// disabled and only sync-the-transport is running.
|
||||
const absl::optional<AvatarSyncErrorType> error =
|
||||
@@ -597,6 +594,7 @@
|
||||
@@ -624,6 +621,7 @@ void ProfileMenuView::BuildSyncInfo() {
|
||||
return;
|
||||
}
|
||||
|
||||
+#if 0
|
||||
// If there's no error and sync-the-feature is disabled, show a sync promo.
|
||||
// For a signed-in user, the promo just opens the "turn on sync" dialog.
|
||||
// For a signed-out user, it prompts for sign-in first.
|
||||
@@ -624,6 +622,7 @@
|
||||
/*show_sync_badge=*/false);
|
||||
#endif
|
||||
}
|
||||
// For a web-only signed-in user in the UNO model, the promo signs the user on
|
||||
@@ -671,6 +669,7 @@ void ProfileMenuView::BuildSyncInfo() {
|
||||
base::BindRepeating(&ProfileMenuView::OnSigninButtonClicked,
|
||||
base::Unretained(this), account_info, button_type),
|
||||
show_sync_badge);
|
||||
+#endif //if 0
|
||||
}
|
||||
|
||||
void ProfileMenuView::BuildFeatureButtons() {
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200
|
||||
+++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
|
||||
@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
|
||||
// Helper to get an iterator to the last element in the cache. The cache
|
||||
// must not be empty.
|
||||
template <typename Item>
|
||||
-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
CHECK(!cache.empty());
|
||||
auto it = cache.end();
|
||||
return std::prev(it);
|
||||
@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
|
||||
}
|
||||
|
||||
template <typename Id, typename Item>
|
||||
-SortedItems<Item>::iterator
|
||||
+typename SortedItems<Item>::iterator
|
||||
DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
|
||||
- SortedItems<Item>::iterator iter,
|
||||
+ typename SortedItems<Item>::iterator iter,
|
||||
SortedItems<Item>& cache,
|
||||
IterMap<Id, Item>& iter_map) {
|
||||
CHECK(iter != cache.end());
|
||||
diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
|
||||
--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
|
||||
+++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
|
||||
@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
|
||||
void SendForBatchExecution(
|
||||
BatchExecutionCallback callback_on_complete,
|
||||
base::TimeTicks start_time,
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
override {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200
|
||||
+++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
|
||||
@@ -169,7 +169,7 @@ class HTMLFastPathParser {
|
||||
using Span = base::span<const Char>;
|
||||
using USpan = base::span<const UChar>;
|
||||
// 32 matches that used by HTMLToken::Attribute.
|
||||
- typedef std::conditional<std::is_same_v<Char, UChar>,
|
||||
+ typedef typename std::conditional<std::is_same_v<Char, UChar>,
|
||||
UCharLiteralBuffer<32>,
|
||||
LCharLiteralBuffer<32>>::type LiteralBufferType;
|
||||
typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
|
||||
--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
|
||||
+++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
|
||||
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
|
||||
void CdmPromiseAdapter::Clear(ClearReason reason) {
|
||||
// Reject all outstanding promises.
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
- for (auto& [promise_id, promise] : promises_) {
|
||||
+ for (auto& [p_i, p_e] : promises_) {
|
||||
+ auto& promise_id = p_i;
|
||||
+ auto& promise = p_e;
|
||||
TRACE_EVENT_NESTABLE_ASYNC_END1(
|
||||
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
|
||||
"status", "cleared");
|
||||
diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
|
||||
--- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200
|
||||
+++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200
|
||||
@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
|
||||
NGGridSizingTree sizing_tree;
|
||||
|
||||
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_tree.CreateSizingData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
const auto& node = Node();
|
||||
grid_items =
|
||||
@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
|
||||
bool* opt_needs_additional_pass) const {
|
||||
DCHECK(sizing_subtree);
|
||||
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_subtree.SubtreeRootData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
const bool is_for_columns = track_direction == kForColumns;
|
||||
const bool has_non_definite_track =
|
||||
@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
|
||||
void NGGridLayoutAlgorithm::ForEachSubgrid(
|
||||
const NGGridSizingSubtree& sizing_subtree,
|
||||
const CallbackFunc& callback_func) const {
|
||||
- auto& [grid_items, layout_data, subtree_size] =
|
||||
- sizing_subtree.SubtreeRootData();
|
||||
+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
|
||||
+ auto& grid_items = g_i;
|
||||
+ auto& layout_data = l_d;
|
||||
+ auto& subtree_size = s_s;
|
||||
|
||||
// If we know this subtree doesn't have nested subgrids we can exit early
|
||||
// instead of iterating over every grid item looking for them.
|
||||
diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||
--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
|
||||
+++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
|
||||
@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
|
||||
return;
|
||||
}
|
||||
|
||||
- auto [document_url, key, callback] = std::move(*request);
|
||||
+ auto [d_u, key, callback] = std::move(*request);
|
||||
+ auto document_url = d_u;
|
||||
|
||||
DCHECK(document_url.is_valid());
|
||||
TRACE_EVENT1("ServiceWorker",
|
||||
205
chromium-120-typename.patch
Normal file
205
chromium-120-typename.patch
Normal file
|
|
@ -0,0 +1,205 @@
|
|||
--- chromium-120.0.6099.56/base/containers/map_util.h.me 2023-12-02 19:00:19.696801563 +0100
|
||||
+++ chromium-120.0.6099.56/base/containers/map_util.h 2023-12-02 19:00:47.049337547 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
template <typename Map,
|
||||
typename Key,
|
||||
typename MappedElementType =
|
||||
- std::pointer_traits<internal::MappedType<Map>>::element_type>
|
||||
+ typename std::pointer_traits<internal::MappedType<Map>>::element_type>
|
||||
constexpr const MappedElementType* FindPtrOrNull(const Map& map,
|
||||
const Key& key) {
|
||||
auto it = map.find(key);
|
||||
@@ -58,7 +58,7 @@
|
||||
template <typename Map,
|
||||
typename Key,
|
||||
typename MappedElementType =
|
||||
- std::pointer_traits<internal::MappedType<Map>>::element_type>
|
||||
+ typename std::pointer_traits<internal::MappedType<Map>>::element_type>
|
||||
constexpr MappedElementType* FindPtrOrNull(Map& map, const Key& key) {
|
||||
auto it = map.find(key);
|
||||
return it != map.end() ? std::to_address(it->second) : nullptr;
|
||||
diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.me chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
--- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.me 2023-06-17 14:50:56.342591702 +0200
|
||||
+++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200
|
||||
@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item)
|
||||
// Helper to get an iterator to the last element in the cache. The cache
|
||||
// must not be empty.
|
||||
template <typename Item>
|
||||
-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
CHECK(!cache.empty());
|
||||
auto it = cache.end();
|
||||
return std::prev(it);
|
||||
@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM
|
||||
}
|
||||
|
||||
template <typename Id, typename Item>
|
||||
-SortedItems<Item>::iterator
|
||||
+typename SortedItems<Item>::iterator
|
||||
DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
|
||||
- SortedItems<Item>::iterator iter,
|
||||
+ typename SortedItems<Item>::iterator iter,
|
||||
SortedItems<Item>& cache,
|
||||
IterMap<Id, Item>& iter_map) {
|
||||
CHECK(iter != cache.end());
|
||||
diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h
|
||||
--- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200
|
||||
+++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200
|
||||
@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model
|
||||
void SendForBatchExecution(
|
||||
BatchExecutionCallback callback_on_complete,
|
||||
base::TimeTicks start_time,
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
override {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
--- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me 2023-06-19 10:03:32.319218678 +0200
|
||||
+++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200
|
||||
@@ -169,7 +169,7 @@ class HTMLFastPathParser {
|
||||
using Span = base::span<const Char>;
|
||||
using USpan = base::span<const UChar>;
|
||||
// 32 matches that used by HTMLToken::Attribute.
|
||||
- typedef std::conditional<std::is_same_v<Char, UChar>,
|
||||
+ typedef typename std::conditional<std::is_same_v<Char, UChar>,
|
||||
UCharLiteralBuffer<32>,
|
||||
LCharLiteralBuffer<32>>::type LiteralBufferType;
|
||||
typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
|
||||
diff -up chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h.me chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h
|
||||
--- chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h.me 2023-08-02 16:18:30.380108125 +0200
|
||||
+++ chromium-116.0.5845.50/content/public/browser/web_ui_browser_interface_broker_registry.h 2023-08-02 16:20:59.660024578 +0200
|
||||
@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfa
|
||||
//
|
||||
// TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
|
||||
template <typename ControllerType>
|
||||
- JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
||||
+ typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
||||
using Traits = JsBridgeTraits<ControllerType>;
|
||||
- using Interface = Traits::Interface;
|
||||
- using JsBridgeBinderInitializer = Traits::BinderInitializer;
|
||||
+ using Interface = typename Traits::Interface;
|
||||
+ using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
|
||||
|
||||
// WebUIController::GetType() requires an instantiated WebUIController
|
||||
// (because it's a virtual method and can't be static). Here we only have
|
||||
diff -up chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
||||
--- chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.me 2023-08-02 20:41:23.984729462 +0200
|
||||
+++ chromium-116.0.5845.50/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h 2023-08-02 20:41:53.737583093 +0200
|
||||
@@ -270,8 +270,8 @@ class CORE_EXPORT ObjectPaintPropertiesS
|
||||
NodeList& nodes,
|
||||
NodeId node_id,
|
||||
const ParentType& parent,
|
||||
- NodeType::State&& state,
|
||||
- const NodeType::AnimationState& animation_state =
|
||||
+ typename NodeType::State&& state,
|
||||
+ const typename NodeType::AnimationState& animation_state =
|
||||
NodeType::AnimationState()) {
|
||||
// First, check if we need to add a new node.
|
||||
if (!nodes.HasField(node_id)) {
|
||||
diff -up chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h
|
||||
--- chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me 2023-09-15 10:22:51.889698402 +0200
|
||||
+++ chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h 2023-09-15 10:28:26.702716224 +0200
|
||||
@@ -234,7 +234,7 @@ class TFLiteModelExecutor : public Model
|
||||
// Starts the synchronous execution of the model. Returns model outputs.
|
||||
// Model needs to be loaded. Synchronous calls do not load or unload model.
|
||||
std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
override {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -389,7 +389,7 @@ class TFLiteModelExecutor : public Model
|
||||
// executes it on the model execution thread.
|
||||
void LoadModelFileAndBatchExecute(
|
||||
BatchExecutionCallback callback_on_complete,
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
|
||||
@@ -406,7 +406,7 @@ class TFLiteModelExecutor : public Model
|
||||
|
||||
// Batch executes the loaded model for inputs.
|
||||
void BatchExecuteLoadedModel(
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
|
||||
std::vector<absl::optional<OutputType>>* outputs) {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -466,7 +466,7 @@ class TFLiteModelExecutor : public Model
|
||||
// Unloads the model if needed.
|
||||
void BatchExecuteLoadedModelAndRunCallback(
|
||||
BatchExecutionCallback callback_on_complete,
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
|
||||
ExecutionStatus execution_status) {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc
|
||||
--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me 2023-09-15 17:20:22.550657586 +0200
|
||||
+++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc 2023-09-15 17:24:11.396716734 +0200
|
||||
@@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public
|
||||
RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
|
||||
RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
|
||||
|
||||
- void Start(ProtoFetcher<Response>::Callback callback) override {
|
||||
+ void Start(typename ProtoFetcher<Response>::Callback callback) override {
|
||||
callback_ = std::move(callback);
|
||||
Retry();
|
||||
}
|
||||
@@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public
|
||||
}
|
||||
|
||||
// Client callback.
|
||||
- ProtoFetcher<Response>::Callback callback_;
|
||||
+ typename ProtoFetcher<Response>::Callback callback_;
|
||||
|
||||
// Retry controls.
|
||||
base::OneShotTimer timer_;
|
||||
@@ -578,7 +578,7 @@ ParallelFetchManager<Request, Response>:
|
||||
template <typename Request, typename Response>
|
||||
void ParallelFetchManager<Request, Response>::Fetch(
|
||||
const Request& request,
|
||||
- Fetcher::Callback callback) {
|
||||
+ typename Fetcher::Callback callback) {
|
||||
CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
|
||||
KeyType key = requests_in_flight_.Add(MakeFetcher(request));
|
||||
requests_in_flight_.Lookup(key)->Start(
|
||||
diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h
|
||||
--- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me 2023-09-15 17:20:56.540460391 +0200
|
||||
+++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h 2023-09-15 17:22:18.246237817 +0200
|
||||
@@ -165,10 +165,10 @@ class ParallelFetchManager {
|
||||
|
||||
// Starts the fetch. Underlying fetcher is stored internally, and will be
|
||||
// cleaned up after finish or when this manager is destroyed.
|
||||
- void Fetch(const Request& request, Fetcher::Callback callback);
|
||||
+ void Fetch(const Request& request, typename Fetcher::Callback callback);
|
||||
|
||||
private:
|
||||
- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
||||
+ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
||||
|
||||
// Remove fetcher under key from requests_in_flight_.
|
||||
void Remove(KeyType key);
|
||||
diff -up chromium-120.0.6099.56/third_party/blink/renderer/bindings/core/v8/async_iterable.h.me chromium-120.0.6099.56/third_party/blink/renderer/bindings/core/v8/async_iterable.h
|
||||
--- chromium-120.0.6099.56/third_party/blink/renderer/bindings/core/v8/async_iterable.h.me 2023-12-04 00:29:35.197209538 +0100
|
||||
+++ chromium-120.0.6099.56/third_party/blink/renderer/bindings/core/v8/async_iterable.h 2023-12-04 00:30:24.436233249 +0100
|
||||
@@ -220,7 +220,7 @@ class PairAsyncIterable {
|
||||
private:
|
||||
virtual IterationSource* CreateIterationSource(
|
||||
ScriptState* script_state,
|
||||
- IterationSource::Kind kind,
|
||||
+ typename IterationSource::Kind kind,
|
||||
ExceptionState& exception_state) = 0;
|
||||
};
|
||||
|
||||
@@ -262,7 +262,7 @@ class ValueAsyncIterable {
|
||||
private:
|
||||
virtual IterationSource* CreateIterationSource(
|
||||
ScriptState* script_state,
|
||||
- IterationSource::Kind kind,
|
||||
+ typename IterationSource::Kind kind,
|
||||
ExceptionState& exception_state) = 0;
|
||||
};
|
||||
|
||||
51
chromium-120-workaround_clang_bug-structured_binding.patch
Normal file
51
chromium-120-workaround_clang_bug-structured_binding.patch
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
diff -up chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
|
||||
--- chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:37.000000000 +0200
|
||||
+++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17 16:53:20.216628557 +0200
|
||||
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
|
||||
void CdmPromiseAdapter::Clear(ClearReason reason) {
|
||||
// Reject all outstanding promises.
|
||||
DCHECK(thread_checker_.CalledOnValidThread());
|
||||
- for (auto& [promise_id, promise] : promises_) {
|
||||
+ for (auto& [p_i, p_e] : promises_) {
|
||||
+ auto& promise_id = p_i;
|
||||
+ auto& promise = p_e;
|
||||
TRACE_EVENT_NESTABLE_ASYNC_END1(
|
||||
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
|
||||
"status", "cleared");
|
||||
diff -up chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||
--- chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me 2023-06-19 08:04:02.287072722 +0200
|
||||
+++ chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc 2023-06-19 08:18:24.576814950 +0200
|
||||
@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
|
||||
return;
|
||||
}
|
||||
|
||||
- auto [document_url, key, callback] = std::move(*request);
|
||||
+ auto [d_u, key, callback] = std::move(*request);
|
||||
+ auto document_url = d_u;
|
||||
|
||||
DCHECK(document_url.is_valid());
|
||||
TRACE_EVENT1("ServiceWorker",
|
||||
diff -up chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
|
||||
--- chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me 2023-12-03 22:17:50.922083200 +0100
|
||||
+++ chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc 2023-12-03 22:22:55.437484343 +0100
|
||||
@@ -3447,7 +3447,8 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
DCHECK(out_row_break_between);
|
||||
|
||||
const auto& container_space = ConstraintSpace();
|
||||
- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
|
||||
+ const auto& [grid_items, l_d, tree_size] = sizing_tree.TreeRootData();
|
||||
+ const auto& layout_data = l_d;
|
||||
|
||||
const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree();
|
||||
const auto container_writing_direction =
|
||||
@@ -3611,7 +3612,9 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
|
||||
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
|
||||
const auto& constraint_space = ConstraintSpace();
|
||||
- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
|
||||
+ const auto& [g_i, l_d, tree_size] = sizing_tree.TreeRootData();
|
||||
+ const auto& grid_items = g_i;
|
||||
+ const auto& layout_data = l_d;
|
||||
|
||||
const auto* cached_layout_subtree = constraint_space.GetGridLayoutSubtree();
|
||||
const auto container_writing_direction =
|
||||
|
|
@ -9,7 +9,8 @@
|
|||
# [8] https://github.com/saiarcot895/chromium-ubuntu-build
|
||||
|
||||
# Get the version number of latest stable version
|
||||
# $ curl -s 'https://omahaproxy.appspot.com/all?os=linux&channel=stable' | sed 1d | cut -d , -f 3
|
||||
# $ curl 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Linux&num=1&offset=0' | jq -r '.[] | .version'
|
||||
# (https://chromiumdash.appspot.com/releases?platform=Linux)
|
||||
%ifarch %{x86_64} %ix86
|
||||
%bcond_without gost
|
||||
%else
|
||||
|
|
@ -55,20 +56,17 @@
|
|||
# GOST patches and sources
|
||||
# Using commit hashes because upstream often puts tags long after making changes
|
||||
# (they wait for builds to finish to make a new "release" with binary packages)
|
||||
%define chromium_gost_commit 96244d8ca3767690b23324bf63b43d1860b36301
|
||||
%define msspi_commit 3c50c2d33a4bdf4effb01aaeb9ff5d5b67635a18
|
||||
%define chromium_gost_commit acea4dd67875ea46a340f6fd2274c631ab132523
|
||||
%define msspi_commit 061bce0709523afaad3ea4ffa7c0bff96b5592c0
|
||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||
|
||||
%define xcb_version 1.14.1
|
||||
|
||||
%if %{mdvver} < 202310
|
||||
|
||||
%bcond_without alternative_llvm
|
||||
%else
|
||||
%bcond_with alternative_llvm
|
||||
%endif
|
||||
|
||||
%if %{with alternative_llvm}
|
||||
%define llvm_ver 17
|
||||
%define llvm_ver 18
|
||||
%define llvm_prefix /opt/llvm%{llvm_ver}
|
||||
%else
|
||||
%define llvm_prefix %{_prefix}
|
||||
|
|
@ -103,7 +101,7 @@
|
|||
|
||||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 119.0.6045.199
|
||||
Version: 120.0.6099.71
|
||||
Release: 1
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
|
|
@ -136,9 +134,9 @@ ExclusiveArch: %{x86_64} aarch64
|
|||
Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_commit}.tar.gz?/chromium-gost-%{chromium_gost_commit}.tar.gz
|
||||
Source1102: https://github.com/deemru/msspi/archive/%{msspi_commit}.tar.gz?/msspi-%{msspi_commit}.tar.gz
|
||||
# workaround for clang bug, https://github.com/llvm/llvm-project/issues/57826
|
||||
Patch0: chromium-117-workaround_clang_bug-structured_binding.patch
|
||||
Patch0: chromium-120-workaround_clang_bug-structured_binding.patch
|
||||
# declare iterators as subtypes
|
||||
Patch1: chromium-115-typename.patch
|
||||
Patch1: chromium-120-typename.patch
|
||||
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
|
||||
# (cjw) fix gn bootstrapping with gcc
|
||||
Patch190: chromium-69-gn-bootstrap.patch
|
||||
|
|
|
|||
|
|
@ -38,15 +38,3 @@ Tests showed that it does not work on AMD and Nvidia (with vaapi-driver-vdpau).
|
|||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// Ignore the non-intel driver blacklist for VaapiVideoDecoder implementations.
|
||||
@@ -801,11 +802,7 @@
|
||||
// Enable VP9 k-SVC decoding with HW decoder for webrtc use case.
|
||||
BASE_FEATURE(kVp9kSVCHWDecoding,
|
||||
"Vp9kSVCHWDecoding",
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
-#else
|
||||
- base::FEATURE_DISABLED_BY_DEFAULT
|
||||
-#endif
|
||||
);
|
||||
|
||||
// Takes a reference on a video frame, keeping it alive during the duration of a
|
||||
|
|
|
|||
4
upd.sh
4
upd.sh
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
# Script to partly automate updating this package
|
||||
# sudo dnf install /usr/bin/rpmbuild /usr/bin/spectool /usr/bin/rpmspec /usr/bin/git /usr/bin/curl /usr/bin/abf
|
||||
# sudo dnf install /usr/bin/spectool /usr/bin/rpmspec /usr/bin/curl /usr/bin/abf /usr/bin/jq
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
|
@ -13,7 +13,7 @@ set -u
|
|||
spec=chromium-browser-stable.spec
|
||||
|
||||
old_version="$(rpmspec -q --srpm --qf '%{version}' "$spec")"
|
||||
latest_version="$(curl -s 'https://omahaproxy.appspot.com/all?os=linux&channel=stable' | sed 1d | cut -d , -f 3)"
|
||||
latest_version="$(curl 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Linux&num=1&offset=0' | jq -r '.[] | .version' | head -n 1)"
|
||||
[ -n "$latest_version" ]
|
||||
if [ "$old_version" = "$latest_version" ]; then
|
||||
echo "No updates"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue