|
|
@ -1,10 +1,33 @@
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.typename chromium-124.0.6367.118/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.typename 2024-05-01 01:46:40.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h 2024-05-05 16:32:57.377654043 +0200
|
|
|
|
|
|
|
|
@@ -26,7 +26,7 @@ PartitionRoot& InternalAllocatorRoot();
|
|
|
|
|
|
|
|
|
|
|
|
fixed error: missing 'typename' prior to dependent type name
|
|
|
|
// A class that meets C++ named requirements, Allocator.
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
|
|
|
-InternalAllocator<T>::value_type* InternalAllocator<T>::allocate(
|
|
|
|
|
|
|
|
+typename InternalAllocator<T>::value_type* InternalAllocator<T>::allocate(
|
|
|
|
|
|
|
|
std::size_t count) {
|
|
|
|
|
|
|
|
PA_CHECK(count <=
|
|
|
|
|
|
|
|
std::numeric_limits<std::size_t>::max() / sizeof(value_type));
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/base/containers/heap_array.h.typename chromium-124.0.6367.118/base/containers/heap_array.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/base/containers/heap_array.h.typename 2024-05-01 01:46:40.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/base/containers/heap_array.h 2024-05-05 16:32:57.377654043 +0200
|
|
|
|
|
|
|
|
@@ -32,8 +32,8 @@ class TRIVIAL_ABI GSL_OWNER HeapArray {
|
|
|
|
|
|
|
|
static_assert(!std::is_reference_v<T>,
|
|
|
|
|
|
|
|
"HeapArray cannot hold reference types");
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/base/containers/map_util.h.typename chromium-122.0.6261.69/base/containers/map_util.h
|
|
|
|
- using iterator = base::span<T>::iterator;
|
|
|
|
--- chromium-122.0.6261.69/base/containers/map_util.h.typename 2024-02-22 22:42:43.000000000 +0100
|
|
|
|
- using const_iterator = base::span<const T>::iterator;
|
|
|
|
+++ chromium-122.0.6261.69/base/containers/map_util.h 2024-02-24 15:05:00.882592705 +0100
|
|
|
|
+ using iterator = typename base::span<T>::iterator;
|
|
|
|
@@ -42,7 +42,7 @@ constexpr internal::MappedType<Map>* Fin
|
|
|
|
+ using const_iterator = typename base::span<const T>::iterator;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Allocates initialized memory capable of holding `size` elements. No memory
|
|
|
|
|
|
|
|
// is allocated for zero-sized arrays.
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/base/containers/map_util.h.typename chromium-124.0.6367.118/base/containers/map_util.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/base/containers/map_util.h.typename 2024-05-01 01:46:40.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/base/containers/map_util.h 2024-05-05 16:36:15.062228596 +0200
|
|
|
|
|
|
|
|
@@ -44,7 +44,7 @@ constexpr internal::MappedType<Map>* Fin
|
|
|
|
template <typename Map,
|
|
|
|
template <typename Map,
|
|
|
|
typename Key,
|
|
|
|
typename Key,
|
|
|
|
typename MappedElementType =
|
|
|
|
typename MappedElementType =
|
|
|
@ -13,7 +36,7 @@ diff -up chromium-122.0.6261.69/base/containers/map_util.h.typename chromium-122
|
|
|
|
constexpr const MappedElementType* FindPtrOrNull(const Map& map,
|
|
|
|
constexpr const MappedElementType* FindPtrOrNull(const Map& map,
|
|
|
|
const Key& key) {
|
|
|
|
const Key& key) {
|
|
|
|
auto it = map.find(key);
|
|
|
|
auto it = map.find(key);
|
|
|
|
@@ -58,7 +58,7 @@ constexpr const MappedElementType* FindP
|
|
|
|
@@ -60,7 +60,7 @@ constexpr const MappedElementType* FindP
|
|
|
|
template <typename Map,
|
|
|
|
template <typename Map,
|
|
|
|
typename Key,
|
|
|
|
typename Key,
|
|
|
|
typename MappedElementType =
|
|
|
|
typename MappedElementType =
|
|
|
@ -21,11 +44,11 @@ diff -up chromium-122.0.6261.69/base/containers/map_util.h.typename chromium-122
|
|
|
|
+ typename 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) {
|
|
|
|
constexpr MappedElementType* FindPtrOrNull(Map& map, const Key& key) {
|
|
|
|
auto it = map.find(key);
|
|
|
|
auto it = map.find(key);
|
|
|
|
return it != map.end() ? std::to_address(it->second) : nullptr;
|
|
|
|
return it != map.end() ? base::to_address(it->second) : nullptr;
|
|
|
|
diff -up chromium-122.0.6261.69/base/functional/bind_internal.h.typename chromium-122.0.6261.69/base/functional/bind_internal.h
|
|
|
|
diff -up chromium-124.0.6367.118/base/functional/bind_internal.h.typename chromium-124.0.6367.118/base/functional/bind_internal.h
|
|
|
|
--- chromium-122.0.6261.69/base/functional/bind_internal.h.typename 2024-02-24 15:05:00.883592724 +0100
|
|
|
|
--- chromium-124.0.6367.118/base/functional/bind_internal.h.typename 2024-05-01 01:46:40.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/base/functional/bind_internal.h 2024-02-24 15:13:49.755223533 +0100
|
|
|
|
+++ chromium-124.0.6367.118/base/functional/bind_internal.h 2024-05-05 16:32:57.375653992 +0200
|
|
|
|
@@ -1400,11 +1400,11 @@ template <int i,
|
|
|
|
@@ -1505,11 +1505,11 @@ template <int i,
|
|
|
|
typename Param>
|
|
|
|
typename Param>
|
|
|
|
struct ParamCanBeBound {
|
|
|
|
struct ParamCanBeBound {
|
|
|
|
private:
|
|
|
|
private:
|
|
|
@ -40,10 +63,36 @@ diff -up chromium-122.0.6261.69/base/functional/bind_internal.h.typename chromiu
|
|
|
|
BindArgument<i>::template BoundAs<Arg>::template StoredAs<Storage>;
|
|
|
|
BindArgument<i>::template BoundAs<Arg>::template StoredAs<Storage>;
|
|
|
|
|
|
|
|
|
|
|
|
template <bool v = !UnwrappedParam::kRawPtr ||
|
|
|
|
template <bool v = !UnwrappedParam::kRawPtr ||
|
|
|
|
diff -up chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_update_service.cc
|
|
|
|
diff -up chromium-124.0.6367.118/base/functional/function_ref.h.typename chromium-124.0.6367.118/base/functional/function_ref.h
|
|
|
|
--- chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2024-02-22 22:42:50.000000000 +0100
|
|
|
|
--- chromium-124.0.6367.118/base/functional/function_ref.h.typename 2024-05-01 01:46:40.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_update_service.cc 2024-02-24 15:05:00.882592705 +0100
|
|
|
|
+++ chromium-124.0.6367.118/base/functional/function_ref.h 2024-05-05 16:32:57.379654093 +0200
|
|
|
|
@@ -90,7 +90,7 @@ ItemSortKey GetSortKey(const Item& item)
|
|
|
|
@@ -64,7 +64,7 @@ class FunctionRef;
|
|
|
|
|
|
|
|
template <typename R, typename... Args>
|
|
|
|
|
|
|
|
class FunctionRef<R(Args...)> {
|
|
|
|
|
|
|
|
template <typename Functor,
|
|
|
|
|
|
|
|
- typename RunType = internal::FunctorTraits<Functor>::RunType>
|
|
|
|
|
|
|
|
+ typename RunType = typename internal::FunctorTraits<Functor>::RunType>
|
|
|
|
|
|
|
|
static constexpr bool kCompatibleFunctor =
|
|
|
|
|
|
|
|
std::convertible_to<internal::ExtractReturnType<RunType>, R> &&
|
|
|
|
|
|
|
|
std::same_as<internal::ExtractArgs<RunType>, internal::TypeList<Args...>>;
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/base/types/fixed_array.h.typename chromium-124.0.6367.118/base/types/fixed_array.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/base/types/fixed_array.h.typename 2024-05-01 01:46:41.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/base/types/fixed_array.h 2024-05-05 16:32:57.378654068 +0200
|
|
|
|
|
|
|
|
@@ -27,8 +27,8 @@ template <typename T,
|
|
|
|
|
|
|
|
class FixedArray : public absl::FixedArray<T, N, A> {
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using absl::FixedArray<T, N, A>::FixedArray;
|
|
|
|
|
|
|
|
- explicit FixedArray(absl::FixedArray<T, N, A>::size_type n,
|
|
|
|
|
|
|
|
- const absl::FixedArray<T, N, A>::allocator_type& a =
|
|
|
|
|
|
|
|
+ explicit FixedArray(typename absl::FixedArray<T, N, A>::size_type n,
|
|
|
|
|
|
|
|
+ const typename absl::FixedArray<T, N, A>::allocator_type& a =
|
|
|
|
|
|
|
|
typename absl::FixedArray<T, N, A>::allocator_type())
|
|
|
|
|
|
|
|
: FixedArray(n, T(), a) {}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-124.0.6367.118/chrome/browser/download/bubble/download_bubble_update_service.cc
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2024-05-01 01:46:45.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/chrome/browser/download/bubble/download_bubble_update_service.cc 2024-05-05 16:32:57.375653992 +0200
|
|
|
|
|
|
|
|
@@ -95,7 +95,7 @@ ItemSortKey GetSortKey(const Item& item)
|
|
|
|
// Helper to get an iterator to the last element in the cache. The cache
|
|
|
|
// Helper to get an iterator to the last element in the cache. The cache
|
|
|
|
// must not be empty.
|
|
|
|
// must not be empty.
|
|
|
|
template <typename Item>
|
|
|
|
template <typename Item>
|
|
|
@ -52,7 +101,7 @@ diff -up chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_u
|
|
|
|
CHECK(!cache.empty());
|
|
|
|
CHECK(!cache.empty());
|
|
|
|
auto it = cache.end();
|
|
|
|
auto it = cache.end();
|
|
|
|
return std::prev(it);
|
|
|
|
return std::prev(it);
|
|
|
|
@@ -1090,9 +1090,9 @@ bool DownloadBubbleUpdateService::CacheM
|
|
|
|
@@ -1179,9 +1179,9 @@ bool DownloadBubbleUpdateService::CacheM
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
template <typename Id, typename Item>
|
|
|
|
template <typename Id, typename Item>
|
|
|
@ -64,183 +113,9 @@ diff -up chromium-122.0.6261.69/chrome/browser/download/bubble/download_bubble_u
|
|
|
|
SortedItems<Item>& cache,
|
|
|
|
SortedItems<Item>& cache,
|
|
|
|
IterMap<Id, Item>& iter_map) {
|
|
|
|
IterMap<Id, Item>& iter_map) {
|
|
|
|
CHECK(iter != cache.end());
|
|
|
|
CHECK(iter != cache.end());
|
|
|
|
diff -up chromium-122.0.6261.69/components/optimization_guide/core/model_execution/model_execution_util.h.typename chromium-122.0.6261.69/components/optimization_guide/core/model_execution/model_execution_util.h
|
|
|
|
diff -up chromium-124.0.6367.118/chrome/browser/web_applications/commands/internal/command_internal.h.typename chromium-124.0.6367.118/chrome/browser/web_applications/commands/internal/command_internal.h
|
|
|
|
--- chromium-122.0.6261.69/components/optimization_guide/core/model_execution/model_execution_util.h.typename 2024-02-22 22:43:01.000000000 +0100
|
|
|
|
--- chromium-124.0.6367.118/chrome/browser/web_applications/commands/internal/command_internal.h.typename 2024-05-01 01:46:48.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/components/optimization_guide/core/model_execution/model_execution_util.h 2024-02-24 15:05:00.884592742 +0100
|
|
|
|
+++ chromium-124.0.6367.118/chrome/browser/web_applications/commands/internal/command_internal.h 2024-05-05 16:32:57.378654068 +0200
|
|
|
|
@@ -25,7 +25,7 @@ void SetExecutionRequestTemplate(
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Request is set by the feature and should always be typed.
|
|
|
|
|
|
|
|
auto typed_request =
|
|
|
|
|
|
|
|
- static_cast<const FeatureType::Request&>(request_metadata);
|
|
|
|
|
|
|
|
+ static_cast<const typename FeatureType::Request&>(request_metadata);
|
|
|
|
|
|
|
|
*(logging_data->mutable_request_data()) = typed_request;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename chromium-122.0.6261.69/components/optimization_guide/core/model_quality/model_quality_log_entry.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename 2024-02-22 22:43:01.000000000 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/components/optimization_guide/core/model_quality/model_quality_log_entry.h 2024-02-24 15:05:00.884592742 +0100
|
|
|
|
|
|
|
|
@@ -29,7 +29,7 @@ class ModelQualityLogEntry {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template <typename FeatureType>
|
|
|
|
|
|
|
|
- FeatureType::Quality* quality_data() {
|
|
|
|
|
|
|
|
+ typename FeatureType::Quality* quality_data() {
|
|
|
|
|
|
|
|
return FeatureType::GetLoggingData(*log_ai_data_request_)
|
|
|
|
|
|
|
|
->mutable_quality_data();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/mojo/public/cpp/bindings/array_traits.h.typename chromium-122.0.6261.69/mojo/public/cpp/bindings/array_traits.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/mojo/public/cpp/bindings/array_traits.h.typename 2024-02-22 22:43:15.000000000 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/mojo/public/cpp/bindings/array_traits.h 2024-02-24 15:05:00.884592742 +0100
|
|
|
|
|
|
|
|
@@ -90,7 +90,7 @@ template <typename Container>
|
|
|
|
|
|
|
|
{ c[i] } -> std::same_as<typename Container::reference>;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ArrayTraits<Container> {
|
|
|
|
|
|
|
|
- using Element = Container::value_type;
|
|
|
|
|
|
|
|
+ using Element = typename Container::value_type;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// vector-like containers have no built-in null.
|
|
|
|
|
|
|
|
static bool IsNull(const Container& c) { return false; }
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename chromium-122.0.6261.69/third_party/blink/renderer/bindings/core/v8/async_iterable.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename 2024-02-22 22:43:20.000000000 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/third_party/blink/renderer/bindings/core/v8/async_iterable.h 2024-02-24 15:05:00.883592724 +0100
|
|
|
|
|
|
|
|
@@ -218,7 +218,7 @@ class PairAsyncIterable {
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
virtual IterationSource* CreateIterationSource(
|
|
|
|
|
|
|
|
ScriptState* script_state,
|
|
|
|
|
|
|
|
- IterationSource::Kind kind,
|
|
|
|
|
|
|
|
+ typename IterationSource::Kind kind,
|
|
|
|
|
|
|
|
ExceptionState& exception_state) = 0;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -260,7 +260,7 @@ class ValueAsyncIterable {
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
virtual IterationSource* CreateIterationSource(
|
|
|
|
|
|
|
|
ScriptState* script_state,
|
|
|
|
|
|
|
|
- IterationSource::Kind kind,
|
|
|
|
|
|
|
|
+ typename IterationSource::Kind kind,
|
|
|
|
|
|
|
|
ExceptionState& exception_state) = 0;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename chromium-122.0.6261.69/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename 2024-02-24 15:05:00.882592705 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2024-02-24 15:12:27.742724849 +0100
|
|
|
|
|
|
|
|
@@ -211,7 +211,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;
|
|
|
|
|
|
|
|
static_assert(std::is_same_v<Char, UChar> || std::is_same_v<Char, LChar>);
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.typename chromium-122.0.6261.69/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.typename 2024-02-22 22:43:21.000000000 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h 2024-02-24 15:05:00.883592724 +0100
|
|
|
|
|
|
|
|
@@ -272,8 +272,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-122.0.6261.69/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.me chromium-122.0.6261.69/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.me 2024-02-24 16:51:41.292310554 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h 2024-02-24 16:52:10.022896063 +0100
|
|
|
|
|
|
|
|
@@ -26,7 +26,7 @@ PartitionRoot& InternalAllocatorRoot();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// A class that meets C++ named requirements, Allocator.
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
|
|
|
-InternalAllocator<T>::value_type* InternalAllocator<T>::allocate(
|
|
|
|
|
|
|
|
+typename InternalAllocator<T>::value_type* InternalAllocator<T>::allocate(
|
|
|
|
|
|
|
|
std::size_t count) {
|
|
|
|
|
|
|
|
PA_CHECK(count <=
|
|
|
|
|
|
|
|
std::numeric_limits<std::size_t>::max() / sizeof(value_type));
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/base/containers/heap_array.h.me chromium-122.0.6261.69/base/containers/heap_array.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/base/containers/heap_array.h.me 2024-02-24 18:02:34.463921568 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/base/containers/heap_array.h 2024-02-24 18:04:01.922850571 +0100
|
|
|
|
|
|
|
|
@@ -32,8 +32,8 @@ class TRIVIAL_ABI GSL_OWNER HeapArray {
|
|
|
|
|
|
|
|
static_assert(!std::is_reference_v<T>,
|
|
|
|
|
|
|
|
"HeapArray cannot hold reference types");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- using iterator = base::span<T>::iterator;
|
|
|
|
|
|
|
|
- using const_iterator = base::span<const T>::iterator;
|
|
|
|
|
|
|
|
+ using iterator = typename base::span<T>::iterator;
|
|
|
|
|
|
|
|
+ using const_iterator = typename base::span<const T>::iterator;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Allocates initialized memory capable of holding `size` elements. No memory
|
|
|
|
|
|
|
|
// is allocated for zero-sized arrays.
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/mojo/public/cpp/bindings/type_converter.h.me chromium-122.0.6261.69/mojo/public/cpp/bindings/type_converter.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/mojo/public/cpp/bindings/type_converter.h.me 2024-02-24 18:51:06.957087464 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/mojo/public/cpp/bindings/type_converter.h 2024-02-24 18:51:27.778488490 +0100
|
|
|
|
|
|
|
|
@@ -125,7 +125,7 @@ using VecValueType = typename Vec::value
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template <typename Vec>
|
|
|
|
|
|
|
|
using VecPtrLikeUnderlyingValueType =
|
|
|
|
|
|
|
|
- std::pointer_traits<VecValueType<Vec>>::element_type;
|
|
|
|
|
|
|
|
+ typename std::pointer_traits<VecValueType<Vec>>::element_type;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace internal
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/third_party/blink/renderer/platform/wtf/hash_table.h.me chromium-122.0.6261.69/third_party/blink/renderer/platform/wtf/hash_table.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/third_party/blink/renderer/platform/wtf/hash_table.h.me 2024-02-24 19:45:13.620934215 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/third_party/blink/renderer/platform/wtf/hash_table.h 2024-02-24 19:46:08.817940962 +0100
|
|
|
|
|
|
|
|
@@ -2005,7 +2005,7 @@ struct HashTableConstIteratorAdapter {
|
|
|
|
|
|
|
|
static_assert(!IsTraceable<typename Traits::TraitType>::value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2057,7 +2057,7 @@ struct HashTableConstIteratorAdapter<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2111,7 +2111,7 @@ struct HashTableIteratorAdapter {
|
|
|
|
|
|
|
|
static_assert(!IsTraceable<typename Traits::TraitType>::value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2159,7 +2159,7 @@ struct HashTableIteratorAdapter<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/base/types/fixed_array.h.me chromium-122.0.6261.69/base/types/fixed_array.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/base/types/fixed_array.h.me 2024-02-25 11:22:59.819590529 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/base/types/fixed_array.h 2024-02-25 11:24:12.424953031 +0100
|
|
|
|
|
|
|
|
@@ -27,8 +27,8 @@ template <typename T,
|
|
|
|
|
|
|
|
class FixedArray : public absl::FixedArray<T, N, A> {
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using absl::FixedArray<T, N, A>::FixedArray;
|
|
|
|
|
|
|
|
- explicit FixedArray(absl::FixedArray<T, N, A>::size_type n,
|
|
|
|
|
|
|
|
- const absl::FixedArray<T, N, A>::allocator_type& a =
|
|
|
|
|
|
|
|
+ explicit FixedArray(typename absl::FixedArray<T, N, A>::size_type n,
|
|
|
|
|
|
|
|
+ const typename absl::FixedArray<T, N, A>::allocator_type& a =
|
|
|
|
|
|
|
|
typename absl::FixedArray<T, N, A>::allocator_type())
|
|
|
|
|
|
|
|
: FixedArray(n, T(), a) {}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/chrome/browser/web_applications/commands/internal/command_internal.h.me chromium-122.0.6261.69/chrome/browser/web_applications/commands/internal/command_internal.h
|
|
|
|
|
|
|
|
--- chromium-122.0.6261.69/chrome/browser/web_applications/commands/internal/command_internal.h.me 2024-02-25 15:04:56.775897713 +0100
|
|
|
|
|
|
|
|
+++ chromium-122.0.6261.69/chrome/browser/web_applications/commands/internal/command_internal.h 2024-02-25 15:05:34.884579279 +0100
|
|
|
|
|
|
|
|
@@ -121,7 +121,7 @@ class CommandBase {
|
|
|
|
@@ -121,7 +121,7 @@ class CommandBase {
|
|
|
|
template <typename LockType>
|
|
|
|
template <typename LockType>
|
|
|
|
class CommandWithLock : public CommandBase {
|
|
|
|
class CommandWithLock : public CommandBase {
|
|
|
@ -250,9 +125,9 @@ diff -up chromium-122.0.6261.69/chrome/browser/web_applications/commands/interna
|
|
|
|
explicit CommandWithLock(const std::string& name,
|
|
|
|
explicit CommandWithLock(const std::string& name,
|
|
|
|
LockDescription initial_lock_request);
|
|
|
|
LockDescription initial_lock_request);
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/chrome/browser/web_applications/commands/web_app_command.h.me chromium-122.0.6261.69/chrome/browser/web_applications/commands/web_app_command.h
|
|
|
|
diff -up chromium-124.0.6367.118/chrome/browser/web_applications/commands/web_app_command.h.typename chromium-124.0.6367.118/chrome/browser/web_applications/commands/web_app_command.h
|
|
|
|
--- chromium-122.0.6261.69/chrome/browser/web_applications/commands/web_app_command.h.me 2024-02-25 15:05:46.885793828 +0100
|
|
|
|
--- chromium-124.0.6367.118/chrome/browser/web_applications/commands/web_app_command.h.typename 2024-05-01 01:46:48.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/chrome/browser/web_applications/commands/web_app_command.h 2024-02-25 15:06:12.334248725 +0100
|
|
|
|
+++ chromium-124.0.6367.118/chrome/browser/web_applications/commands/web_app_command.h 2024-05-05 16:32:57.378654068 +0200
|
|
|
|
@@ -106,7 +106,7 @@ class WebAppLockManager;
|
|
|
|
@@ -106,7 +106,7 @@ class WebAppLockManager;
|
|
|
|
template <typename LockType, typename... CallbackArgs>
|
|
|
|
template <typename LockType, typename... CallbackArgs>
|
|
|
|
class WebAppCommand : public internal::CommandWithLock<LockType> {
|
|
|
|
class WebAppCommand : public internal::CommandWithLock<LockType> {
|
|
|
@ -262,10 +137,10 @@ diff -up chromium-122.0.6261.69/chrome/browser/web_applications/commands/web_app
|
|
|
|
using CallbackType = base::OnceCallback<void(CallbackArgs...)>;
|
|
|
|
using CallbackType = base::OnceCallback<void(CallbackArgs...)>;
|
|
|
|
using ShutdownArgumentsTuple = std::tuple<std::decay_t<CallbackArgs>...>;
|
|
|
|
using ShutdownArgumentsTuple = std::tuple<std::decay_t<CallbackArgs>...>;
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_scheduler.h.me chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_scheduler.h
|
|
|
|
diff -up chromium-124.0.6367.118/chrome/browser/web_applications/web_app_command_scheduler.h.typename chromium-124.0.6367.118/chrome/browser/web_applications/web_app_command_scheduler.h
|
|
|
|
--- chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_scheduler.h.me 2024-02-25 15:06:17.896348149 +0100
|
|
|
|
--- chromium-124.0.6367.118/chrome/browser/web_applications/web_app_command_scheduler.h.typename 2024-05-01 01:46:48.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_scheduler.h 2024-02-25 15:06:58.841076746 +0100
|
|
|
|
+++ chromium-124.0.6367.118/chrome/browser/web_applications/web_app_command_scheduler.h 2024-05-05 16:32:57.379654093 +0200
|
|
|
|
@@ -355,7 +355,7 @@ class WebAppCommandScheduler {
|
|
|
|
@@ -369,7 +369,7 @@ class WebAppCommandScheduler {
|
|
|
|
// command system.
|
|
|
|
// command system.
|
|
|
|
template <typename LockType>
|
|
|
|
template <typename LockType>
|
|
|
|
void ScheduleCallback(const std::string& operation_name,
|
|
|
|
void ScheduleCallback(const std::string& operation_name,
|
|
|
@ -274,7 +149,7 @@ diff -up chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_
|
|
|
|
CallbackCommand<LockType, void> callback,
|
|
|
|
CallbackCommand<LockType, void> callback,
|
|
|
|
base::OnceClosure on_complete,
|
|
|
|
base::OnceClosure on_complete,
|
|
|
|
const base::Location& location = FROM_HERE) {
|
|
|
|
const base::Location& location = FROM_HERE) {
|
|
|
|
@@ -373,7 +373,7 @@ class WebAppCommandScheduler {
|
|
|
|
@@ -387,7 +387,7 @@ class WebAppCommandScheduler {
|
|
|
|
typename CallbackReturnValue = std::decay_t<CompletionCallbackArg>>
|
|
|
|
typename CallbackReturnValue = std::decay_t<CompletionCallbackArg>>
|
|
|
|
void ScheduleCallbackWithResult(
|
|
|
|
void ScheduleCallbackWithResult(
|
|
|
|
const std::string& operation_name,
|
|
|
|
const std::string& operation_name,
|
|
|
@ -283,48 +158,34 @@ diff -up chromium-122.0.6261.69/chrome/browser/web_applications/web_app_command_
|
|
|
|
CallbackCommand<LockType, CallbackReturnValue> callback,
|
|
|
|
CallbackCommand<LockType, CallbackReturnValue> callback,
|
|
|
|
base::OnceCallback<void(CompletionCallbackArg)> on_complete,
|
|
|
|
base::OnceCallback<void(CompletionCallbackArg)> on_complete,
|
|
|
|
CallbackReturnValue arg_for_shutdown,
|
|
|
|
CallbackReturnValue arg_for_shutdown,
|
|
|
|
diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fetcher.h.me chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fetcher.h
|
|
|
|
diff -up chromium-124.0.6367.118/components/optimization_guide/core/model_execution/model_execution_util.h.typename chromium-124.0.6367.118/components/optimization_guide/core/model_execution/model_execution_util.h
|
|
|
|
--- chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fetcher.h.me 2024-02-25 15:12:53.835409392 +0100
|
|
|
|
--- chromium-124.0.6367.118/components/optimization_guide/core/model_execution/model_execution_util.h.typename 2024-05-01 01:46:52.000000000 +0200
|
|
|
|
+++ chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fetcher.h 2024-02-25 15:16:03.171931033 +0100
|
|
|
|
+++ chromium-124.0.6367.118/components/optimization_guide/core/model_execution/model_execution_util.h 2024-05-05 16:32:57.376654018 +0200
|
|
|
|
@@ -424,7 +424,7 @@ class RetryingFetcherImpl final : public
|
|
|
|
@@ -26,7 +26,7 @@ void SetExecutionRequestTemplate(
|
|
|
|
RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
|
|
|
|
|
|
|
|
RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- void Start(ProtoFetcher<Response>::Callback callback) override {
|
|
|
|
// Request is set by the feature and should always be typed.
|
|
|
|
+ void Start(typename ProtoFetcher<Response>::Callback callback) override {
|
|
|
|
auto typed_request =
|
|
|
|
callback_ = std::move(callback);
|
|
|
|
- static_cast<const FeatureType::Request&>(request_metadata);
|
|
|
|
Retry();
|
|
|
|
+ static_cast<const typename FeatureType::Request&>(request_metadata);
|
|
|
|
}
|
|
|
|
*(logging_data->mutable_request_data()) = typed_request;
|
|
|
|
@@ -469,7 +469,7 @@ class RetryingFetcherImpl final : public
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Client callback.
|
|
|
|
|
|
|
|
- TypedProtoFetcher<Response>::Callback callback_;
|
|
|
|
|
|
|
|
+ typename TypedProtoFetcher<Response>::Callback callback_;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Retry controls.
|
|
|
|
|
|
|
|
base::OneShotTimer timer_;
|
|
|
|
|
|
|
|
@@ -490,7 +490,7 @@ class ParallelFetchManager {
|
|
|
|
|
|
|
|
// Deferred fetcher is required because it should be started after it is
|
|
|
|
|
|
|
|
// stored internally.
|
|
|
|
|
|
|
|
using Fetcher = ProtoFetcher<Response>;
|
|
|
|
|
|
|
|
- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
|
|
|
|
|
|
|
+ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
diff -up chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_log_entry.h
|
|
|
|
// Provides fresh instances of a deferred fetcher for each fetch.
|
|
|
|
--- chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename 2024-05-01 01:46:52.000000000 +0200
|
|
|
|
@@ -506,7 +506,7 @@ class ParallelFetchManager {
|
|
|
|
+++ chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_log_entry.h 2024-05-05 16:32:57.376654018 +0200
|
|
|
|
|
|
|
|
@@ -33,7 +33,7 @@ class ModelQualityLogEntry {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Starts the fetch. Underlying fetcher is stored internally, and will be
|
|
|
|
template <typename FeatureType>
|
|
|
|
// cleaned up after finish or when this manager is destroyed.
|
|
|
|
- FeatureType::Quality* quality_data() {
|
|
|
|
- void Fetch(const Request& request, Fetcher::Callback callback) {
|
|
|
|
+ typename FeatureType::Quality* quality_data() {
|
|
|
|
+ void Fetch(const Request& request, typename Fetcher::Callback callback) {
|
|
|
|
return FeatureType::GetLoggingData(*log_ai_data_request_)
|
|
|
|
CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
|
|
|
|
->mutable_quality_data();
|
|
|
|
KeyType key = requests_in_flight_.Add(MakeFetcher(request));
|
|
|
|
}
|
|
|
|
requests_in_flight_.Lookup(key)->Start(
|
|
|
|
diff -up chromium-124.0.6367.118/components/optimization_guide/core/tflite_model_executor.h.typename chromium-124.0.6367.118/components/optimization_guide/core/tflite_model_executor.h
|
|
|
|
--- chromium-123.0.6312.46/components/optimization_guide/core/tflite_model_executor.h.orig 2024-03-13 20:35:44.000000000 +0100
|
|
|
|
--- chromium-124.0.6367.118/components/optimization_guide/core/tflite_model_executor.h.typename 2024-05-01 01:46:52.000000000 +0200
|
|
|
|
+++ chromium-123.0.6312.46/components/optimization_guide/core/tflite_model_executor.h 2024-03-15 15:45:47.067156826 +0100
|
|
|
|
+++ chromium-124.0.6367.118/components/optimization_guide/core/tflite_model_executor.h 2024-05-05 16:32:57.379654093 +0200
|
|
|
|
@@ -242,7 +242,7 @@
|
|
|
|
@@ -242,7 +242,7 @@ class TFLiteModelExecutor : public Model
|
|
|
|
void SendForBatchExecution(
|
|
|
|
void SendForBatchExecution(
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
|
base::TimeTicks start_time,
|
|
|
|
base::TimeTicks start_time,
|
|
|
@ -333,7 +194,7 @@ diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fe
|
|
|
|
override {
|
|
|
|
override {
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
@@ -264,7 +264,7 @@
|
|
|
|
@@ -264,7 +264,7 @@ class TFLiteModelExecutor : public Model
|
|
|
|
// Starts the synchronous execution of the model. Returns model outputs.
|
|
|
|
// Starts the synchronous execution of the model. Returns model outputs.
|
|
|
|
// Model needs to be loaded. Synchronous calls do not load or unload model.
|
|
|
|
// Model needs to be loaded. Synchronous calls do not load or unload model.
|
|
|
|
std::vector<std::optional<OutputType>> SendForBatchExecutionSync(
|
|
|
|
std::vector<std::optional<OutputType>> SendForBatchExecutionSync(
|
|
|
@ -342,7 +203,7 @@ diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fe
|
|
|
|
override {
|
|
|
|
override {
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
@@ -422,7 +422,7 @@
|
|
|
|
@@ -422,7 +422,7 @@ class TFLiteModelExecutor : public Model
|
|
|
|
// executes it on the model execution thread.
|
|
|
|
// executes it on the model execution thread.
|
|
|
|
void LoadModelFileAndBatchExecute(
|
|
|
|
void LoadModelFileAndBatchExecute(
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
@ -351,7 +212,7 @@ diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fe
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -439,7 +439,7 @@
|
|
|
|
@@ -439,7 +439,7 @@ class TFLiteModelExecutor : public Model
|
|
|
|
|
|
|
|
|
|
|
|
// Batch executes the loaded model for inputs.
|
|
|
|
// Batch executes the loaded model for inputs.
|
|
|
|
void BatchExecuteLoadedModel(
|
|
|
|
void BatchExecuteLoadedModel(
|
|
|
@ -360,7 +221,7 @@ diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fe
|
|
|
|
std::vector<std::optional<OutputType>>* outputs) {
|
|
|
|
std::vector<std::optional<OutputType>>* outputs) {
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
@@ -499,7 +499,7 @@
|
|
|
|
@@ -499,7 +499,7 @@ class TFLiteModelExecutor : public Model
|
|
|
|
// Unloads the model if needed.
|
|
|
|
// Unloads the model if needed.
|
|
|
|
void BatchExecuteLoadedModelAndRunCallback(
|
|
|
|
void BatchExecuteLoadedModelAndRunCallback(
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
|
BatchExecutionCallback callback_on_complete,
|
|
|
@ -369,20 +230,93 @@ diff -up chromium-122.0.6261.69/components/supervised_user/core/browser/proto_fe
|
|
|
|
ExecutionStatus execution_status) {
|
|
|
|
ExecutionStatus execution_status) {
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
|
--- chromium-123.0.6312.46/base/functional/function_ref.h.orig 2024-03-15 15:43:32.329786974 +0100
|
|
|
|
diff -up chromium-124.0.6367.118/components/supervised_user/core/browser/proto_fetcher.h.typename chromium-124.0.6367.118/components/supervised_user/core/browser/proto_fetcher.h
|
|
|
|
+++ chromium-123.0.6312.46/base/functional/function_ref.h 2024-03-15 15:46:57.278813500 +0100
|
|
|
|
--- chromium-124.0.6367.118/components/supervised_user/core/browser/proto_fetcher.h.typename 2024-05-01 01:46:54.000000000 +0200
|
|
|
|
@@ -64,7 +64,7 @@
|
|
|
|
+++ chromium-124.0.6367.118/components/supervised_user/core/browser/proto_fetcher.h 2024-05-05 16:32:57.379654093 +0200
|
|
|
|
template <typename R, typename... Args>
|
|
|
|
@@ -424,7 +424,7 @@ class RetryingFetcherImpl final : public
|
|
|
|
class FunctionRef<R(Args...)> {
|
|
|
|
RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
|
|
|
|
template <typename Functor,
|
|
|
|
RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
|
|
|
|
- typename RunType = internal::FunctorTraits<Functor>::RunType>
|
|
|
|
|
|
|
|
+ typename RunType = typename internal::FunctorTraits<Functor>::RunType>
|
|
|
|
- void Start(ProtoFetcher<Response>::Callback callback) override {
|
|
|
|
static constexpr bool kCompatibleFunctor =
|
|
|
|
+ void Start(typename ProtoFetcher<Response>::Callback callback) override {
|
|
|
|
std::convertible_to<internal::ExtractReturnType<RunType>, R> &&
|
|
|
|
callback_ = std::move(callback);
|
|
|
|
std::same_as<internal::ExtractArgs<RunType>, internal::TypeList<Args...>>;
|
|
|
|
Retry();
|
|
|
|
diff -up chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.me chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_property.h
|
|
|
|
}
|
|
|
|
--- chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.me 2024-03-16 22:55:01.387265478 +0100
|
|
|
|
@@ -469,7 +469,7 @@ class RetryingFetcherImpl final : public
|
|
|
|
+++ chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_property.h 2024-03-16 22:55:18.752568310 +0100
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Client callback.
|
|
|
|
|
|
|
|
- TypedProtoFetcher<Response>::Callback callback_;
|
|
|
|
|
|
|
|
+ typename TypedProtoFetcher<Response>::Callback callback_;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Retry controls.
|
|
|
|
|
|
|
|
base::OneShotTimer timer_;
|
|
|
|
|
|
|
|
@@ -490,7 +490,7 @@ class ParallelFetchManager {
|
|
|
|
|
|
|
|
// Deferred fetcher is required because it should be started after it is
|
|
|
|
|
|
|
|
// stored internally.
|
|
|
|
|
|
|
|
using Fetcher = ProtoFetcher<Response>;
|
|
|
|
|
|
|
|
- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
|
|
|
|
|
|
|
+ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
// Provides fresh instances of a deferred fetcher for each fetch.
|
|
|
|
|
|
|
|
@@ -506,7 +506,7 @@ 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) {
|
|
|
|
|
|
|
|
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-124.0.6367.118/mojo/public/cpp/bindings/array_traits.h.typename chromium-124.0.6367.118/mojo/public/cpp/bindings/array_traits.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/mojo/public/cpp/bindings/array_traits.h.typename 2024-05-01 01:46:59.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/mojo/public/cpp/bindings/array_traits.h 2024-05-05 16:32:57.376654018 +0200
|
|
|
|
|
|
|
|
@@ -90,7 +90,7 @@ template <typename Container>
|
|
|
|
|
|
|
|
{ c[i] } -> std::same_as<typename Container::reference>;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ArrayTraits<Container> {
|
|
|
|
|
|
|
|
- using Element = Container::value_type;
|
|
|
|
|
|
|
|
+ using Element = typename Container::value_type;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// vector-like containers have no built-in null.
|
|
|
|
|
|
|
|
static bool IsNull(const Container& c) { return false; }
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/mojo/public/cpp/bindings/type_converter.h.typename chromium-124.0.6367.118/mojo/public/cpp/bindings/type_converter.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/mojo/public/cpp/bindings/type_converter.h.typename 2024-05-01 01:46:59.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/mojo/public/cpp/bindings/type_converter.h 2024-05-05 16:32:57.377654043 +0200
|
|
|
|
|
|
|
|
@@ -127,7 +127,7 @@ using VecValueType = typename Vec::value
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template <typename Vec>
|
|
|
|
|
|
|
|
using VecPtrLikeUnderlyingValueType =
|
|
|
|
|
|
|
|
- std::pointer_traits<VecValueType<Vec>>::element_type;
|
|
|
|
|
|
|
|
+ typename std::pointer_traits<VecValueType<Vec>>::element_type;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace internal
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/async_iterable.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename 2024-05-05 16:32:57.376654018 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/async_iterable.h 2024-05-05 16:39:07.015158335 +0200
|
|
|
|
|
|
|
|
@@ -245,7 +245,7 @@ class PairAsyncIterable {
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
virtual IterationSource* CreateIterationSource(
|
|
|
|
|
|
|
|
ScriptState* script_state,
|
|
|
|
|
|
|
|
- IterationSource::Kind kind,
|
|
|
|
|
|
|
|
+ typename IterationSource::Kind kind,
|
|
|
|
|
|
|
|
InitArgs... args,
|
|
|
|
|
|
|
|
ExceptionState& exception_state) = 0;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
@@ -291,7 +291,7 @@ class ValueAsyncIterable {
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
virtual IterationSource* CreateIterationSource(
|
|
|
|
|
|
|
|
ScriptState* script_state,
|
|
|
|
|
|
|
|
- IterationSource::Kind kind,
|
|
|
|
|
|
|
|
+ typename IterationSource::Kind kind,
|
|
|
|
|
|
|
|
InitArgs... args,
|
|
|
|
|
|
|
|
ExceptionState& exception_state) = 0;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.typename chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_property.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.typename 2024-05-01 01:47:03.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_property.h 2024-05-05 16:32:57.380654118 +0200
|
|
|
|
@@ -173,7 +173,7 @@ class ScriptPromiseProperty final
|
|
|
|
@@ -173,7 +173,7 @@ class ScriptPromiseProperty final
|
|
|
|
template <typename T>
|
|
|
|
template <typename T>
|
|
|
|
requires std::derived_from<T, bindings::EnumerationBase>
|
|
|
|
requires std::derived_from<T, bindings::EnumerationBase>
|
|
|
@ -392,10 +326,10 @@ diff -up chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/scri
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
State state_ = kPending;
|
|
|
|
State state_ = kPending;
|
|
|
|
diff -up chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h.me chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h.typename chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h
|
|
|
|
--- chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h.me 2024-03-16 22:41:50.634510019 +0100
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h.typename 2024-05-01 01:47:03.000000000 +0200
|
|
|
|
+++ chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h 2024-03-16 22:54:51.215088087 +0100
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h 2024-05-05 16:32:57.380654118 +0200
|
|
|
|
@@ -477,7 +477,7 @@ class ScriptPromiseResolverTyped : publi
|
|
|
|
@@ -389,7 +389,7 @@ class ScriptPromiseResolverTyped : publi
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
private:
|
|
|
|
using TypedResolver =
|
|
|
|
using TypedResolver =
|
|
|
@ -404,3 +338,92 @@ diff -up chromium-123.0.6312.46/third_party/blink/renderer/bindings/core/v8/scri
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace blink
|
|
|
|
} // namespace blink
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename chromium-124.0.6367.118/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename 2024-05-01 01:47:04.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2024-05-05 16:32:57.376654018 +0200
|
|
|
|
|
|
|
|
@@ -210,7 +210,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;
|
|
|
|
|
|
|
|
static_assert(std::is_same_v<Char, UChar> || std::is_same_v<Char, LChar>);
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/platform/wtf/hash_table.h.typename chromium-124.0.6367.118/third_party/blink/renderer/platform/wtf/hash_table.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/platform/wtf/hash_table.h.typename 2024-05-01 01:47:05.000000000 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/platform/wtf/hash_table.h 2024-05-05 16:32:57.378654068 +0200
|
|
|
|
|
|
|
|
@@ -2006,7 +2006,7 @@ struct HashTableConstIteratorAdapter {
|
|
|
|
|
|
|
|
static_assert(!IsTraceable<typename Traits::TraitType>::value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2058,7 +2058,7 @@ struct HashTableConstIteratorAdapter<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2112,7 +2112,7 @@ struct HashTableIteratorAdapter {
|
|
|
|
|
|
|
|
static_assert(!IsTraceable<typename Traits::TraitType>::value);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
@@ -2160,7 +2160,7 @@ struct HashTableIteratorAdapter<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
using iterator_category = std::bidirectional_iterator_tag;
|
|
|
|
|
|
|
|
- using value_type = HashTableType::ValueType;
|
|
|
|
|
|
|
|
+ using value_type = typename HashTableType::ValueType;
|
|
|
|
|
|
|
|
using difference_type = ptrdiff_t;
|
|
|
|
|
|
|
|
using pointer = value_type*;
|
|
|
|
|
|
|
|
using reference = value_type&;
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/base/containers/to_vector.h.me chromium-124.0.6367.118/base/containers/to_vector.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/base/containers/to_vector.h.me 2024-05-06 12:39:58.312899455 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/base/containers/to_vector.h 2024-05-06 12:40:22.014635715 +0200
|
|
|
|
|
|
|
|
@@ -30,7 +30,7 @@ template <typename Range, typename Proj
|
|
|
|
|
|
|
|
std::indirectly_unary_invocable<Proj, ranges::iterator_t<Range>>
|
|
|
|
|
|
|
|
auto ToVector(Range&& range, Proj proj = {}) {
|
|
|
|
|
|
|
|
using ProjectedType =
|
|
|
|
|
|
|
|
- std::projected<ranges::iterator_t<Range>, Proj>::value_type;
|
|
|
|
|
|
|
|
+ typename std::projected<ranges::iterator_t<Range>, Proj>::value_type;
|
|
|
|
|
|
|
|
std::vector<ProjectedType> container;
|
|
|
|
|
|
|
|
container.reserve(std::size(range));
|
|
|
|
|
|
|
|
ranges::transform(std::forward<Range>(range), std::back_inserter(container),
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_util.h.me chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_util.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_util.h.me 2024-05-06 20:13:29.067800309 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/components/optimization_guide/core/model_quality/model_quality_util.h 2024-05-06 20:13:44.671084222 +0200
|
|
|
|
|
|
|
|
@@ -19,7 +19,7 @@ proto::ModelExecutionFeature GetModelExe
|
|
|
|
|
|
|
|
// Helper method to get the quality_data from `log_ai_data_request` for
|
|
|
|
|
|
|
|
// different features.
|
|
|
|
|
|
|
|
template <typename FeatureType>
|
|
|
|
|
|
|
|
-FeatureType::Quality* GetModelQualityData(
|
|
|
|
|
|
|
|
+typename FeatureType::Quality* GetModelQualityData(
|
|
|
|
|
|
|
|
proto::LogAiDataRequest* log_ai_data_request) {
|
|
|
|
|
|
|
|
return FeatureType::GetLoggingData(*log_ai_data_request)
|
|
|
|
|
|
|
|
->mutable_quality_data();
|
|
|
|
|
|
|
|
diff -up chromium-124.0.6367.118/third_party/blink/renderer/core/paint/object_paint_properties.h.me chromium-124.0.6367.118/third_party/blink/renderer/core/paint/object_paint_properties.h
|
|
|
|
|
|
|
|
--- chromium-124.0.6367.118/third_party/blink/renderer/core/paint/object_paint_properties.h.me 2024-05-07 08:54:42.099316020 +0200
|
|
|
|
|
|
|
|
+++ chromium-124.0.6367.118/third_party/blink/renderer/core/paint/object_paint_properties.h 2024-05-07 08:57:18.304022672 +0200
|
|
|
|
|
|
|
|
@@ -445,8 +445,8 @@ class CORE_EXPORT ObjectPaintProperties
|
|
|
|
|
|
|
|
PaintPropertyChangeType Update(
|
|
|
|
|
|
|
|
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)) {
|