You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
206 lines
12 KiB
206 lines
12 KiB
--- 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;
|
|
};
|
|
|