* High CVE-2024-5830: Type Confusion in V8 * High CVE-2024-5831: Use after free in Dawn * High CVE-2024-5832: Use after free in Dawn * High CVE-2024-5833: Type Confusion in V8 * High CVE-2024-5834: Inappropriate implementation in Dawn * High CVE-2024-5835: Heap buffer overflow in Tab Groups * High CVE-2024-5836: Inappropriate Implementation in DevTools * High CVE-2024-5837: Type Confusion in V8 * High CVE-2024-5838: Type Confusion in V8 * Medium CVE-2024-5839: Inappropriate Implementation in Memory Allocator * Medium CVE-2024-5840: Policy Bypass in CORS * Medium CVE-2024-5841: Use after free in V8 * Medium CVE-2024-5842: Use after free in Browser UI * Medium CVE-2024-5843: Inappropriate implementation in Downloads * Medium CVE-2024-5844: Heap buffer overflow in Tab Strip * Medium CVE-2024-5845: Use after free in Audio * Medium CVE-2024-5846: Use after free in PDFium * Medium CVE-2024-5847: Use after free in PDFiumi8e
parent
1f27cca60c
commit
9fb0408b13
GPG Key ID:
D87CBBC16D2E4A72
@ -1,8 +1,8 @@
|
||||
SOURCES/chromium-125.0.6422.141.tar.xz
|
||||
SOURCES/chromium-126.0.6478.55-clean.tar.xz
|
||||
SOURCES/linux-x64-0.19.2.tgz
|
||||
SOURCES/linux-arm64-0.19.2.tgz
|
||||
SOURCES/node-v20.6.1-linux-x64.tar.xz
|
||||
SOURCES/node-v20.6.1-linux-arm64.tar.xz
|
||||
SOURCES/chromium-browser-gost-icons.tar.xz
|
||||
SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz
|
||||
SOURCES/msspi-192d2662e058453313e6f824099ace60ca6fd242.tar.xz
|
||||
SOURCES/Chromium-Gost-6f2a300e93ba8fe663b120b5d17367c95d157e79.tar.xz
|
||||
|
||||
@ -1,134 +0,0 @@
|
||||
diff -up chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py.116 chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py
|
||||
--- chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py.116 2022-07-05 13:31:29.434673638 +0000
|
||||
+++ chromium-103.0.5060.53/third_party/catapult/third_party/six/six.py 2022-07-05 21:52:01.884578748 +0000
|
||||
@@ -29,7 +29,7 @@ import sys
|
||||
import types
|
||||
|
||||
__author__ = "Benjamin Peterson <benjamin@python.org>"
|
||||
-__version__ = "1.15.0"
|
||||
+__version__ = "1.16.0"
|
||||
|
||||
|
||||
# Useful for very coarse version differentiation.
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
|
||||
return None
|
||||
get_source = get_code # same as get_code
|
||||
|
||||
+ def create_module(self, spec):
|
||||
+ return self.load_module(spec.name)
|
||||
+
|
||||
+ def exec_module(self, module):
|
||||
+ pass
|
||||
+
|
||||
_importer = _SixMetaPathImporter(__name__)
|
||||
|
||||
|
||||
diff -up chromium-103.0.5060.53/third_party/six/src/six.py.116 chromium-103.0.5060.53/third_party/six/src/six.py
|
||||
--- chromium-103.0.5060.53/third_party/six/src/six.py.116 2022-07-05 13:32:28.916687658 +0000
|
||||
+++ chromium-103.0.5060.53/third_party/six/src/six.py 2022-07-05 21:59:42.561240407 +0000
|
||||
@@ -29,7 +29,7 @@ import sys
|
||||
import types
|
||||
|
||||
__author__ = "Benjamin Peterson <benjamin@python.org>"
|
||||
-__version__ = "1.14.0"
|
||||
+__version__ = "1.16.0"
|
||||
|
||||
|
||||
# Useful for very coarse version differentiation.
|
||||
@@ -71,6 +71,11 @@ else:
|
||||
MAXSIZE = int((1 << 63) - 1)
|
||||
del X
|
||||
|
||||
+if PY34:
|
||||
+ from importlib.util import spec_from_loader
|
||||
+else:
|
||||
+ spec_from_loader = None
|
||||
+
|
||||
|
||||
def _add_doc(func, doc):
|
||||
"""Add documentation to a function."""
|
||||
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
|
||||
return self
|
||||
return None
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ if fullname in self.known_modules:
|
||||
+ return spec_from_loader(fullname, self)
|
||||
+ return None
|
||||
+
|
||||
def __get_module(self, fullname):
|
||||
try:
|
||||
return self.known_modules[fullname]
|
||||
@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
|
||||
return None
|
||||
get_source = get_code # same as get_code
|
||||
|
||||
+ def create_module(self, spec):
|
||||
+ return self.load_module(spec.name)
|
||||
+
|
||||
+ def exec_module(self, module):
|
||||
+ pass
|
||||
+
|
||||
_importer = _SixMetaPathImporter(__name__)
|
||||
|
||||
|
||||
@@ -890,12 +906,11 @@ def ensure_binary(s, encoding='utf-8', e
|
||||
- `str` -> encoded to `bytes`
|
||||
- `bytes` -> `bytes`
|
||||
"""
|
||||
+ if isinstance(s, binary_type):
|
||||
+ return s
|
||||
if isinstance(s, text_type):
|
||||
return s.encode(encoding, errors)
|
||||
- elif isinstance(s, binary_type):
|
||||
- return s
|
||||
- else:
|
||||
- raise TypeError("not expecting type '%s'" % type(s))
|
||||
+ raise TypeError("not expecting type '%s'" % type(s))
|
||||
|
||||
|
||||
def ensure_str(s, encoding='utf-8', errors='strict'):
|
||||
@@ -909,12 +924,15 @@ def ensure_str(s, encoding='utf-8', erro
|
||||
- `str` -> `str`
|
||||
- `bytes` -> decoded to `str`
|
||||
"""
|
||||
- if not isinstance(s, (text_type, binary_type)):
|
||||
- raise TypeError("not expecting type '%s'" % type(s))
|
||||
+ # Optimization: Fast return for the common case.
|
||||
+ if type(s) is str:
|
||||
+ return s
|
||||
if PY2 and isinstance(s, text_type):
|
||||
- s = s.encode(encoding, errors)
|
||||
+ return s.encode(encoding, errors)
|
||||
elif PY3 and isinstance(s, binary_type):
|
||||
- s = s.decode(encoding, errors)
|
||||
+ return s.decode(encoding, errors)
|
||||
+ elif not isinstance(s, (text_type, binary_type)):
|
||||
+ raise TypeError("not expecting type '%s'" % type(s))
|
||||
return s
|
||||
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
diff -up chromium-105.0.5195.52/build/linux/unbundle/libusb.gn.gnsystem chromium-105.0.5195.52/build/linux/unbundle/libusb.gn
|
||||
--- chromium-105.0.5195.52/build/linux/unbundle/libusb.gn.gnsystem 2022-09-01 12:23:27.557313611 +0000
|
||||
+++ chromium-105.0.5195.52/build/linux/unbundle/libusb.gn 2022-09-01 12:23:27.557313611 +0000
|
||||
@@ -0,0 +1,24 @@
|
||||
+# Copyright 2016 The Chromium Authors. All rights reserved.
|
||||
+# Use of this source code is governed by a BSD-style license that can be
|
||||
+# found in the LICENSE file.
|
||||
+
|
||||
+import("//build/config/linux/pkg_config.gni")
|
||||
+import("//build/shim_headers.gni")
|
||||
+
|
||||
+pkg_config("system_libusb") {
|
||||
+ packages = [ "libusb-1.0" ]
|
||||
+}
|
||||
+
|
||||
+shim_headers("libusb_shim") {
|
||||
+ root_path = "src/libusb"
|
||||
+ headers = [
|
||||
+ "libusb.h",
|
||||
+ ]
|
||||
+}
|
||||
+
|
||||
+source_set("libusb") {
|
||||
+ deps = [
|
||||
+ ":libusb_shim",
|
||||
+ ]
|
||||
+ public_configs = [ ":system_libusb" ]
|
||||
+}
|
||||
diff -up chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py
|
||||
--- chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py.gnsystem 2022-09-01 12:23:27.558313577 +0000
|
||||
+++ chromium-105.0.5195.52/build/linux/unbundle/replace_gn_files.py 2022-09-01 12:36:01.870847125 +0000
|
||||
@@ -52,6 +52,7 @@ REPLACEMENTS = {
|
||||
'libjpeg': 'third_party/libjpeg.gni',
|
||||
'libjxl' : 'third_party/libjxl/BUILD.gn',
|
||||
'libpng': 'third_party/libpng/BUILD.gn',
|
||||
+ 'libusb': 'third_party/libusb/BUILD.gn',
|
||||
'libvpx': 'third_party/libvpx/BUILD.gn',
|
||||
'libwebp': 'third_party/libwebp/BUILD.gn',
|
||||
'libxml': 'third_party/libxml/BUILD.gn',
|
||||
@ -1,36 +0,0 @@
|
||||
diff -up chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c
|
||||
--- chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me 2022-12-24 11:08:03.212333476 +0100
|
||||
+++ chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c 2022-12-24 11:08:18.316606155 +0100
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <signal.h>
|
||||
#include <pthread.h>
|
||||
#include <errno.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h>
|
||||
|
||||
#include "wayland-os.h"
|
||||
#include "wayland-util.h"
|
||||
diff -up chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc
|
||||
--- chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include 2022-06-15 10:52:49.553817031 -0400
|
||||
+++ chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc 2022-06-15 10:56:15.775173013 -0400
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
#if V8_OS_LINUX
|
||||
#include <sys/prctl.h> // for prctl
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#endif
|
||||
|
||||
#if defined(V8_OS_FUCHSIA)
|
||||
diff -up iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c
|
||||
--- iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me 2022-12-08 21:59:43.502200984 +0100
|
||||
+++ iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c 2022-12-08 22:13:53.375653343 +0100
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h> // for F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
@ -1,47 +0,0 @@
|
||||
diff -up chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c
|
||||
--- chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me 2022-12-24 11:08:03.212333476 +0100
|
||||
+++ chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c 2022-12-24 11:08:18.316606155 +0100
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <signal.h>
|
||||
#include <pthread.h>
|
||||
#include <errno.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h>
|
||||
|
||||
#include "wayland-os.h"
|
||||
#include "wayland-util.h"
|
||||
diff -up chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc
|
||||
--- chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include 2022-06-15 10:52:49.553817031 -0400
|
||||
+++ chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc 2022-06-15 10:56:15.775173013 -0400
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
#if V8_OS_LINUX
|
||||
#include <sys/prctl.h> // for prctl
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#endif
|
||||
|
||||
#if defined(V8_OS_FUCHSIA)
|
||||
diff -up iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c
|
||||
--- iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me 2022-12-08 21:59:43.502200984 +0100
|
||||
+++ iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c 2022-12-08 22:13:53.375653343 +0100
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h> // for F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
diff -up chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
|
||||
--- chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me 2023-08-17 06:32:32.484538849 +0200
|
||||
+++ chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc 2023-08-17 07:02:01.965168328 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.h"
|
||||
|
||||
#include <sys/mman.h>
|
||||
+#include <linux/memfd.h>
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
@ -1,46 +0,0 @@
|
||||
diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
|
||||
--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me 2023-06-25 10:06:58.445990069 +0200
|
||||
+++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc 2023-06-25 10:51:17.640818231 +0200
|
||||
@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
|
||||
"'version' field of type string");
|
||||
}
|
||||
|
||||
- brands.emplace_back(*brand, *version);
|
||||
+ brands.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.brands = std::move(brands);
|
||||
@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
|
||||
"a 'version' field of type string");
|
||||
}
|
||||
|
||||
- full_version_list.emplace_back(*brand, *version);
|
||||
+ full_version_list.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.full_version_list = std::move(full_version_list);
|
||||
diff -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc
|
||||
--- chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me 2023-08-15 21:34:58.922855428 +0200
|
||||
+++ chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-15 21:39:23.310434237 +0200
|
||||
@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen
|
||||
|
||||
while (rule_iterator && rule_iterator->HasNext()) {
|
||||
auto rule = rule_iterator->Next();
|
||||
- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
|
||||
- rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {setting_type, rule->primary_pattern,
|
||||
+ rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
setting_type,
|
||||
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
|
||||
@@ -302,8 +302,8 @@ void OneTimePermissionProvider::DeleteEn
|
||||
auto rule = rule_iterator->Next();
|
||||
if (rule->primary_pattern.Matches(origin_gurl) &&
|
||||
rule->secondary_pattern.Matches(origin_gurl)) {
|
||||
- patterns_to_delete.emplace_back(
|
||||
- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {
|
||||
+ content_setting_type, rule->primary_pattern, rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
content_setting_type, trigger_event);
|
||||
}
|
||||
@ -1,364 +0,0 @@
|
||||
diff -up chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me chromium-116.0.5845.50/net/dns/host_resolver_cache.cc
|
||||
--- chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me
|
||||
+++ chromium-116.0.5845.50/net/dns/host_resolver_cache.cc
|
||||
@@ -161,7 +161,7 @@ void HostResolverCache::Set(
|
||||
|
||||
std::string domain_name = result->domain_name();
|
||||
entries_.emplace(
|
||||
- Key(std::move(domain_name), network_anonymization_key),
|
||||
+ Key{std::move(domain_name), network_anonymization_key},
|
||||
Entry(std::move(result), source, secure, staleness_generation_));
|
||||
|
||||
if (entries_.size() > max_entries_) {
|
||||
diff -up chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
--- chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me 2023-08-02 15:17:52.613858423 +0200
|
||||
+++ chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc 2023-08-02 15:18:43.269790877 +0200
|
||||
@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut
|
||||
|
||||
// Issue readbacks from the surfaces:
|
||||
for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
|
||||
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
|
||||
+ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
|
||||
SkImageInfo dst_info = SkImageInfo::Make(
|
||||
size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
|
||||
kUnpremul_SkAlphaType);
|
||||
diff -up chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
--- chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me 2023-08-02 21:32:14.195705494 +0200
|
||||
+++ chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc 2023-08-02 21:59:08.156532934 +0200
|
||||
@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride>
|
||||
color_interpolation_space, hue_interpolation_method, start_color,
|
||||
end_color, percentage, alpha_multiplier);
|
||||
|
||||
- FontPalette::FontPaletteOverride result_color_record(i, result_color);
|
||||
+ FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
|
||||
result_color_records.push_back(result_color_record);
|
||||
}
|
||||
return result_color_records;
|
||||
diff -up chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h
|
||||
--- chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me 2023-08-03 08:27:11.371750178 +0200
|
||||
+++ chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h 2023-08-03 10:39:07.266989323 +0200
|
||||
@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::
|
||||
zcr_color_manager_v1_chromaticity_names,
|
||||
PrimaryVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::BT470M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::XYZ_D50,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST431_2,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::FILM,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}});
|
||||
|
||||
// A map from the zcr_color_manager_v1 eotf_names enum values
|
||||
// representing well-known EOTFs, to their equivalent TransferIDs.
|
||||
@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixe
|
||||
zcr_color_manager_v1_eotf_names,
|
||||
TransferVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT709,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
// This is ever so slightly inaccurate. The number ought to be
|
||||
// 2.19921875f, not 2.2
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::HLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::HLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::IEC61966_2_4,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}},
|
||||
});
|
||||
|
||||
// A map from the SDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixe
|
||||
constexpr auto kTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kRec709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferFnVersion(gamma24, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{gamma24, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kA98RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
});
|
||||
|
||||
// A map from the HDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -194,68 +194,68 @@ constexpr auto kTransferMap =
|
||||
constexpr auto kHDRTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferFnVersion(SkNamedTransferFn::kHLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kHLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGBExtended1023Over510,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 matrix_names enum values to
|
||||
// gfx::ColorSpace::MatrixIDs.
|
||||
constexpr auto kMatrixMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT709,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG,
|
||||
- MatrixVersion(
|
||||
+ MatrixVersion{
|
||||
gfx::ColorSpace::MatrixID::BT470BG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::GBR,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 range_names enum values to
|
||||
// gfx::ColorSpace::RangeIDs.
|
||||
constexpr auto kRangeMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
|
||||
- kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::DERIVED,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity(
|
||||
gfx::ColorSpace::PrimaryID primaryID,
|
||||
diff -up chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
--- chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me 2023-08-03 13:23:33.748394615 +0200
|
||||
+++ chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc 2023-08-03 13:25:01.140489840 +0200
|
||||
@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocomplete
|
||||
alternative_nav_match);
|
||||
|
||||
// Store the details necessary to open the omnibox match via browser commands.
|
||||
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
|
||||
+ location_bar_->set_navigation_params(LocationBar::NavigationParams{
|
||||
destination_url, disposition, transition, match_selection_timestamp,
|
||||
destination_url_entered_without_scheme,
|
||||
- destination_url_entered_with_http_scheme));
|
||||
+ destination_url_entered_with_http_scheme});
|
||||
|
||||
if (browser_) {
|
||||
auto navigation = chrome::OpenCurrentURL(browser_);
|
||||
@ -1,79 +0,0 @@
|
||||
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)) {
|
||||
@ -1,109 +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",
|
||||
diff -up chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
|
||||
--- chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-09-15 13:03:00.787257048 +0200
|
||||
+++ chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-09-15 13:15:05.502706522 +0200
|
||||
@@ -3437,7 +3437,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
|
||||
DCHECK(out_row_break_between);
|
||||
|
||||
const auto& container_space = ConstraintSpace();
|
||||
- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
|
||||
+ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData();
|
||||
+ const auto& grid_items = g_i;
|
||||
+ const auto& layout_data = l_d;
|
||||
+ const auto& tree_size = t_s;
|
||||
|
||||
const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
|
||||
const auto container_writing_direction =
|
||||
@@ -3601,7 +3604,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
|
||||
|
||||
// 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, t_s] = sizing_tree.TreeRootData();
|
||||
+ const auto& grid_items = g_i;
|
||||
+ const auto& layout_data = l_d;
|
||||
+ const auto& tree_size =t_s;
|
||||
|
||||
const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
|
||||
const auto container_writing_direction =
|
||||
diff -up chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
||||
--- chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me 2023-09-15 18:24:18.984133783 +0200
|
||||
+++ chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc 2023-09-15 18:28:50.420833595 +0200
|
||||
@@ -1100,7 +1100,8 @@ void ChromeAutofillClient::PropagateAuto
|
||||
&renderer_form);
|
||||
}
|
||||
|
||||
- for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
|
||||
+ for (const auto& [f_t, frame_forms] : renderer_forms_by_frame) {
|
||||
+ auto& frame_token = f_t;
|
||||
// Attempt to find the RFH with this `frame_token`.
|
||||
content::RenderFrameHost* rfh = nullptr;
|
||||
GetWebContents().ForEachRenderFrameHost(
|
||||
@ -1,703 +0,0 @@
|
||||
diff -up chromium-119.0.6045.59/base/trace_event/trace_log.cc.no_matching_constructor chromium-119.0.6045.59/base/trace_event/trace_log.cc
|
||||
--- chromium-119.0.6045.59/base/trace_event/trace_log.cc.no_matching_constructor 2023-10-26 18:16:51.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/base/trace_event/trace_log.cc 2023-10-30 16:51:02.270151487 +0100
|
||||
@@ -2191,8 +2191,8 @@ void TraceLog::SetTraceBufferForTesting(
|
||||
#if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
|
||||
void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
|
||||
AutoLock lock(track_event_lock_);
|
||||
- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
|
||||
- args.backend_type);
|
||||
+ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config,
|
||||
+ args.backend_type};
|
||||
}
|
||||
|
||||
void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/content_settings/one_time_permission_provider.cc.no_matching_constructor chromium-119.0.6045.59/chrome/browser/content_settings/one_time_permission_provider.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/content_settings/one_time_permission_provider.cc.no_matching_constructor 2023-10-26 18:16:57.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/chrome/browser/content_settings/one_time_permission_provider.cc 2023-10-30 16:51:02.269151462 +0100
|
||||
@@ -226,8 +226,8 @@ void OneTimePermissionProvider::OnSuspen
|
||||
|
||||
while (rule_iterator && rule_iterator->HasNext()) {
|
||||
auto rule = rule_iterator->Next();
|
||||
- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
|
||||
- rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {setting_type, rule->primary_pattern,
|
||||
+ rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
setting_type,
|
||||
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
|
||||
@@ -329,8 +329,8 @@ void OneTimePermissionProvider::DeleteEn
|
||||
auto rule = rule_iterator->Next();
|
||||
if (rule->primary_pattern.Matches(origin_gurl) &&
|
||||
rule->secondary_pattern.Matches(origin_gurl)) {
|
||||
- patterns_to_delete.emplace_back(
|
||||
- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {
|
||||
+ content_setting_type, rule->primary_pattern, rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
content_setting_type, trigger_event);
|
||||
}
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.no_matching_constructor chromium-119.0.6045.59/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.no_matching_constructor 2023-10-26 18:16:57.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc 2023-10-30 16:51:02.267151412 +0100
|
||||
@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
|
||||
// TODO(crbug.com/1445072): Add actual domains with attribute names.
|
||||
profile_attributes->insert(std::make_pair(
|
||||
"supported.test",
|
||||
- SAMLProfileAttributes("placeholderName", "placeholderDomain",
|
||||
- "placeholderToken")));
|
||||
+ SAMLProfileAttributes{"placeholderName", "placeholderDomain",
|
||||
+ "placeholderToken"}));
|
||||
|
||||
// Extract domains and attributes from the command line switch.
|
||||
const base::CommandLine& command_line =
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.no_matching_constructor chromium-119.0.6045.59/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.no_matching_constructor 2023-10-26 18:17:00.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/chrome/browser/ui/omnibox/chrome_omnibox_client.cc 2023-10-30 16:51:02.262151288 +0100
|
||||
@@ -474,10 +474,10 @@ void ChromeOmniboxClient::OnAutocomplete
|
||||
alternative_nav_match);
|
||||
|
||||
// Store the details necessary to open the omnibox match via browser commands.
|
||||
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
|
||||
+ location_bar_->set_navigation_params(LocationBar::NavigationParams{
|
||||
destination_url, disposition, transition, match_selection_timestamp,
|
||||
destination_url_entered_without_scheme,
|
||||
- destination_url_entered_with_http_scheme));
|
||||
+ destination_url_entered_with_http_scheme});
|
||||
|
||||
if (browser_) {
|
||||
auto navigation = chrome::OpenCurrentURL(browser_);
|
||||
diff -up chromium-119.0.6045.59/chrome/test/chromedriver/capabilities.cc.no_matching_constructor chromium-119.0.6045.59/chrome/test/chromedriver/capabilities.cc
|
||||
--- chromium-119.0.6045.59/chrome/test/chromedriver/capabilities.cc.no_matching_constructor 2023-10-26 18:17:01.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/chrome/test/chromedriver/capabilities.cc 2023-10-30 16:51:02.268151437 +0100
|
||||
@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base::
|
||||
"'version' field of type string");
|
||||
}
|
||||
|
||||
- brands.emplace_back(*brand, *version);
|
||||
+ brands.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.brands = std::move(brands);
|
||||
@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base::
|
||||
"a 'version' field of type string");
|
||||
}
|
||||
|
||||
- full_version_list.emplace_back(*brand, *version);
|
||||
+ full_version_list.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.full_version_list = std::move(full_version_list);
|
||||
diff -up chromium-119.0.6045.59/components/autofill/core/browser/contact_info_sync_util.cc.no_matching_constructor chromium-119.0.6045.59/components/autofill/core/browser/contact_info_sync_util.cc
|
||||
--- chromium-119.0.6045.59/components/autofill/core/browser/contact_info_sync_util.cc.no_matching_constructor 2023-10-30 16:51:02.273151562 +0100
|
||||
+++ chromium-119.0.6045.59/components/autofill/core/browser/contact_info_sync_util.cc 2023-10-30 17:41:12.685887538 +0100
|
||||
@@ -195,9 +195,9 @@ class ContactInfoProfileSetter {
|
||||
CHECK(observations.empty());
|
||||
for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation :
|
||||
metadata.observations()) {
|
||||
- observations.emplace_back(proto_observation.type(),
|
||||
+ observations.emplace_back() = {static_cast<unsigned char>(proto_observation.type()),
|
||||
ProfileTokenQuality::FormSignatureHash(
|
||||
- proto_observation.form_hash()));
|
||||
+ proto_observation.form_hash())};
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up chromium-119.0.6045.59/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.no_matching_constructor chromium-119.0.6045.59/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
--- chromium-119.0.6045.59/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.no_matching_constructor 2023-10-26 18:17:12.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc 2023-10-30 16:51:02.260151238 +0100
|
||||
@@ -1530,7 +1530,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut
|
||||
|
||||
// Issue readbacks from the surfaces:
|
||||
for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
|
||||
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
|
||||
+ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
|
||||
SkImageInfo dst_info = SkImageInfo::Make(
|
||||
size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
|
||||
kUnpremul_SkAlphaType);
|
||||
diff -up chromium-119.0.6045.59/content/browser/download/save_package.cc.no_matching_constructor chromium-119.0.6045.59/content/browser/download/save_package.cc
|
||||
--- chromium-119.0.6045.59/content/browser/download/save_package.cc.no_matching_constructor 2023-10-26 18:17:12.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/content/browser/download/save_package.cc 2023-10-30 16:51:02.271151512 +0100
|
||||
@@ -769,8 +769,8 @@ void SavePackage::Finish() {
|
||||
if (download_) {
|
||||
std::vector<download::DownloadSaveItemData::ItemInfo> files;
|
||||
for (auto& item : saved_success_items_) {
|
||||
- files.emplace_back(item.second->full_path(), item.second->url(),
|
||||
- item.second->referrer().url);
|
||||
+ files.emplace_back() = {item.second->full_path(), item.second->url(),
|
||||
+ item.second->referrer().url};
|
||||
}
|
||||
download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
|
||||
}
|
||||
diff -up chromium-119.0.6045.59/content/browser/renderer_host/render_frame_host_impl.cc.no_matching_constructor chromium-119.0.6045.59/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- chromium-119.0.6045.59/content/browser/renderer_host/render_frame_host_impl.cc.no_matching_constructor 2023-10-26 18:17:12.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/content/browser/renderer_host/render_frame_host_impl.cc 2023-10-30 17:38:09.351389984 +0100
|
||||
@@ -8567,7 +8567,7 @@ void RenderFrameHostImpl::SendFencedFram
|
||||
for (const blink::FencedFrame::ReportingDestination& destination :
|
||||
destinations) {
|
||||
SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationEnumEvent(event_type, event_data), destination,
|
||||
+ DestinationEnumEvent{event_type, event_data}, destination,
|
||||
/*from_renderer=*/true, attribution_reporting_runtime_features,
|
||||
GetFrameTreeNodeId());
|
||||
}
|
||||
@@ -8603,7 +8603,7 @@ void RenderFrameHostImpl::SendFencedFram
|
||||
}
|
||||
|
||||
SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationURLEvent(destination_url),
|
||||
+ DestinationURLEvent{destination_url},
|
||||
blink::FencedFrame::ReportingDestination::kBuyer,
|
||||
/*from_renderer=*/true, attribution_reporting_runtime_features,
|
||||
GetFrameTreeNodeId());
|
||||
@@ -8703,8 +8703,8 @@ void RenderFrameHostImpl::MaybeSendFence
|
||||
data = info->data;
|
||||
}
|
||||
initiator_rfh->SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
|
||||
- data),
|
||||
+ DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType,
|
||||
+ data},
|
||||
destination,
|
||||
/*from_renderer=*/false, attribution_reporting_features,
|
||||
GetFrameTreeNodeId(), navigation_request.GetNavigationId());
|
||||
@@ -8717,8 +8717,8 @@ void RenderFrameHostImpl::MaybeSendFence
|
||||
for (blink::FencedFrame::ReportingDestination destination :
|
||||
info->destinations) {
|
||||
initiator_rfh->SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
|
||||
- info->data),
|
||||
+ DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType,
|
||||
+ info->data},
|
||||
destination,
|
||||
/*from_renderer=*/false, info->attribution_reporting_runtime_features,
|
||||
GetFrameTreeNodeId(), navigation_request.GetNavigationId());
|
||||
diff -up chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/font_palette.h.no_matching_constructor chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/font_palette.h
|
||||
--- chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/font_palette.h.no_matching_constructor 2023-10-26 18:17:24.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/font_palette.h 2023-10-30 16:51:02.262151288 +0100
|
||||
@@ -96,7 +96,7 @@ class PLATFORM_EXPORT FontPalette : publ
|
||||
Color::ColorSpace color_interpolation_space,
|
||||
absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
|
||||
return base::AdoptRef(new FontPalette(
|
||||
- start, end, NonNormalizedPercentages(start_percentage, end_percentage),
|
||||
+ start, end, NonNormalizedPercentages{start_percentage, end_percentage},
|
||||
normalized_percentage, alpha_multiplier, color_interpolation_space,
|
||||
hue_interpolation_method));
|
||||
}
|
||||
@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontPalette : publ
|
||||
double normalized_percentage) {
|
||||
double end_percentage = normalized_percentage * 100.0;
|
||||
double start_percentage = 100.0 - end_percentage;
|
||||
- return NonNormalizedPercentages(start_percentage, end_percentage);
|
||||
+ return NonNormalizedPercentages{start_percentage, end_percentage};
|
||||
}
|
||||
|
||||
double GetAlphaMultiplier() const {
|
||||
diff -up chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.no_matching_constructor chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
--- chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.no_matching_constructor 2023-10-26 18:17:24.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/third_party/blink/renderer/platform/fonts/palette_interpolation.cc 2023-10-30 16:51:02.261151263 +0100
|
||||
@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride>
|
||||
color_interpolation_space, hue_interpolation_method, start_color,
|
||||
end_color, percentage, alpha_multiplier);
|
||||
|
||||
- FontPalette::FontPaletteOverride result_color_record(i, result_color);
|
||||
+ FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
|
||||
result_color_records.push_back(result_color_record);
|
||||
}
|
||||
return result_color_records;
|
||||
diff -up chromium-119.0.6045.59/ui/gtk/gtk_ui.cc.no_matching_constructor chromium-119.0.6045.59/ui/gtk/gtk_ui.cc
|
||||
--- chromium-119.0.6045.59/ui/gtk/gtk_ui.cc.no_matching_constructor 2023-10-26 18:18:14.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/ui/gtk/gtk_ui.cc 2023-10-30 16:51:02.272151537 +0100
|
||||
@@ -993,11 +993,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi
|
||||
GdkRectangle geometry;
|
||||
gdk_monitor_get_geometry(monitor, &geometry);
|
||||
int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
|
||||
- config.display_geometries.emplace_back(
|
||||
+ config.display_geometries.emplace_back() = {
|
||||
gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
|
||||
monitor_scale * geometry.width,
|
||||
monitor_scale * geometry.height),
|
||||
- monitor_scale * font_scale);
|
||||
+ static_cast<float>(monitor_scale * font_scale)};
|
||||
}
|
||||
return config;
|
||||
}
|
||||
diff -up chromium-119.0.6045.59/base/metrics/persistent_histogram_allocator.cc.me chromium-119.0.6045.59/base/metrics/persistent_histogram_allocator.cc
|
||||
--- chromium-119.0.6045.59/base/metrics/persistent_histogram_allocator.cc.me 2023-10-31 18:14:49.275728099 +0100
|
||||
+++ chromium-119.0.6045.59/base/metrics/persistent_histogram_allocator.cc 2023-10-31 18:19:54.599223239 +0100
|
||||
@@ -221,13 +221,13 @@ PersistentSparseHistogramDataManager::Lo
|
||||
// The sample-record could be for any sparse histogram. Add the reference
|
||||
// to the appropriate collection for later use.
|
||||
if (found_id == match_id) {
|
||||
- found_records.emplace_back(ref, value);
|
||||
+ found_records.emplace_back() = {ref, value};
|
||||
found = true;
|
||||
} else {
|
||||
std::vector<ReferenceAndSample>* samples =
|
||||
GetSampleMapRecordsWhileLocked(found_id);
|
||||
CHECK(samples);
|
||||
- samples->emplace_back(ref, value);
|
||||
+ samples->emplace_back() = {ref, value};
|
||||
}
|
||||
}
|
||||
|
||||
diff -up chromium-119.0.6045.59/net/dns/host_resolver_cache.cc.me chromium-119.0.6045.59/net/dns/host_resolver_cache.cc
|
||||
--- chromium-119.0.6045.59/net/dns/host_resolver_cache.cc.me 2023-10-31 20:48:19.153868338 +0100
|
||||
+++ chromium-119.0.6045.59/net/dns/host_resolver_cache.cc 2023-10-31 20:51:37.634526549 +0100
|
||||
@@ -368,7 +368,7 @@ void HostResolverCache::Set(
|
||||
|
||||
std::string domain_name = result->domain_name();
|
||||
entries_.emplace(
|
||||
- Key(std::move(domain_name), network_anonymization_key),
|
||||
+ Key{std::move(domain_name), network_anonymization_key},
|
||||
Entry(std::move(result), source, secure, staleness_generation));
|
||||
|
||||
if (entries_.size() > max_entries_) {
|
||||
diff -up chromium-119.0.6045.59/components/autofill/core/browser/webdata/autofill_table.cc.me chromium-119.0.6045.59/components/autofill/core/browser/webdata/autofill_table.cc
|
||||
--- chromium-119.0.6045.59/components/autofill/core/browser/webdata/autofill_table.cc.me 2023-10-31 22:32:58.995997897 +0100
|
||||
+++ chromium-119.0.6045.59/components/autofill/core/browser/webdata/autofill_table.cc 2023-10-31 22:33:28.290520601 +0100
|
||||
@@ -1733,10 +1733,10 @@ std::unique_ptr<AutofillProfile> Autofil
|
||||
}
|
||||
|
||||
base::span<const uint8_t> observations_data = s.ColumnBlob(3);
|
||||
- field_type_values.emplace_back(
|
||||
+ field_type_values.emplace_back() = {
|
||||
type, s.ColumnString16(1), s.ColumnInt(2),
|
||||
std::vector<uint8_t>(observations_data.begin(),
|
||||
- observations_data.end()));
|
||||
+ observations_data.end())};
|
||||
|
||||
if (type == ADDRESS_HOME_COUNTRY) {
|
||||
country_code = base::UTF16ToUTF8(s.ColumnString16(1));
|
||||
diff -up chromium-119.0.6045.59/components/password_manager/core/browser/password_manager.cc.than chromium-119.0.6045.59/components/password_manager/core/browser/password_manager.cc
|
||||
--- chromium-119.0.6045.59/components/password_manager/core/browser/password_manager.cc.than 2023-10-31 22:41:22.850233005 +0100
|
||||
+++ chromium-119.0.6045.59/components/password_manager/core/browser/password_manager.cc 2023-10-31 22:42:37.276931933 +0100
|
||||
@@ -625,7 +625,7 @@ void PasswordManager::OnUserModifiedNonP
|
||||
// |driver| might be empty on iOS or in tests.
|
||||
int driver_id = driver ? driver->GetId() : 0;
|
||||
possible_usernames_.Put(
|
||||
- PossibleUsernameFieldIdentifier(driver_id, renderer_id),
|
||||
+ PossibleUsernameFieldIdentifier{driver_id, renderer_id},
|
||||
PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()),
|
||||
renderer_id, value, base::Time::Now(), driver_id,
|
||||
autocomplete_attribute_has_username, is_likely_otp));
|
||||
diff -up chromium-119.0.6045.59/content/browser/interest_group/interest_group_storage.cc.than chromium-119.0.6045.59/content/browser/interest_group/interest_group_storage.cc
|
||||
--- chromium-119.0.6045.59/content/browser/interest_group/interest_group_storage.cc.than 2023-10-31 23:31:08.438267908 +0100
|
||||
+++ chromium-119.0.6045.59/content/browser/interest_group/interest_group_storage.cc 2023-10-31 23:32:08.979358711 +0100
|
||||
@@ -2854,10 +2854,10 @@ DoGetKAnonymityData(sql::Database& db,
|
||||
|
||||
std::vector<StorageInterestGroup::KAnonymityData> k_anon_data;
|
||||
while (interest_group_kanon_query.Step()) {
|
||||
- k_anon_data.emplace_back(
|
||||
+ k_anon_data.emplace_back() = {
|
||||
/*key=*/interest_group_kanon_query.ColumnString(0),
|
||||
/*is_k_anonymous=*/interest_group_kanon_query.ColumnBool(1),
|
||||
- /*last_updated=*/interest_group_kanon_query.ColumnTime(2));
|
||||
+ /*last_updated=*/interest_group_kanon_query.ColumnTime(2)};
|
||||
}
|
||||
if (!interest_group_kanon_query.Succeeded()) {
|
||||
return absl::nullopt;
|
||||
diff -up chromium-119.0.6045.59/content/browser/webid/federated_auth_request_impl.cc.than chromium-119.0.6045.59/content/browser/webid/federated_auth_request_impl.cc
|
||||
--- chromium-119.0.6045.59/content/browser/webid/federated_auth_request_impl.cc.than 2023-11-01 11:19:42.745395797 +0100
|
||||
+++ chromium-119.0.6045.59/content/browser/webid/federated_auth_request_impl.cc 2023-11-01 11:22:16.670920679 +0100
|
||||
@@ -1881,7 +1881,7 @@ void FederatedAuthRequestImpl::ShowError
|
||||
base::BindOnce(&FederatedAuthRequestImpl::CompleteRequestWithError,
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
absl::optional<TokenError> token_error =
|
||||
- error ? absl::make_optional<TokenError>(error->code, error->url)
|
||||
+ error ? absl::make_optional<TokenError>({error->code, error->url})
|
||||
: absl::nullopt;
|
||||
|
||||
// TODO(crbug.com/1485710): Refactor IdentityCredentialTokenError
|
||||
--- chromium-119.0.6045.59/ui/base/wayland/color_manager_util.h.no_matching_constructor 2023-10-26 18:18:14.000000000 +0200
|
||||
+++ chromium-119.0.6045.59/ui/base/wayland/color_manager_util.h 2023-11-01 17:29:54.269820415 +0100
|
||||
@@ -52,53 +52,53 @@
|
||||
zcr_color_manager_v1_chromaticity_names,
|
||||
PrimaryVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::BT470M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::XYZ_D50,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST431_2,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::FILM,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}});
|
||||
|
||||
// A map from the zcr_color_manager_v1 eotf_names enum values
|
||||
// representing well-known EOTFs, to their equivalent TransferIDs.
|
||||
@@ -107,68 +107,68 @@
|
||||
zcr_color_manager_v1_eotf_names,
|
||||
TransferVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB_HDR,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB_HDR,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT709,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
// This is ever so slightly inaccurate. The number ought to be
|
||||
// 2.19921875f, not 2.2
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::HLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::HLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::IEC61966_2_4,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}},
|
||||
});
|
||||
|
||||
// A map from the SDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -177,18 +177,18 @@
|
||||
constexpr auto kTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kRec709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferFnVersion(gamma24, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{gamma24, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kA98RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
});
|
||||
|
||||
// A map from the HDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -197,70 +197,70 @@
|
||||
constexpr auto kHDRTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGB,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferFnVersion(SkNamedTransferFn::kHLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kHLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGBExtended1023Over510,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 matrix_names enum values to
|
||||
// gfx::ColorSpace::MatrixIDs.
|
||||
constexpr auto kMatrixMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT709,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG,
|
||||
- MatrixVersion(
|
||||
+ MatrixVersion{
|
||||
gfx::ColorSpace::MatrixID::BT470BG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::GBR,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 range_names enum values to
|
||||
// gfx::ColorSpace::RangeIDs.
|
||||
constexpr auto kRangeMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
|
||||
- kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::DERIVED,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity(
|
||||
gfx::ColorSpace::PrimaryID primaryID,
|
||||
@@ -283,4 +283,4 @@
|
||||
|
||||
} // namespace ui::wayland
|
||||
|
||||
-#endif // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
+#endif // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc.me chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc.me 2023-11-01 20:46:15.997861278 +0100
|
||||
+++ chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc 2023-11-01 20:49:33.603371680 +0100
|
||||
@@ -58,13 +58,13 @@ EmbeddedPermissionPromptPreviouslyGrante
|
||||
std::vector<EmbeddedPermissionPromptPreviouslyGrantedView::ButtonConfiguration>
|
||||
EmbeddedPermissionPromptPreviouslyGrantedView::GetButtonsConfiguration() {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_CONTINUE_ALLOWING),
|
||||
- ButtonType::kContinueAllowing, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kContinueAllowing, ui::ButtonStyle::kTonal};
|
||||
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_STOP_ALLOWING),
|
||||
- ButtonType::kStopAllowing, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kStopAllowing, ui::ButtonStyle::kTonal};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc.than chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc.than 2023-11-01 20:52:29.005464494 +0100
|
||||
+++ chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc 2023-11-01 21:14:12.741859604 +0100
|
||||
@@ -56,12 +56,12 @@ std::vector<EmbeddedPermissionPromptAskV
|
||||
EmbeddedPermissionPromptAskView::GetButtonsConfiguration() {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
if (base::FeatureList::IsEnabled(permissions::features::kOneTimePermission)) {
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME),
|
||||
- ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal};
|
||||
}
|
||||
- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
- ButtonType::kAllow, ui::ButtonStyle::kTonal);
|
||||
+ buttons.emplace_back() = {l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
+ ButtonType::kAllow, ui::ButtonStyle::kTonal};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h.me chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
|
||||
--- chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h.me 2023-11-01 21:22:02.222646903 +0100
|
||||
+++ chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h 2023-11-01 21:19:58.769619393 +0100
|
||||
@@ -72,6 +72,7 @@ class EmbeddedPermissionPromptBaseView :
|
||||
struct RequestLineConfiguration {
|
||||
const raw_ptr<const gfx::VectorIcon> icon;
|
||||
std::u16string message;
|
||||
+ RequestLineConfiguration(auto i, auto m) : icon(i), message(m) { }
|
||||
};
|
||||
|
||||
struct ButtonConfiguration {
|
||||
diff -up chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc.than chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc
|
||||
--- chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc.than 2023-11-01 21:25:31.118626473 +0100
|
||||
+++ chromium-119.0.6045.59/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc 2023-11-01 21:30:06.383340274 +0100
|
||||
@@ -48,8 +48,8 @@ EmbeddedPermissionPromptPolicyView::GetR
|
||||
std::vector<EmbeddedPermissionPromptPolicyView::ButtonConfiguration>
|
||||
EmbeddedPermissionPromptPolicyView::GetButtonsConfiguration() {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_OK_LABEL),
|
||||
- ButtonType::kPolicyOK, ui::ButtonStyle::kTonal);
|
||||
+ buttons.emplace_back() = {l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_OK_LABEL),
|
||||
+ ButtonType::kPolicyOK, ui::ButtonStyle::kTonal};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
diff -up chromium-119.0.6045.105/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar chromium-119.0.6045.105/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
|
||||
--- chromium-119.0.6045.105/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar 2023-11-01 19:10:13.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/browser/safe_browsing/download_protection/file_analyzer.cc 2023-11-06 17:16:55.630255973 +0100
|
||||
@@ -77,8 +77,6 @@ void FileAnalyzer::Start(const base::Fil
|
||||
|
||||
if (inspection_type == DownloadFileType::ZIP) {
|
||||
StartExtractZipFeatures();
|
||||
- } else if (inspection_type == DownloadFileType::RAR) {
|
||||
- StartExtractRarFeatures();
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
} else if (inspection_type == DownloadFileType::DMG) {
|
||||
StartExtractDmgFeatures();
|
||||
diff -up chromium-119.0.6045.105/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-119.0.6045.105/chrome/common/safe_browsing/BUILD.gn
|
||||
--- chromium-119.0.6045.105/chrome/common/safe_browsing/BUILD.gn.nounrar 2023-11-01 19:10:16.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/common/safe_browsing/BUILD.gn 2023-11-06 17:16:55.630255973 +0100
|
||||
@@ -143,7 +143,6 @@ source_set("safe_browsing") {
|
||||
"//components/safe_browsing/content/common:file_type_policies",
|
||||
"//components/safe_browsing/core/common",
|
||||
"//third_party/lzma_sdk/google:seven_zip_reader",
|
||||
- "//third_party/unrar:unrar",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
diff -up chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.cc
|
||||
--- chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2023-11-06 18:07:30.549291823 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.cc 2023-11-06 18:08:00.510076945 +0100
|
||||
@@ -74,6 +74,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
|
||||
const absl::optional<std::string>& password,
|
||||
mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
|
||||
AnalyzeRarFileCallback callback) {
|
||||
+#if 0
|
||||
DCHECK(rar_file.IsValid());
|
||||
temp_file_getter_.Bind(std::move(temp_file_getter));
|
||||
callback_ = std::move(callback);
|
||||
@@ -90,6 +91,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
|
||||
/*password=*/password,
|
||||
std::move(analysis_finished_callback),
|
||||
std::move(temp_file_getter_callback), &results_);
|
||||
+#else
|
||||
+ NOTREACHED();
|
||||
+#endif
|
||||
}
|
||||
|
||||
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
|
||||
diff -up chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.h.nounrar chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.h
|
||||
--- chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.h.nounrar 2023-11-01 19:10:16.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/services/file_util/safe_archive_analyzer.h 2023-11-06 17:16:55.630255973 +0100
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
|
||||
#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
|
||||
-#include "chrome/utility/safe_browsing/rar_analyzer.h"
|
||||
#include "chrome/utility/safe_browsing/seven_zip_analyzer.h"
|
||||
#include "chrome/utility/safe_browsing/zip_analyzer.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
@@ -66,7 +65,6 @@ class SafeArchiveAnalyzer : public chrom
|
||||
void Timeout();
|
||||
|
||||
safe_browsing::ZipAnalyzer zip_analyzer_;
|
||||
- safe_browsing::RarAnalyzer rar_analyzer_;
|
||||
safe_browsing::SevenZipAnalyzer seven_zip_analyzer_;
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
safe_browsing::dmg::DMGAnalyzer dmg_analyzer_;
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-120.0.6099.62/build/config/compiler/BUILD.gn.than chromium-120.0.6099.62/build/config/compiler/BUILD.gn
|
||||
--- chromium-120.0.6099.62/build/config/compiler/BUILD.gn.than 2023-12-06 19:28:25.998327318 +0100
|
||||
+++ chromium-120.0.6099.62/build/config/compiler/BUILD.gn 2023-12-06 19:28:34.190528906 +0100
|
||||
@@ -787,7 +787,7 @@ config("compiler") {
|
||||
# toolchain has this flag.
|
||||
# We only use one version of LLVM within a build so there's no need to
|
||||
# upgrade debug info, which can be expensive since it runs the verifier.
|
||||
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
+ ldflags += [ "" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-120.0.6099.56/media/base/media_switches.cc.me chromium-120.0.6099.56/media/base/media_switches.cc
|
||||
--- chromium-120.0.6099.56/media/base/media_switches.cc.me 2023-12-02 11:43:21.990775897 +0100
|
||||
+++ chromium-120.0.6099.56/media/base/media_switches.cc 2023-12-02 11:45:23.248006377 +0100
|
||||
@@ -1636,7 +1636,7 @@ BASE_FEATURE(kUseSharedImagesForPepperVi
|
||||
// Enables FFmpeg allow lists for supported codecs / containers.
|
||||
BASE_FEATURE(kFFmpegAllowLists,
|
||||
"FFmpegAllowLists",
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
#if BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS)
|
||||
// Allows decoding of theora / vp3 content.
|
||||
@ -1,14 +0,0 @@
|
||||
--- chromium-120.0.6099.35/chrome/browser/media/router/media_router_feature.cc.orig 2023-11-26 13:25:34.724228755 +0100
|
||||
+++ chromium-120.0.6099.35/chrome/browser/media/router/media_router_feature.cc 2023-11-26 13:28:26.452359146 +0100
|
||||
@@ -71,11 +71,7 @@
|
||||
// TODO(b/202294946): Remove when enabled by default on ChromeOS.
|
||||
BASE_FEATURE(kGlobalMediaControlsCastStartStop,
|
||||
"GlobalMediaControlsCastStartStop",
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
-#else
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
namespace {
|
||||
@ -1,26 +0,0 @@
|
||||
diff -up chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/starscan/metadata_allocator.h.me chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/starscan/metadata_allocator.h
|
||||
--- chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/starscan/metadata_allocator.h.me 2023-11-26 13:33:11.547409713 +0100
|
||||
+++ chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/starscan/metadata_allocator.h 2023-11-26 13:35:02.679363167 +0100
|
||||
@@ -40,6 +40,11 @@ class MetadataAllocator {
|
||||
}
|
||||
|
||||
template <typename U>
|
||||
+ bool operator==(const MetadataAllocator<U>&) const {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ template <typename U>
|
||||
bool operator!=(const MetadataAllocator<U>& o) {
|
||||
return !operator==(o);
|
||||
}
|
||||
diff -up chromium-120.0.6099.35/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.me chromium-120.0.6099.35/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h
|
||||
--- chromium-120.0.6099.35/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.me 2023-11-22 20:34:11.000000000 +0100
|
||||
+++ chromium-120.0.6099.35/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h 2023-11-26 13:30:38.961724653 +0100
|
||||
@@ -82,6 +82,7 @@ struct FxPartitionAllocAllocator {
|
||||
}
|
||||
|
||||
// There's no state, so they are all the same,
|
||||
+ bool operator==(const FxPartitionAllocAllocator&) const { return true; }
|
||||
bool operator==(const FxPartitionAllocAllocator& that) { return true; }
|
||||
bool operator!=(const FxPartitionAllocAllocator& that) { return false; }
|
||||
};
|
||||
@ -1,28 +0,0 @@
|
||||
diff -up chromium-120.0.6099.35/build/config/compiler/BUILD.gn.than chromium-120.0.6099.35/build/config/compiler/BUILD.gn
|
||||
--- chromium-120.0.6099.35/build/config/compiler/BUILD.gn.than 2023-11-26 17:02:25.647022746 +0100
|
||||
+++ chromium-120.0.6099.35/build/config/compiler/BUILD.gn 2023-11-26 17:15:58.025585358 +0100
|
||||
@@ -616,24 +616,6 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
- # TODO(crbug.com/1488374): This causes binary size growth and potentially
|
||||
- # other problems.
|
||||
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
|
||||
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
||||
- !llvm_android_mainline) {
|
||||
- cflags += [
|
||||
- "-mllvm",
|
||||
- "-split-threshold-for-reg-with-hint=0",
|
||||
- ]
|
||||
- if (use_thin_lto && is_a_target_toolchain) {
|
||||
- if (is_win) {
|
||||
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
||||
- } else {
|
||||
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
|
||||
if (is_win) {
|
||||
cflags += [ "/clang:-ffp-contract=off" ]
|
||||
@ -1,13 +0,0 @@
|
||||
diff -up chromium-121.0.6167.57/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.me chromium-121.0.6167.57/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
|
||||
--- chromium-121.0.6167.57/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.me 2024-01-16 14:20:52.401890657 +0100
|
||||
+++ chromium-121.0.6167.57/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h 2024-01-16 15:08:04.070156474 +0100
|
||||
@@ -162,7 +162,8 @@ static_assert(sizeof(void*) != 8, "");
|
||||
|
||||
#if defined(ARCH_CPU_ARM64) && defined(__clang__) && \
|
||||
!defined(ADDRESS_SANITIZER) && \
|
||||
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))
|
||||
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)) && \
|
||||
+ __GLIBC_PREREQ(2, 29)
|
||||
#define PA_CONFIG_HAS_MEMORY_TAGGING() 1
|
||||
#else
|
||||
#define PA_CONFIG_HAS_MEMORY_TAGGING() 0
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h.me chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h
|
||||
--- chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h.me 2024-01-18 17:00:24.791582422 +0100
|
||||
+++ chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h 2024-01-18 17:22:21.521682845 +0100
|
||||
@@ -27,7 +27,7 @@ struct QueryParams {
|
||||
QueryParams(const QueryParams& other);
|
||||
QueryParams& operator=(const QueryParams& other);
|
||||
|
||||
- friend constexpr bool operator==(const QueryParams&,
|
||||
+ friend bool operator==(const QueryParams&,
|
||||
const QueryParams&) = default;
|
||||
|
||||
// Individual resource contexts to measure.
|
||||
@ -1,24 +0,0 @@
|
||||
diff -up chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.cc.me chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.cc
|
||||
--- chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.cc.me 2024-01-23 15:13:11.469104694 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.cc 2024-01-23 15:11:40.117842015 +0100
|
||||
@@ -46,7 +46,7 @@ size_t GetResultSizeBytes(const HeaderDi
|
||||
|
||||
} // namespace
|
||||
|
||||
-HeaderDirectFromSellerSignals::Result::Result() = default;
|
||||
+HeaderDirectFromSellerSignals::Result::Result() {}
|
||||
|
||||
HeaderDirectFromSellerSignals::Result::Result(
|
||||
absl::optional<std::string> seller_signals,
|
||||
diff -up chromium-121.0.6167.57/components/variations/service/ui_string_overrider.cc.me chromium-121.0.6167.57/components/variations/service/ui_string_overrider.cc
|
||||
--- chromium-121.0.6167.57/components/variations/service/ui_string_overrider.cc.me 2024-01-24 08:07:50.191188397 +0100
|
||||
+++ chromium-121.0.6167.57/components/variations/service/ui_string_overrider.cc 2024-01-24 08:08:55.905676634 +0100
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
namespace variations {
|
||||
|
||||
-UIStringOverrider::UIStringOverrider() = default;
|
||||
+UIStringOverrider::UIStringOverrider() {}
|
||||
|
||||
UIStringOverrider::UIStringOverrider(base::span<const uint32_t> resource_hashes,
|
||||
base::span<const int> resource_indices)
|
||||
@ -1,126 +0,0 @@
|
||||
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h
|
||||
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100
|
||||
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h 2024-02-01 17:20:37.178877448 +0100
|
||||
@@ -146,7 +146,13 @@ struct PartitionBucket {
|
||||
// Returns a slot number starting from the beginning of the slot span.
|
||||
PA_ALWAYS_INLINE size_t GetSlotNumber(size_t offset_in_slot_span) const {
|
||||
// See the static assertion for `kReciprocalShift` above.
|
||||
- PA_DCHECK(offset_in_slot_span <= kMaxBucketed);
|
||||
+ // TODO(casey.smalley@arm.com): triggers on Aarch64/Linux
|
||||
+ // systems with 64k system pages. Constants need to be
|
||||
+ // adjusted to prevent different parts of the allocator
|
||||
+ // from overlapping. For now this will allow 64k pages
|
||||
+ // to function on Aarch64/Linux systems, albeit not
|
||||
+ // very efficiently.
|
||||
+ // PA_DCHECK(offset_in_slot_span <= kMaxBucketed);
|
||||
PA_DCHECK(slot_size <= kMaxBucketed);
|
||||
|
||||
const size_t offset_in_slot =
|
||||
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
|
||||
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.el8-support-64kpage.patch 2024-02-01 17:20:37.178877448 +0100
|
||||
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h 2024-02-01 17:31:08.500268457 +0100
|
||||
@@ -17,10 +17,8 @@ namespace partition_alloc::internal {
|
||||
// PartitionPageSize() is 4 times the OS page size.
|
||||
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
|
||||
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
-// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
|
||||
-// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
|
||||
-// so we use the 16 kiB maximum (64 kiB will crash).
|
||||
-static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
|
||||
+// System page size can be 4, 16, or 64 kiB on Linux on AArch64.
|
||||
+static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 16) / kSmallestBucket;
|
||||
#else
|
||||
// A slot span can "span" multiple PartitionPages, but then its slot size is
|
||||
// larger, so it doesn't have as many slots.
|
||||
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
|
||||
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100
|
||||
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h 2024-02-01 17:20:37.178877448 +0100
|
||||
@@ -95,26 +95,25 @@ struct SlotSpanMetadata {
|
||||
|
||||
// CHECK()ed in AllocNewSlotSpan().
|
||||
// The maximum number of bits needed to cover all currently supported OSes.
|
||||
- static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
|
||||
+ static constexpr size_t kMaxSlotsPerSlotSpanBits = 15;
|
||||
static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), "");
|
||||
|
||||
- // |marked_full| isn't equivalent to being full. Slot span is marked as full
|
||||
- // iff it isn't on the active slot span list (or any other list).
|
||||
- uint32_t marked_full : 1;
|
||||
// |num_allocated_slots| is 0 for empty or decommitted slot spans, which can
|
||||
// be further differentiated by checking existence of the freelist.
|
||||
- uint32_t num_allocated_slots : kMaxSlotsPerSlotSpanBits;
|
||||
- uint32_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+ uint16_t num_allocated_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+ uint16_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+
|
||||
+ // |marked_full| isn't equivalent to being full. Slot span is marked as full
|
||||
+ // iff it isn't on the active slot span list (or any other list).
|
||||
+ bool marked_full : 1;
|
||||
|
||||
private:
|
||||
- const uint32_t can_store_raw_size_ : 1;
|
||||
- uint32_t freelist_is_sorted_ : 1;
|
||||
- uint32_t unused1_ : (32 - 1 - 2 * kMaxSlotsPerSlotSpanBits - 1 - 1);
|
||||
+ const uint8_t can_store_raw_size_ : 1;
|
||||
+ uint8_t freelist_is_sorted_ : 1;
|
||||
// If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be
|
||||
// used.
|
||||
- uint16_t in_empty_cache_ : 1;
|
||||
- uint16_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans.
|
||||
- uint16_t unused2_ : (16 - 1 - kEmptyCacheIndexBits);
|
||||
+ bool in_empty_cache_ : 1;
|
||||
+ uint8_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans.
|
||||
// Can use only 48 bits (6B) in this bitfield, as this structure is embedded
|
||||
// in PartitionPage which has 2B worth of fields and must fit in 32B.
|
||||
|
||||
@@ -279,18 +278,13 @@ static_assert(sizeof(SlotSpanMetadata) <
|
||||
"SlotSpanMetadata must fit into a Page Metadata slot.");
|
||||
|
||||
inline constexpr SlotSpanMetadata::SlotSpanMetadata() noexcept
|
||||
- : marked_full(0),
|
||||
- num_allocated_slots(0),
|
||||
+ : num_allocated_slots(0),
|
||||
num_unprovisioned_slots(0),
|
||||
+ marked_full(0),
|
||||
can_store_raw_size_(false),
|
||||
freelist_is_sorted_(true),
|
||||
- unused1_(0),
|
||||
in_empty_cache_(0),
|
||||
- empty_cache_index_(0),
|
||||
- unused2_(0) {
|
||||
- (void)unused1_;
|
||||
- (void)unused2_;
|
||||
-}
|
||||
+ empty_cache_index_(0) {}
|
||||
|
||||
inline SlotSpanMetadata::SlotSpanMetadata(const SlotSpanMetadata&) = default;
|
||||
|
||||
@@ -883,7 +877,7 @@ PA_ALWAYS_INLINE void SlotSpanMetadata::
|
||||
|
||||
size_t num_slots_per_span = bucket->get_slots_per_span();
|
||||
PA_DCHECK(num_slots_per_span <= kMaxSlotsPerSlotSpan);
|
||||
- num_unprovisioned_slots = static_cast<uint32_t>(num_slots_per_span);
|
||||
+ num_unprovisioned_slots = static_cast<uint16_t>(num_slots_per_span);
|
||||
PA_DCHECK(num_unprovisioned_slots);
|
||||
|
||||
ToSuperPageExtent()->IncrementNumberOfNonemptySlotSpans();
|
||||
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
|
||||
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100
|
||||
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc 2024-02-01 17:20:37.178877448 +0100
|
||||
@@ -950,12 +950,11 @@ void PartitionRoot::Init(PartitionOption
|
||||
(internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
// Check runtime pagesize. Though the code is currently the same, it is
|
||||
- // not merged with the IS_APPLE case above as a 1 << 16 case needs to be
|
||||
- // added here in the future, to allow 64 kiB pagesize. That is only
|
||||
- // supported on Linux on arm64, not on IS_APPLE, but not yet present here
|
||||
- // as the rest of the partition allocator does not currently support it.
|
||||
+ // not merged with the IS_APPLE case above as a 1 << 16 case is only
|
||||
+ // supported on Linux on AArch64.
|
||||
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
|
||||
- (internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
+ (internal::SystemPageSize() == (size_t{1} << 14)) ||
|
||||
+ (internal::SystemPageSize() == (size_t{1} << 16)));
|
||||
#endif
|
||||
|
||||
::partition_alloc::internal::ScopedGuard guard{lock_};
|
||||
@ -1,515 +0,0 @@
|
||||
diff -up chromium-119.0.6045.105/base/check_op.h.missing-header-files chromium-119.0.6045.105/base/check_op.h
|
||||
--- chromium-119.0.6045.105/base/check_op.h.missing-header-files 2023-11-01 19:10:05.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/base/check_op.h 2023-11-06 14:34:01.808868982 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_CHECK_OP_H_
|
||||
#define BASE_CHECK_OP_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
diff -up chromium-119.0.6045.105/base/containers/flat_map.h.missing-header-files chromium-119.0.6045.105/base/containers/flat_map.h
|
||||
--- chromium-119.0.6045.105/base/containers/flat_map.h.missing-header-files 2023-11-01 19:10:05.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/base/containers/flat_map.h 2023-11-06 14:34:01.813869089 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_CONTAINERS_FLAT_MAP_H_
|
||||
#define BASE_CONTAINERS_FLAT_MAP_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <tuple>
|
||||
#include <type_traits>
|
||||
diff -up chromium-119.0.6045.105/base/debug/profiler.h.missing-header-files chromium-119.0.6045.105/base/debug/profiler.h
|
||||
--- chromium-119.0.6045.105/base/debug/profiler.h.missing-header-files 2023-11-01 19:10:05.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/base/debug/profiler.h 2023-11-06 14:34:01.809869004 +0100
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "base/base_export.h"
|
||||
diff -up chromium-119.0.6045.105/base/memory/ref_counted.h.missing-header-files chromium-119.0.6045.105/base/memory/ref_counted.h
|
||||
--- chromium-119.0.6045.105/base/memory/ref_counted.h.missing-header-files 2023-11-01 19:10:05.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/base/memory/ref_counted.h 2023-11-06 14:34:01.808868982 +0100
|
||||
@@ -6,6 +6,7 @@
|
||||
#define BASE_MEMORY_REF_COUNTED_H_
|
||||
|
||||
#include <stddef.h>
|
||||
+#include <limits>
|
||||
|
||||
#include <limits>
|
||||
#include <utility>
|
||||
diff -up chromium-119.0.6045.105/chrome/browser/privacy_budget/encountered_surface_tracker.h.missing-header-files chromium-119.0.6045.105/chrome/browser/privacy_budget/encountered_surface_tracker.h
|
||||
--- chromium-119.0.6045.105/chrome/browser/privacy_budget/encountered_surface_tracker.h.missing-header-files 2023-11-01 19:10:13.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/browser/privacy_budget/encountered_surface_tracker.h 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
|
||||
#include "base/containers/flat_set.h"
|
||||
diff -up chromium-119.0.6045.105/chrome/browser/webauthn/authenticator_request_dialog_model.h.missing-header-files chromium-119.0.6045.105/chrome/browser/webauthn/authenticator_request_dialog_model.h
|
||||
--- chromium-119.0.6045.105/chrome/browser/webauthn/authenticator_request_dialog_model.h.missing-header-files 2023-11-01 19:10:16.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/browser/webauthn/authenticator_request_dialog_model.h 2023-11-06 14:34:01.817869174 +0100
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <variant>
|
||||
|
||||
#include "base/containers/span.h"
|
||||
#include "base/functional/callback_forward.h"
|
||||
diff -up chromium-119.0.6045.105/chrome/test/chromedriver/chrome/web_view_impl.cc.missing-header-files chromium-119.0.6045.105/chrome/test/chromedriver/chrome/web_view_impl.cc
|
||||
--- chromium-119.0.6045.105/chrome/test/chromedriver/chrome/web_view_impl.cc.missing-header-files 2023-11-01 19:10:16.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/chrome/test/chromedriver/chrome/web_view_impl.cc 2023-11-06 14:34:01.818869196 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <queue>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
+#include <cstring>
|
||||
|
||||
#include "base/check.h"
|
||||
#include "base/files/file_path.h"
|
||||
diff -up chromium-119.0.6045.105/components/autofill/core/browser/autofill_ablation_study.h.missing-header-files chromium-119.0.6045.105/components/autofill/core/browser/autofill_ablation_study.h
|
||||
--- chromium-119.0.6045.105/components/autofill/core/browser/autofill_ablation_study.h.missing-header-files 2023-11-01 19:10:19.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/autofill/core/browser/autofill_ablation_study.h 2023-11-06 14:34:01.815869132 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
class GURL;
|
||||
diff -up chromium-119.0.6045.105/components/crash/core/app/crash_reporter_client.h.missing-header-files chromium-119.0.6045.105/components/crash/core/app/crash_reporter_client.h
|
||||
--- chromium-119.0.6045.105/components/crash/core/app/crash_reporter_client.h.missing-header-files 2023-11-01 19:10:20.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/crash/core/app/crash_reporter_client.h 2023-11-06 14:34:01.813869089 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "build/build_config.h"
|
||||
diff -up chromium-119.0.6045.105/components/feature_engagement/internal/event_storage_validator.h.missing-header-files chromium-119.0.6045.105/components/feature_engagement/internal/event_storage_validator.h
|
||||
--- chromium-119.0.6045.105/components/feature_engagement/internal/event_storage_validator.h.missing-header-files 2023-11-01 19:10:21.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/feature_engagement/internal/event_storage_validator.h 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
namespace feature_engagement {
|
||||
diff -up chromium-119.0.6045.105/components/feature_engagement/internal/never_event_storage_validator.h.missing-header-files chromium-119.0.6045.105/components/feature_engagement/internal/never_event_storage_validator.h
|
||||
--- chromium-119.0.6045.105/components/feature_engagement/internal/never_event_storage_validator.h.missing-header-files 2023-11-01 19:10:21.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/feature_engagement/internal/never_event_storage_validator.h 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
|
||||
#define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "components/feature_engagement/internal/event_storage_validator.h"
|
||||
diff -up chromium-119.0.6045.105/components/omnibox/browser/on_device_head_model.h.missing-header-files chromium-119.0.6045.105/components/omnibox/browser/on_device_head_model.h
|
||||
--- chromium-119.0.6045.105/components/omnibox/browser/on_device_head_model.h.missing-header-files 2023-11-01 19:10:21.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/omnibox/browser/on_device_head_model.h 2023-11-06 14:34:01.815869132 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
diff -up chromium-119.0.6045.105/components/password_manager/core/browser/generation/password_generator.h.missing-header-files chromium-119.0.6045.105/components/password_manager/core/browser/generation/password_generator.h
|
||||
--- chromium-119.0.6045.105/components/password_manager/core/browser/generation/password_generator.h.missing-header-files 2023-11-01 19:10:21.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/password_manager/core/browser/generation/password_generator.h 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
|
||||
diff -up chromium-119.0.6045.105/components/payments/content/utility/fingerprint_parser.h.missing-header-files chromium-119.0.6045.105/components/payments/content/utility/fingerprint_parser.h
|
||||
--- chromium-119.0.6045.105/components/payments/content/utility/fingerprint_parser.h.missing-header-files 2023-11-01 19:10:21.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/components/payments/content/utility/fingerprint_parser.h 2023-11-06 14:34:01.815869132 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
|
||||
#define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
diff -up chromium-119.0.6045.105/gin/time_clamper.h.missing-header-files chromium-119.0.6045.105/gin/time_clamper.h
|
||||
--- chromium-119.0.6045.105/gin/time_clamper.h.missing-header-files 2023-11-01 19:10:28.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/gin/time_clamper.h 2023-11-06 14:34:01.818869196 +0100
|
||||
@@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper {
|
||||
const int64_t micros = now_micros % 1000;
|
||||
// abs() is necessary for devices with times before unix-epoch (most likely
|
||||
// configured incorrectly).
|
||||
- if (abs(micros) + kResolutionMicros < 1000) {
|
||||
+ if (std::abs(micros) + kResolutionMicros < 1000) {
|
||||
return now_micros / 1000;
|
||||
}
|
||||
return ClampTimeResolution(now_micros) / 1000;
|
||||
diff -up chromium-119.0.6045.105/gpu/config/gpu_feature_info.h.missing-header-files chromium-119.0.6045.105/gpu/config/gpu_feature_info.h
|
||||
--- chromium-119.0.6045.105/gpu/config/gpu_feature_info.h.missing-header-files 2023-11-01 19:10:28.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/gpu/config/gpu_feature_info.h 2023-11-06 14:34:01.809869004 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff -up chromium-119.0.6045.105/net/base/net_export.h.missing-header-files chromium-119.0.6045.105/net/base/net_export.h
|
||||
--- chromium-119.0.6045.105/net/base/net_export.h.missing-header-files 2023-11-01 19:10:32.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/net/base/net_export.h 2023-11-06 14:34:01.809869004 +0100
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef NET_BASE_NET_EXPORT_H_
|
||||
#define NET_BASE_NET_EXPORT_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
// Defines NET_EXPORT so that functionality implemented by the net module can
|
||||
// be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to
|
||||
// access features not intended to be used directly by real consumers.
|
||||
diff -up chromium-119.0.6045.105/pdf/document_attachment_info.h.missing-header-files chromium-119.0.6045.105/pdf/document_attachment_info.h
|
||||
--- chromium-119.0.6045.105/pdf/document_attachment_info.h.missing-header-files 2023-11-01 19:10:34.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/pdf/document_attachment_info.h 2023-11-06 14:34:01.815869132 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
|
||||
diff -up chromium-119.0.6045.105/sandbox/linux/syscall_broker/broker_file_permission.h.missing-header-files chromium-119.0.6045.105/sandbox/linux/syscall_broker/broker_file_permission.h
|
||||
--- chromium-119.0.6045.105/sandbox/linux/syscall_broker/broker_file_permission.h.missing-header-files 2023-11-01 19:10:34.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/sandbox/linux/syscall_broker/broker_file_permission.h 2023-11-06 14:34:01.809869004 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
|
||||
#define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <bitset>
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
diff -up chromium-119.0.6045.105/services/device/public/cpp/generic_sensor/sensor_reading.h.missing-header-files chromium-119.0.6045.105/services/device/public/cpp/generic_sensor/sensor_reading.h
|
||||
--- chromium-119.0.6045.105/services/device/public/cpp/generic_sensor/sensor_reading.h.missing-header-files 2023-11-01 19:10:35.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/services/device/public/cpp/generic_sensor/sensor_reading.h 2023-11-06 14:34:01.820869238 +0100
|
||||
@@ -8,6 +8,9 @@
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstddef>
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include <type_traits>
|
||||
|
||||
namespace device {
|
||||
diff -up chromium-119.0.6045.105/skia/ext/skcolorspace_trfn.cc.missing-header-files chromium-119.0.6045.105/skia/ext/skcolorspace_trfn.cc
|
||||
--- chromium-119.0.6045.105/skia/ext/skcolorspace_trfn.cc.missing-header-files 2023-11-01 19:10:35.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/skia/ext/skcolorspace_trfn.cc 2023-11-06 14:34:01.818869196 +0100
|
||||
@@ -3,6 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "skia/ext/skcolorspace_trfn.h"
|
||||
+#include <cmath>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
diff -up chromium-119.0.6045.105/third_party/abseil-cpp/absl/strings/string_view.h.missing-header-files chromium-119.0.6045.105/third_party/abseil-cpp/absl/strings/string_view.h
|
||||
--- chromium-119.0.6045.105/third_party/abseil-cpp/absl/strings/string_view.h.missing-header-files 2023-11-01 19:10:36.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/abseil-cpp/absl/strings/string_view.h 2023-11-06 14:34:01.809869004 +0100
|
||||
@@ -27,6 +27,7 @@
|
||||
#ifndef ABSL_STRINGS_STRING_VIEW_H_
|
||||
#define ABSL_STRINGS_STRING_VIEW_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cstddef>
|
||||
diff -up chromium-119.0.6045.105/third_party/angle/include/GLSLANG/ShaderVars.h.missing-header-files chromium-119.0.6045.105/third_party/angle/include/GLSLANG/ShaderVars.h
|
||||
--- chromium-119.0.6045.105/third_party/angle/include/GLSLANG/ShaderVars.h.missing-header-files 2023-11-01 19:11:59.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/angle/include/GLSLANG/ShaderVars.h 2023-11-06 14:34:01.810869025 +0100
|
||||
@@ -10,6 +10,7 @@
|
||||
#ifndef GLSLANG_SHADERVARS_H_
|
||||
#define GLSLANG_SHADERVARS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
diff -up chromium-119.0.6045.105/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h.missing-header-files chromium-119.0.6045.105/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
|
||||
--- chromium-119.0.6045.105/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h.missing-header-files 2023-11-01 19:10:37.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h 2023-11-06 14:34:01.810869025 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
diff -up chromium-119.0.6045.105/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.missing-header-files chromium-119.0.6045.105/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h
|
||||
--- chromium-119.0.6045.105/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.missing-header-files 2023-11-01 19:13:50.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h 2023-11-06 14:34:01.810869025 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
#ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_
|
||||
#define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
diff -up chromium-119.0.6045.105/third_party/ipcz/src/ipcz/router_link.h.missing-header-files chromium-119.0.6045.105/third_party/ipcz/src/ipcz/router_link.h
|
||||
--- chromium-119.0.6045.105/third_party/ipcz/src/ipcz/router_link.h.missing-header-files 2023-11-01 19:11:20.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/ipcz/src/ipcz/router_link.h 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef IPCZ_SRC_IPCZ_ROUTER_LINK_H_
|
||||
#define IPCZ_SRC_IPCZ_ROUTER_LINK_H_
|
||||
|
||||
+#include <memory>
|
||||
#include <cstddef>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
diff -up chromium-119.0.6045.105/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files chromium-119.0.6045.105/third_party/material_color_utilities/src/cpp/palettes/tones.cc
|
||||
--- chromium-119.0.6045.105/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files 2023-11-01 19:11:53.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/material_color_utilities/src/cpp/palettes/tones.cc 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -14,6 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
+#include <cmath>
|
||||
#include "cpp/palettes/tones.h"
|
||||
|
||||
#include "cpp/cam/cam.h"
|
||||
diff -up chromium-119.0.6045.105/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h.missing-header-files chromium-119.0.6045.105/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
|
||||
--- chromium-119.0.6045.105/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h.missing-header-files 2023-11-01 19:11:59.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h 2023-11-06 14:34:01.810869025 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <map>
|
||||
#include <set>
|
||||
diff -up chromium-119.0.6045.105/third_party/pdfium/constants/annotation_flags.h.missing-header-files chromium-119.0.6045.105/third_party/pdfium/constants/annotation_flags.h
|
||||
--- chromium-119.0.6045.105/third_party/pdfium/constants/annotation_flags.h.missing-header-files 2023-11-01 19:14:48.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/pdfium/constants/annotation_flags.h 2023-11-06 14:34:01.815869132 +0100
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace pdfium {
|
||||
namespace annotation_flags {
|
||||
|
||||
diff -up chromium-119.0.6045.105/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files chromium-119.0.6045.105/third_party/ruy/src/ruy/profiler/instrumentation.h
|
||||
--- chromium-119.0.6045.105/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files 2023-11-01 19:12:02.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-11-06 14:34:01.813869089 +0100
|
||||
@@ -17,6 +17,7 @@ limitations under the License.
|
||||
#define RUY_RUY_PROFILER_INSTRUMENTATION_H_
|
||||
|
||||
#ifdef RUY_PROFILER
|
||||
+#include <string>
|
||||
#include <cstdio>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
diff -up chromium-119.0.6045.105/third_party/swiftshader/src/System/LRUCache.hpp.missing-header-files chromium-119.0.6045.105/third_party/swiftshader/src/System/LRUCache.hpp
|
||||
--- chromium-119.0.6045.105/third_party/swiftshader/src/System/LRUCache.hpp.missing-header-files 2023-11-01 19:12:15.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/swiftshader/src/System/LRUCache.hpp 2023-11-06 14:34:01.810869025 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include "System/Debug.hpp"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
diff -up chromium-119.0.6045.105/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files chromium-119.0.6045.105/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
|
||||
--- chromium-119.0.6045.105/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files 2023-11-01 19:12:42.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "llvm/Support/SaveAndRestore.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <sysexits.h>
|
||||
#ifdef HAVE_BACKTRACE
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.missing-header-files chromium-119.0.6045.105/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
|
||||
--- chromium-119.0.6045.105/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.missing-header-files 2023-11-01 19:13:20.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h 2023-11-06 14:34:01.813869089 +0100
|
||||
@@ -31,6 +31,7 @@ limitations under the License.
|
||||
#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
|
||||
#define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <complex>
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
diff -up chromium-119.0.6045.105/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.missing-header-files chromium-119.0.6045.105/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
|
||||
--- chromium-119.0.6045.105/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.missing-header-files 2023-11-01 19:12:45.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-11-06 14:34:01.817869174 +0100
|
||||
@@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N
|
||||
|
||||
// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
|
||||
#if VMA_STATS_STRING_ENABLED
|
||||
+#include <stdio.h>
|
||||
static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)
|
||||
{
|
||||
snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
|
||||
diff -up chromium-119.0.6045.105/third_party/webrtc/audio/utility/channel_mixer.cc.missing-header-files chromium-119.0.6045.105/third_party/webrtc/audio/utility/channel_mixer.cc
|
||||
--- chromium-119.0.6045.105/third_party/webrtc/audio/utility/channel_mixer.cc.missing-header-files 2023-11-01 19:14:05.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/webrtc/audio/utility/channel_mixer.cc 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -8,6 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#include "audio/utility/channel_mixer.h"
|
||||
|
||||
#include "audio/utility/channel_mixing_matrix.h"
|
||||
diff -up chromium-119.0.6045.105/third_party/webrtc/common_video/h264/sps_parser.h.missing-header-files chromium-119.0.6045.105/third_party/webrtc/common_video/h264/sps_parser.h
|
||||
--- chromium-119.0.6045.105/third_party/webrtc/common_video/h264/sps_parser.h.missing-header-files 2023-11-01 19:14:06.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/webrtc/common_video/h264/sps_parser.h 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef COMMON_VIDEO_H264_SPS_PARSER_H_
|
||||
#define COMMON_VIDEO_H264_SPS_PARSER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include "absl/types/optional.h"
|
||||
#include "rtc_base/bitstream_reader.h"
|
||||
|
||||
diff -up chromium-119.0.6045.105/third_party/webrtc/modules/include/module_common_types_public.h.missing-header-files chromium-119.0.6045.105/third_party/webrtc/modules/include/module_common_types_public.h
|
||||
--- chromium-119.0.6045.105/third_party/webrtc/modules/include/module_common_types_public.h.missing-header-files 2023-11-01 19:14:11.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/webrtc/modules/include/module_common_types_public.h 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
|
||||
#include "absl/types/optional.h"
|
||||
diff -up chromium-119.0.6045.105/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-header-files chromium-119.0.6045.105/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
|
||||
--- chromium-119.0.6045.105/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-header-files 2023-11-01 19:14:12.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include "modules/video_coding/utility/ivf_file_reader.h"
|
||||
|
||||
+#include <cstring>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff -up chromium-119.0.6045.105/ui/base/prediction/kalman_filter.h.missing-header-files chromium-119.0.6045.105/ui/base/prediction/kalman_filter.h
|
||||
--- chromium-119.0.6045.105/ui/base/prediction/kalman_filter.h.missing-header-files 2023-11-01 19:11:28.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/ui/base/prediction/kalman_filter.h 2023-11-06 14:34:01.814869110 +0100
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "base/component_export.h"
|
||||
#include "ui/gfx/geometry/matrix3_f.h"
|
||||
|
||||
diff -up chromium-119.0.6045.105/ui/gfx/geometry/linear_gradient.h.missing-header-files chromium-119.0.6045.105/ui/gfx/geometry/linear_gradient.h
|
||||
--- chromium-119.0.6045.105/ui/gfx/geometry/linear_gradient.h.missing-header-files 2023-11-01 19:11:28.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/ui/gfx/geometry/linear_gradient.h 2023-11-06 14:34:01.812869068 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
diff -up chromium-119.0.6045.105/ui/gfx/linux/drm_util_linux.h.missing-header-files chromium-119.0.6045.105/ui/gfx/linux/drm_util_linux.h
|
||||
--- chromium-119.0.6045.105/ui/gfx/linux/drm_util_linux.h.missing-header-files 2023-11-01 19:11:28.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/ui/gfx/linux/drm_util_linux.h 2023-11-06 14:34:01.819869217 +0100
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
#include "ui/gfx/buffer_types.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace ui {
|
||||
|
||||
int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
|
||||
diff -up chromium-121.0.6167.139/crypto/hkdf.h.me chromium-121.0.6167.139/crypto/hkdf.h
|
||||
--- chromium-121.0.6167.139/crypto/hkdf.h.me 2024-02-03 17:24:49.957949670 +0100
|
||||
+++ chromium-121.0.6167.139/crypto/hkdf.h 2024-02-03 17:26:05.753312178 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
+#include <vector>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
diff -up chromium-121.0.6167.139/ui/display/types/display_color_management.h.me chromium-121.0.6167.139/ui/display/types/display_color_management.h
|
||||
--- chromium-121.0.6167.139/ui/display/types/display_color_management.h.me 2024-02-03 18:55:34.889499101 +0100
|
||||
+++ chromium-121.0.6167.139/ui/display/types/display_color_management.h 2024-02-03 18:55:59.608945624 +0100
|
||||
@@ -6,6 +6,7 @@
|
||||
#define UI_DISPLAY_TYPES_DISPLAY_COLOR_MANAGEMENT_H_
|
||||
|
||||
#include <vector>
|
||||
+#include <memory>
|
||||
|
||||
#include "third_party/skia/modules/skcms/skcms.h"
|
||||
#include "ui/display/types/display_types_export.h"
|
||||
diff -up chromium-121.0.6167.139/ui/gfx/x/visual_manager.cc.me chromium-121.0.6167.139/ui/gfx/x/visual_manager.cc
|
||||
--- chromium-121.0.6167.139/ui/gfx/x/visual_manager.cc.me 2024-02-03 21:20:32.126285578 +0100
|
||||
+++ chromium-121.0.6167.139/ui/gfx/x/visual_manager.cc 2024-02-03 21:20:50.272607248 +0100
|
||||
@@ -2,6 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <bitset>
|
||||
+
|
||||
#include "ui/gfx/x/visual_manager.h"
|
||||
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
diff -up chromium-121.0.6167.139/third_party/blink/renderer/platform/fonts/simple_font_data.h.me chromium-121.0.6167.139/third_party/blink/renderer/platform/fonts/simple_font_data.h
|
||||
--- chromium-121.0.6167.139/third_party/blink/renderer/platform/fonts/simple_font_data.h.me 2024-02-03 22:47:05.632713381 +0100
|
||||
+++ chromium-121.0.6167.139/third_party/blink/renderer/platform/fonts/simple_font_data.h 2024-02-03 22:47:30.788293027 +0100
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
+#include <mutex>
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "third_party/blink/renderer/platform/fonts/canvas_rotation_in_vertical.h"
|
||||
diff -up chromium-121.0.6167.139/chrome/browser/performance_manager/policies/probability_distribution.h.me chromium-121.0.6167.139/chrome/browser/performance_manager/policies/probability_distribution.h
|
||||
--- chromium-121.0.6167.139/chrome/browser/performance_manager/policies/probability_distribution.h.me 2024-02-04 09:26:02.239427860 +0100
|
||||
+++ chromium-121.0.6167.139/chrome/browser/performance_manager/policies/probability_distribution.h 2024-02-04 09:26:10.051565081 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef CHROME_BROWSER_PERFORMANCE_MANAGER_POLICIES_PROBABILITY_DISTRIBUTION_H_
|
||||
#define CHROME_BROWSER_PERFORMANCE_MANAGER_POLICIES_PROBABILITY_DISTRIBUTION_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
@ -1,980 +0,0 @@
|
||||
diff -up chromium-120.0.6099.56/base/metrics/persistent_histogram_allocator.cc.no_matching_constructor chromium-120.0.6099.56/base/metrics/persistent_histogram_allocator.cc
|
||||
--- chromium-120.0.6099.56/base/metrics/persistent_histogram_allocator.cc.no_matching_constructor 2023-11-29 22:39:40.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/base/metrics/persistent_histogram_allocator.cc 2023-12-03 17:31:25.748420189 +0100
|
||||
@@ -218,13 +218,13 @@ PersistentSparseHistogramDataManager::Lo
|
||||
// The sample-record could be for any sparse histogram. Add the reference
|
||||
// to the appropriate collection for later use.
|
||||
if (found_id == match_id) {
|
||||
- found_records.emplace_back(ref, value);
|
||||
+ found_records.emplace_back() = {ref, value};
|
||||
found = true;
|
||||
} else {
|
||||
std::vector<ReferenceAndSample>* samples =
|
||||
GetSampleMapRecordsWhileLocked(found_id);
|
||||
CHECK(samples);
|
||||
- samples->emplace_back(ref, value);
|
||||
+ samples->emplace_back() = {ref, value};
|
||||
}
|
||||
}
|
||||
|
||||
diff -up chromium-120.0.6099.56/base/trace_event/trace_log.cc.no_matching_constructor chromium-120.0.6099.56/base/trace_event/trace_log.cc
|
||||
--- chromium-120.0.6099.56/base/trace_event/trace_log.cc.no_matching_constructor 2023-11-29 22:39:40.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/base/trace_event/trace_log.cc 2023-12-03 17:31:25.749420208 +0100
|
||||
@@ -2191,8 +2191,8 @@ void TraceLog::SetTraceBufferForTesting(
|
||||
#if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
|
||||
void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
|
||||
AutoLock lock(track_event_lock_);
|
||||
- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
|
||||
- args.backend_type);
|
||||
+ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config,
|
||||
+ args.backend_type};
|
||||
}
|
||||
|
||||
void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/content_settings/one_time_permission_provider.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/content_settings/one_time_permission_provider.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/content_settings/one_time_permission_provider.cc.no_matching_constructor 2023-11-29 22:39:47.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/content_settings/one_time_permission_provider.cc 2023-12-03 17:31:25.749420208 +0100
|
||||
@@ -226,8 +226,8 @@ void OneTimePermissionProvider::OnSuspen
|
||||
|
||||
while (rule_iterator && rule_iterator->HasNext()) {
|
||||
auto rule = rule_iterator->Next();
|
||||
- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
|
||||
- rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {setting_type, rule->primary_pattern,
|
||||
+ rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
setting_type,
|
||||
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
|
||||
@@ -329,8 +329,8 @@ void OneTimePermissionProvider::DeleteEn
|
||||
auto rule = rule_iterator->Next();
|
||||
if (rule->primary_pattern.Matches(origin_gurl) &&
|
||||
rule->secondary_pattern.Matches(origin_gurl)) {
|
||||
- patterns_to_delete.emplace_back(
|
||||
- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back() = {
|
||||
+ content_setting_type, rule->primary_pattern, rule->secondary_pattern};
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
content_setting_type, trigger_event);
|
||||
}
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.no_matching_constructor 2023-11-29 22:39:48.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc 2023-12-03 17:31:25.749420208 +0100
|
||||
@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
|
||||
// TODO(crbug.com/1445072): Add actual domains with attribute names.
|
||||
profile_attributes->insert(std::make_pair(
|
||||
"supported.test",
|
||||
- SAMLProfileAttributes("placeholderName", "placeholderDomain",
|
||||
- "placeholderToken")));
|
||||
+ SAMLProfileAttributes{"placeholderName", "placeholderDomain",
|
||||
+ "placeholderToken"}));
|
||||
|
||||
// Extract domains and attributes from the command line switch.
|
||||
const base::CommandLine& command_line =
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.no_matching_constructor 2023-11-29 22:39:52.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/ui/omnibox/chrome_omnibox_client.cc 2023-12-03 17:31:25.749420208 +0100
|
||||
@@ -474,10 +474,10 @@ void ChromeOmniboxClient::OnAutocomplete
|
||||
alternative_nav_match);
|
||||
|
||||
// Store the details necessary to open the omnibox match via browser commands.
|
||||
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
|
||||
+ location_bar_->set_navigation_params(LocationBar::NavigationParams{
|
||||
destination_url, disposition, transition, match_selection_timestamp,
|
||||
destination_url_entered_without_scheme,
|
||||
- destination_url_entered_with_http_scheme));
|
||||
+ destination_url_entered_with_http_scheme});
|
||||
|
||||
if (browser_) {
|
||||
auto navigation = chrome::OpenCurrentURL(browser_);
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/ui/safety_hub/menu_notification_service.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/ui/safety_hub/menu_notification_service.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/ui/safety_hub/menu_notification_service.cc.no_matching_constructor 2023-11-29 22:39:52.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/ui/safety_hub/menu_notification_service.cc 2023-12-03 17:31:25.756420342 +0100
|
||||
@@ -148,8 +148,8 @@ SafetyHubMenuNotificationService::GetNot
|
||||
// The information related to showing the notification needs to be persisted
|
||||
// as well.
|
||||
SaveNotificationsToPrefs();
|
||||
- return MenuNotificationEntry(notification_to_show->GetNotificationCommandId(),
|
||||
- notification_to_show->GetNotificationString());
|
||||
+ return MenuNotificationEntry{notification_to_show->GetNotificationCommandId(),
|
||||
+ notification_to_show->GetNotificationString()};
|
||||
}
|
||||
|
||||
absl::optional<ResultMap>
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc.no_matching_constructor 2023-11-29 22:39:53.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc 2023-12-03 17:31:25.749420208 +0100
|
||||
@@ -55,12 +55,12 @@ std::vector<EmbeddedPermissionPromptAskV
|
||||
EmbeddedPermissionPromptAskView::GetButtonsConfiguration() const {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
if (base::FeatureList::IsEnabled(permissions::features::kOneTimePermission)) {
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME),
|
||||
- ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal};
|
||||
}
|
||||
- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
- ButtonType::kAllow, ui::ButtonStyle::kTonal, kAllowId);
|
||||
+ buttons.emplace_back() = {l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
+ ButtonType::kAllow, ui::ButtonStyle::kTonal, kAllowId};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h.no_matching_constructor chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
|
||||
--- chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h.no_matching_constructor 2023-11-29 22:39:53.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h 2023-12-03 17:31:25.750420227 +0100
|
||||
@@ -86,6 +86,7 @@ class EmbeddedPermissionPromptBaseView :
|
||||
struct RequestLineConfiguration {
|
||||
const raw_ptr<const gfx::VectorIcon> icon;
|
||||
std::u16string message;
|
||||
+ RequestLineConfiguration(auto i, auto m) : icon(i), message(m) { }
|
||||
};
|
||||
|
||||
struct ButtonConfiguration {
|
||||
diff -up chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc.no_matching_constructor chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc
|
||||
--- chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc.no_matching_constructor 2023-11-29 22:39:53.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc 2023-12-03 17:31:25.750420227 +0100
|
||||
@@ -48,8 +48,8 @@ EmbeddedPermissionPromptPolicyView::GetR
|
||||
std::vector<EmbeddedPermissionPromptPolicyView::ButtonConfiguration>
|
||||
EmbeddedPermissionPromptPolicyView::GetButtonsConfiguration() const {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_OK_LABEL),
|
||||
- ButtonType::kPolicyOK, ui::ButtonStyle::kTonal);
|
||||
+ buttons.emplace_back() = {l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_OK_LABEL),
|
||||
+ ButtonType::kPolicyOK, ui::ButtonStyle::kTonal};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
diff -up chromium-120.0.6099.56/chrome/test/chromedriver/capabilities.cc.no_matching_constructor chromium-120.0.6099.56/chrome/test/chromedriver/capabilities.cc
|
||||
--- chromium-120.0.6099.56/chrome/test/chromedriver/capabilities.cc.no_matching_constructor 2023-11-29 22:39:54.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/chrome/test/chromedriver/capabilities.cc 2023-12-03 17:31:25.750420227 +0100
|
||||
@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base::
|
||||
"'version' field of type string");
|
||||
}
|
||||
|
||||
- brands.emplace_back(*brand, *version);
|
||||
+ brands.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.brands = std::move(brands);
|
||||
@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base::
|
||||
"a 'version' field of type string");
|
||||
}
|
||||
|
||||
- full_version_list.emplace_back(*brand, *version);
|
||||
+ full_version_list.emplace_back() = {*brand, *version};
|
||||
}
|
||||
|
||||
client_hints.full_version_list = std::move(full_version_list);
|
||||
diff -up chromium-120.0.6099.56/components/autofill/core/browser/contact_info_sync_util.cc.no_matching_constructor chromium-120.0.6099.56/components/autofill/core/browser/contact_info_sync_util.cc
|
||||
--- chromium-120.0.6099.56/components/autofill/core/browser/contact_info_sync_util.cc.no_matching_constructor 2023-11-29 22:39:57.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/components/autofill/core/browser/contact_info_sync_util.cc 2023-12-03 17:31:25.750420227 +0100
|
||||
@@ -197,9 +197,9 @@ class ContactInfoProfileSetter {
|
||||
CHECK(observations.empty());
|
||||
for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation :
|
||||
metadata.observations()) {
|
||||
- observations.emplace_back(proto_observation.type(),
|
||||
+ observations.emplace_back() = {static_cast<unsigned char>(proto_observation.type()),
|
||||
ProfileTokenQuality::FormSignatureHash(
|
||||
- proto_observation.form_hash()));
|
||||
+ proto_observation.form_hash())};
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up chromium-120.0.6099.56/components/autofill/core/browser/webdata/autofill_table.cc.no_matching_constructor chromium-120.0.6099.56/components/autofill/core/browser/webdata/autofill_table.cc
|
||||
--- chromium-120.0.6099.56/components/autofill/core/browser/webdata/autofill_table.cc.no_matching_constructor 2023-11-29 22:39:57.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/components/autofill/core/browser/webdata/autofill_table.cc 2023-12-03 17:31:25.751420246 +0100
|
||||
@@ -1763,10 +1763,10 @@ std::unique_ptr<AutofillProfile> Autofil
|
||||
}
|
||||
|
||||
base::span<const uint8_t> observations_data = s.ColumnBlob(3);
|
||||
- field_type_values.emplace_back(
|
||||
+ field_type_values.emplace_back() = {
|
||||
type, s.ColumnString16(1), s.ColumnInt(2),
|
||||
std::vector<uint8_t>(observations_data.begin(),
|
||||
- observations_data.end()));
|
||||
+ observations_data.end())};
|
||||
|
||||
if (type == ADDRESS_HOME_COUNTRY) {
|
||||
country_code = base::UTF16ToUTF8(s.ColumnString16(1));
|
||||
diff -up chromium-120.0.6099.56/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.no_matching_constructor chromium-120.0.6099.56/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
--- chromium-120.0.6099.56/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.no_matching_constructor 2023-11-29 22:40:01.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc 2023-12-03 17:31:25.751420246 +0100
|
||||
@@ -1567,7 +1567,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut
|
||||
|
||||
// Issue readbacks from the surfaces:
|
||||
for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
|
||||
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
|
||||
+ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
|
||||
SkImageInfo dst_info = SkImageInfo::Make(
|
||||
size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
|
||||
kUnpremul_SkAlphaType);
|
||||
diff -up chromium-120.0.6099.56/content/browser/download/save_package.cc.no_matching_constructor chromium-120.0.6099.56/content/browser/download/save_package.cc
|
||||
--- chromium-120.0.6099.56/content/browser/download/save_package.cc.no_matching_constructor 2023-11-29 22:40:01.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/content/browser/download/save_package.cc 2023-12-03 17:31:25.752420265 +0100
|
||||
@@ -767,8 +767,8 @@ void SavePackage::Finish() {
|
||||
if (download_) {
|
||||
std::vector<download::DownloadSaveItemData::ItemInfo> files;
|
||||
for (auto& item : saved_success_items_) {
|
||||
- files.emplace_back(item.second->full_path(), item.second->url(),
|
||||
- item.second->referrer().url);
|
||||
+ files.emplace_back() = {item.second->full_path(), item.second->url(),
|
||||
+ item.second->referrer().url};
|
||||
}
|
||||
download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
|
||||
}
|
||||
diff -up chromium-120.0.6099.56/content/browser/interest_group/interest_group_storage.cc.no_matching_constructor chromium-120.0.6099.56/content/browser/interest_group/interest_group_storage.cc
|
||||
--- chromium-120.0.6099.56/content/browser/interest_group/interest_group_storage.cc.no_matching_constructor 2023-11-29 22:40:01.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/content/browser/interest_group/interest_group_storage.cc 2023-12-03 17:31:25.752420265 +0100
|
||||
@@ -3002,10 +3002,10 @@ DoGetKAnonymityData(sql::Database& db,
|
||||
|
||||
std::vector<StorageInterestGroup::KAnonymityData> k_anon_data;
|
||||
while (interest_group_kanon_query.Step()) {
|
||||
- k_anon_data.emplace_back(
|
||||
+ k_anon_data.emplace_back() = {
|
||||
/*key=*/interest_group_kanon_query.ColumnString(0),
|
||||
/*is_k_anonymous=*/interest_group_kanon_query.ColumnBool(1),
|
||||
- /*last_updated=*/interest_group_kanon_query.ColumnTime(2));
|
||||
+ /*last_updated=*/interest_group_kanon_query.ColumnTime(2)};
|
||||
}
|
||||
if (!interest_group_kanon_query.Succeeded()) {
|
||||
return absl::nullopt;
|
||||
diff -up chromium-120.0.6099.56/net/dns/host_resolver_cache.cc.no_matching_constructor chromium-120.0.6099.56/net/dns/host_resolver_cache.cc
|
||||
--- chromium-120.0.6099.56/net/dns/host_resolver_cache.cc.no_matching_constructor 2023-11-29 22:40:07.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/net/dns/host_resolver_cache.cc 2023-12-03 17:31:25.754420303 +0100
|
||||
@@ -368,7 +368,7 @@ void HostResolverCache::Set(
|
||||
|
||||
std::string domain_name = result->domain_name();
|
||||
entries_.emplace(
|
||||
- Key(std::move(domain_name), network_anonymization_key),
|
||||
+ Key{std::move(domain_name), network_anonymization_key},
|
||||
Entry(std::move(result), source, secure, staleness_generation));
|
||||
|
||||
if (entries_.size() > max_entries_) {
|
||||
diff -up chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/font_palette.h.no_matching_constructor chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/font_palette.h
|
||||
--- chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/font_palette.h.no_matching_constructor 2023-11-29 22:40:12.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/font_palette.h 2023-12-03 17:31:25.754420303 +0100
|
||||
@@ -96,7 +96,7 @@ class PLATFORM_EXPORT FontPalette : publ
|
||||
Color::ColorSpace color_interpolation_space,
|
||||
absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
|
||||
return base::AdoptRef(new FontPalette(
|
||||
- start, end, NonNormalizedPercentages(start_percentage, end_percentage),
|
||||
+ start, end, NonNormalizedPercentages{start_percentage, end_percentage},
|
||||
normalized_percentage, alpha_multiplier, color_interpolation_space,
|
||||
hue_interpolation_method));
|
||||
}
|
||||
@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontPalette : publ
|
||||
double normalized_percentage) {
|
||||
double end_percentage = normalized_percentage * 100.0;
|
||||
double start_percentage = 100.0 - end_percentage;
|
||||
- return NonNormalizedPercentages(start_percentage, end_percentage);
|
||||
+ return NonNormalizedPercentages{start_percentage, end_percentage};
|
||||
}
|
||||
|
||||
double GetAlphaMultiplier() const {
|
||||
diff -up chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.no_matching_constructor chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
--- chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.no_matching_constructor 2023-11-29 22:40:12.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/third_party/blink/renderer/platform/fonts/palette_interpolation.cc 2023-12-03 17:31:25.755420323 +0100
|
||||
@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride>
|
||||
color_interpolation_space, hue_interpolation_method, start_color,
|
||||
end_color, percentage, alpha_multiplier);
|
||||
|
||||
- FontPalette::FontPaletteOverride result_color_record(i, result_color);
|
||||
+ FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
|
||||
result_color_records.push_back(result_color_record);
|
||||
}
|
||||
return result_color_records;
|
||||
diff -up chromium-120.0.6099.56/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp.no_matching_constructor chromium-120.0.6099.56/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp
|
||||
--- chromium-120.0.6099.56/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp.no_matching_constructor 2023-11-29 22:41:46.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp 2023-12-03 17:31:25.756420342 +0100
|
||||
@@ -491,7 +491,7 @@ void CPDF_RenderStatus::ProcessClipPath(
|
||||
} else {
|
||||
m_pDevice->SetClip_PathFill(
|
||||
*pPath, &mtObj2Device,
|
||||
- CFX_FillRenderOptions(ClipPath.GetClipType(i)));
|
||||
+ CFX_FillRenderOptions{ClipPath.GetClipType(i)});
|
||||
}
|
||||
}
|
||||
|
||||
diff -up chromium-120.0.6099.56/ui/base/wayland/color_manager_util.h.no_matching_constructor chromium-120.0.6099.56/ui/base/wayland/color_manager_util.h
|
||||
--- chromium-120.0.6099.56/ui/base/wayland/color_manager_util.h.no_matching_constructor 2023-11-29 22:40:44.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/ui/base/wayland/color_manager_util.h 2023-12-03 17:31:25.755420323 +0100
|
||||
@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::
|
||||
zcr_color_manager_v1_chromaticity_names,
|
||||
PrimaryVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::BT470M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::XYZ_D50,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST431_2,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::FILM,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}});
|
||||
|
||||
// A map from the zcr_color_manager_v1 eotf_names enum values
|
||||
// representing well-known EOTFs, to their equivalent TransferIDs.
|
||||
@@ -107,68 +107,68 @@ constexpr auto kEotfMap = base::MakeFixe
|
||||
zcr_color_manager_v1_eotf_names,
|
||||
TransferVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB_HDR,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB_HDR,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT709,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
// This is ever so slightly inaccurate. The number ought to be
|
||||
// 2.19921875f, not 2.2
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::HLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::HLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::IEC61966_2_4,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}},
|
||||
});
|
||||
|
||||
// A map from the SDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -177,18 +177,18 @@ constexpr auto kEotfMap = base::MakeFixe
|
||||
constexpr auto kTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kRec709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferFnVersion(gamma24, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{gamma24, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kA98RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
});
|
||||
|
||||
// A map from the HDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -197,70 +197,70 @@ constexpr auto kTransferMap =
|
||||
constexpr auto kHDRTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGB,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB_HDR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferFnVersion(SkNamedTransferFn::kHLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kHLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGBExtended1023Over510,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 matrix_names enum values to
|
||||
// gfx::ColorSpace::MatrixIDs.
|
||||
constexpr auto kMatrixMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT709,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG,
|
||||
- MatrixVersion(
|
||||
+ MatrixVersion{
|
||||
gfx::ColorSpace::MatrixID::BT470BG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::GBR,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 range_names enum values to
|
||||
// gfx::ColorSpace::RangeIDs.
|
||||
constexpr auto kRangeMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
|
||||
- kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::DERIVED,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity(
|
||||
gfx::ColorSpace::PrimaryID primaryID,
|
||||
@@ -283,4 +283,4 @@ zcr_color_manager_v1_eotf_names ToColorM
|
||||
|
||||
} // namespace ui::wayland
|
||||
|
||||
-#endif // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
+#endif // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
|
||||
diff -up chromium-120.0.6099.56/ui/gtk/gtk_ui.cc.no_matching_constructor chromium-120.0.6099.56/ui/gtk/gtk_ui.cc
|
||||
--- chromium-120.0.6099.56/ui/gtk/gtk_ui.cc.no_matching_constructor 2023-11-29 22:40:44.000000000 +0100
|
||||
+++ chromium-120.0.6099.56/ui/gtk/gtk_ui.cc 2023-12-03 17:31:25.756420342 +0100
|
||||
@@ -1013,11 +1013,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi
|
||||
GdkRectangle geometry;
|
||||
gdk_monitor_get_geometry(monitor, &geometry);
|
||||
int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
|
||||
- config.display_geometries.emplace_back(
|
||||
+ config.display_geometries.emplace_back() = {
|
||||
gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
|
||||
monitor_scale * geometry.width,
|
||||
monitor_scale * geometry.height),
|
||||
- monitor_scale * font_scale);
|
||||
+ static_cast<float>(monitor_scale * font_scale)};
|
||||
}
|
||||
return config;
|
||||
}
|
||||
diff -up chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc.than chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc
|
||||
--- chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc.than 2023-12-19 17:13:15.116949814 +0100
|
||||
+++ chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc 2023-12-19 17:27:18.807102716 +0100
|
||||
@@ -66,17 +66,17 @@ EmbeddedPermissionPromptPreviouslyDenied
|
||||
std::vector<EmbeddedPermissionPromptPreviouslyDeniedView::ButtonConfiguration>
|
||||
EmbeddedPermissionPromptPreviouslyDeniedView::GetButtonsConfiguration() const {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_CONTINUE_NOT_ALLOWING),
|
||||
- ButtonType::kContinueNotAllowing, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kContinueNotAllowing, ui::ButtonStyle::kTonal};
|
||||
|
||||
if (base::FeatureList::IsEnabled(permissions::features::kOneTimePermission)) {
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME),
|
||||
- ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId);
|
||||
+ ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId};
|
||||
} else {
|
||||
- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
- ButtonType::kAllow, ui::ButtonStyle::kTonal);
|
||||
+ buttons.emplace_back() = {l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW),
|
||||
+ ButtonType::kAllow, ui::ButtonStyle::kTonal};
|
||||
}
|
||||
return buttons;
|
||||
}
|
||||
diff -up chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc.than chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc
|
||||
--- chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc.than 2023-12-19 17:39:17.818834020 +0100
|
||||
+++ chromium-121.0.6167.16/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc 2023-12-19 17:44:15.346337876 +0100
|
||||
@@ -61,13 +61,13 @@ EmbeddedPermissionPromptPreviouslyGrante
|
||||
std::vector<EmbeddedPermissionPromptPreviouslyGrantedView::ButtonConfiguration>
|
||||
EmbeddedPermissionPromptPreviouslyGrantedView::GetButtonsConfiguration() const {
|
||||
std::vector<ButtonConfiguration> buttons;
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_CONTINUE_ALLOWING),
|
||||
- ButtonType::kContinueAllowing, ui::ButtonStyle::kTonal);
|
||||
+ ButtonType::kContinueAllowing, ui::ButtonStyle::kTonal};
|
||||
|
||||
- buttons.emplace_back(
|
||||
+ buttons.emplace_back() = {
|
||||
l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_STOP_ALLOWING),
|
||||
- ButtonType::kStopAllowing, ui::ButtonStyle::kTonal, kStopAllowingId);
|
||||
+ ButtonType::kStopAllowing, ui::ButtonStyle::kTonal, kStopAllowingId};
|
||||
return buttons;
|
||||
}
|
||||
|
||||
diff -up chromium-121.0.6167.16/components/password_manager/core/browser/password_manager.cc.than chromium-121.0.6167.16/components/password_manager/core/browser/password_manager.cc
|
||||
--- chromium-121.0.6167.16/components/password_manager/core/browser/password_manager.cc.than 2023-12-19 17:39:17.819834039 +0100
|
||||
+++ chromium-121.0.6167.16/components/password_manager/core/browser/password_manager.cc 2023-12-19 17:48:33.144389081 +0100
|
||||
@@ -666,7 +666,7 @@ void PasswordManager::OnUserModifiedNonP
|
||||
it->second.last_change = base::Time::Now();
|
||||
} else {
|
||||
possible_usernames_.Put(
|
||||
- PossibleUsernameFieldIdentifier(driver_id, renderer_id),
|
||||
+ PossibleUsernameFieldIdentifier{driver_id, renderer_id},
|
||||
PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()),
|
||||
renderer_id, value, base::Time::Now(), driver_id,
|
||||
autocomplete_attribute_has_username,
|
||||
diff -up chromium-121.0.6167.16/content/browser/renderer_host/render_frame_host_impl.cc.than chromium-121.0.6167.16/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- chromium-121.0.6167.16/content/browser/renderer_host/render_frame_host_impl.cc.than 2023-12-19 17:39:17.825834156 +0100
|
||||
+++ chromium-121.0.6167.16/content/browser/renderer_host/render_frame_host_impl.cc 2023-12-19 17:53:43.153283847 +0100
|
||||
@@ -8561,7 +8561,7 @@ void RenderFrameHostImpl::SendFencedFram
|
||||
for (const blink::FencedFrame::ReportingDestination& destination :
|
||||
destinations) {
|
||||
SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationEnumEvent(event_type, event_data), destination,
|
||||
+ DestinationEnumEvent{event_type, event_data}, destination,
|
||||
attribution_reporting_runtime_features);
|
||||
}
|
||||
}
|
||||
@@ -8593,7 +8593,7 @@ void RenderFrameHostImpl::SendFencedFram
|
||||
}
|
||||
|
||||
SendFencedFrameReportingBeaconInternal(
|
||||
- DestinationURLEvent(destination_url),
|
||||
+ DestinationURLEvent{destination_url},
|
||||
blink::FencedFrame::ReportingDestination::kBuyer,
|
||||
attribution_reporting_runtime_features);
|
||||
}
|
||||
@@ -8730,7 +8730,7 @@ void RenderFrameHostImpl::MaybeSendFence
|
||||
data = info->data;
|
||||
}
|
||||
initiator_rfh->SendFencedFrameReportingBeaconInternal(
|
||||
- AutomaticBeaconEvent(event_type, data), destination,
|
||||
+ AutomaticBeaconEvent{event_type, data}, destination,
|
||||
attribution_reporting_features, navigation_request.GetNavigationId());
|
||||
}
|
||||
} else {
|
||||
@@ -8741,7 +8741,7 @@ void RenderFrameHostImpl::MaybeSendFence
|
||||
for (blink::FencedFrame::ReportingDestination destination :
|
||||
info->destinations) {
|
||||
initiator_rfh->SendFencedFrameReportingBeaconInternal(
|
||||
- AutomaticBeaconEvent(event_type, info->data), destination,
|
||||
+ AutomaticBeaconEvent{event_type, info->data}, destination,
|
||||
info->attribution_reporting_runtime_features,
|
||||
navigation_request.GetNavigationId());
|
||||
}
|
||||
diff -up chromium-121.0.6167.57/base/nix/mime_util_xdg.cc.me chromium-121.0.6167.57/base/nix/mime_util_xdg.cc
|
||||
--- chromium-121.0.6167.57/base/nix/mime_util_xdg.cc.me 2024-01-21 16:54:15.261844448 +0100
|
||||
+++ chromium-121.0.6167.57/base/nix/mime_util_xdg.cc 2024-01-21 16:55:48.705577424 +0100
|
||||
@@ -56,7 +56,7 @@ void LoadAllMimeCacheFiles(MimeTypeMap&
|
||||
for (const auto& path : GetXDGDataSearchLocations(env.get())) {
|
||||
FilePath mime_cache = path.Append("mime/mime.cache");
|
||||
if (GetFileInfo(mime_cache, &info) && ParseMimeTypes(mime_cache, map)) {
|
||||
- files.emplace_back(mime_cache, info.last_modified);
|
||||
+ files.emplace_back() = {mime_cache, info.last_modified};
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up chromium-121.0.6167.57/components/performance_manager/worker_watcher.cc.me chromium-121.0.6167.57/components/performance_manager/worker_watcher.cc
|
||||
--- chromium-121.0.6167.57/components/performance_manager/worker_watcher.cc.me 2024-01-21 18:11:31.397859608 +0100
|
||||
+++ chromium-121.0.6167.57/components/performance_manager/worker_watcher.cc 2024-01-21 18:20:07.715415037 +0100
|
||||
@@ -239,7 +239,7 @@ void WorkerWatcher::OnWorkerCreated(
|
||||
DCHECK(insertion_result.second);
|
||||
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&,
|
||||
this](const content::GlobalRenderFrameHostId& render_frame_host_id) {
|
||||
AddFrameClientConnection(insertion_result.first->second.get(),
|
||||
@@ -248,7 +248,7 @@ void WorkerWatcher::OnWorkerCreated(
|
||||
[&, this](blink::DedicatedWorkerToken dedicated_worker_token) {
|
||||
ConnectDedicatedWorkerClient(insertion_result.first->second.get(),
|
||||
dedicated_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
creator);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ void WorkerWatcher::OnBeforeWorkerDestro
|
||||
// First disconnect the creator's node from this worker node.
|
||||
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&,
|
||||
this](const content::GlobalRenderFrameHostId& render_frame_host_id) {
|
||||
RemoveFrameClientConnection(worker_node.get(),
|
||||
@@ -274,7 +274,7 @@ void WorkerWatcher::OnBeforeWorkerDestro
|
||||
[&, this](blink::DedicatedWorkerToken dedicated_worker_token) {
|
||||
DisconnectDedicatedWorkerClient(worker_node.get(),
|
||||
dedicated_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
creator);
|
||||
|
||||
// Disconnect all child workers before destroying the node.
|
||||
@@ -446,7 +446,7 @@ void WorkerWatcher::OnControlleeAdded(
|
||||
const std::string& client_uuid,
|
||||
const content::ServiceWorkerClientInfo& client_info) {
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&, this](content::GlobalRenderFrameHostId render_frame_host_id) {
|
||||
// For window clients, it is necessary to wait until the navigation
|
||||
// has committed to a RenderFrameHost.
|
||||
@@ -484,7 +484,7 @@ void WorkerWatcher::OnControlleeAdded(
|
||||
ConnectSharedWorkerClient(service_worker_node,
|
||||
shared_worker_token);
|
||||
}
|
||||
- }),
|
||||
+ }},
|
||||
client_info);
|
||||
}
|
||||
|
||||
@@ -524,7 +524,7 @@ void WorkerWatcher::OnControlleeRemoved(
|
||||
return;
|
||||
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&, this](content::GlobalRenderFrameHostId render_frame_host_id) {
|
||||
RemoveFrameClientConnection(worker_node, render_frame_host_id);
|
||||
},
|
||||
@@ -534,7 +534,7 @@ void WorkerWatcher::OnControlleeRemoved(
|
||||
},
|
||||
[&, this](blink::SharedWorkerToken shared_worker_token) {
|
||||
DisconnectSharedWorkerClient(worker_node, shared_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
client);
|
||||
}
|
||||
|
||||
@@ -810,7 +810,7 @@ void WorkerWatcher::ConnectAllServiceWor
|
||||
|
||||
for (const auto& kv : it->second) {
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&, this](content::GlobalRenderFrameHostId render_frame_host_id) {
|
||||
AddFrameClientConnection(service_worker_node,
|
||||
render_frame_host_id);
|
||||
@@ -822,7 +822,7 @@ void WorkerWatcher::ConnectAllServiceWor
|
||||
[&, this](blink::SharedWorkerToken shared_worker_token) {
|
||||
ConnectSharedWorkerClient(service_worker_node,
|
||||
shared_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
kv.second);
|
||||
}
|
||||
}
|
||||
@@ -837,7 +837,7 @@ void WorkerWatcher::DisconnectAllService
|
||||
|
||||
for (const auto& kv : it->second) {
|
||||
absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[&, this](
|
||||
const content::GlobalRenderFrameHostId& render_frame_host_id) {
|
||||
RemoveFrameClientConnection(service_worker_node,
|
||||
@@ -851,7 +851,7 @@ void WorkerWatcher::DisconnectAllService
|
||||
[&, this](const blink::SharedWorkerToken& shared_worker_token) {
|
||||
DisconnectSharedWorkerClient(service_worker_node,
|
||||
shared_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
kv.second);
|
||||
}
|
||||
}
|
||||
diff -up chromium-121.0.6167.57/content/browser/first_party_sets/first_party_set_parser.cc.me chromium-121.0.6167.57/content/browser/first_party_sets/first_party_set_parser.cc
|
||||
--- chromium-121.0.6167.57/content/browser/first_party_sets/first_party_set_parser.cc.me 2024-01-21 18:40:52.284389286 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/first_party_sets/first_party_set_parser.cc 2024-01-21 18:41:17.276840222 +0100
|
||||
@@ -764,7 +764,7 @@ FirstPartySetParser::ParseSetsFromEnterp
|
||||
context.GetPolicySetsFromList(
|
||||
policy.FindList(kFirstPartySetPolicyAdditionsField),
|
||||
PolicySetType::kAddition));
|
||||
- return ParsedPolicySetLists(std::move(replacements), std::move(additions));
|
||||
+ return ParsedPolicySetLists{std::move(replacements), std::move(additions)};
|
||||
}();
|
||||
|
||||
context.PostProcessSetLists(set_lists);
|
||||
diff -up chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.h.me chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.h
|
||||
--- chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.h.me 2024-01-21 19:30:00.536387844 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/interest_group/header_direct_from_seller_signals.h 2024-01-21 20:29:50.236287514 +0100
|
||||
@@ -133,6 +133,7 @@ class CONTENT_EXPORT HeaderDirectFromSel
|
||||
|
||||
// The Ad-Auction-Signals response served by `origin`.
|
||||
std::string response_json;
|
||||
+ UnprocessedResponse(auto u, auto s) : origin(u), response_json(s) { }
|
||||
};
|
||||
|
||||
// Information from ParseAndFind() calls used by ParseAndFindCompleted.
|
||||
diff -up chromium-121.0.6167.57/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc.me chromium-121.0.6167.57/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc
|
||||
--- chromium-121.0.6167.57/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc.me 2024-01-21 21:58:48.773366301 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc 2024-01-21 22:02:17.956086167 +0100
|
||||
@@ -360,10 +360,10 @@ ServiceWorkerMainResourceLoaderIntercept
|
||||
}
|
||||
auto* storage_partition = process->GetStoragePartition();
|
||||
|
||||
- return absl::visit(base::Overloaded([&, this](auto token) {
|
||||
+ return absl::visit(base::Overloaded{[&, this](auto token) {
|
||||
return GetStorageKeyFromWorkerHost(storage_partition,
|
||||
token, origin);
|
||||
- }),
|
||||
+ }},
|
||||
*worker_token_);
|
||||
}
|
||||
|
||||
diff -up chromium-121.0.6167.57/content/browser/service_worker/service_worker_container_host.cc.me chromium-121.0.6167.57/content/browser/service_worker/service_worker_container_host.cc
|
||||
--- chromium-121.0.6167.57/content/browser/service_worker/service_worker_container_host.cc.me 2024-01-21 22:04:30.446454697 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/service_worker/service_worker_container_host.cc 2024-01-21 22:05:22.847391481 +0100
|
||||
@@ -870,7 +870,7 @@ ServiceWorkerContainerHost::GetClientTyp
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
DCHECK(client_info_);
|
||||
return absl::visit(
|
||||
- base::Overloaded(
|
||||
+ base::Overloaded{
|
||||
[](GlobalRenderFrameHostId render_frame_host_id) {
|
||||
return blink::mojom::ServiceWorkerClientType::kWindow;
|
||||
},
|
||||
@@ -879,7 +879,7 @@ ServiceWorkerContainerHost::GetClientTyp
|
||||
},
|
||||
[](blink::SharedWorkerToken shared_worker_token) {
|
||||
return blink::mojom::ServiceWorkerClientType::kSharedWorker;
|
||||
- }),
|
||||
+ }},
|
||||
*client_info_);
|
||||
}
|
||||
|
||||
diff -up chromium-121.0.6167.57/content/browser/worker_host/dedicated_worker_host.cc.me chromium-121.0.6167.57/content/browser/worker_host/dedicated_worker_host.cc
|
||||
--- chromium-121.0.6167.57/content/browser/worker_host/dedicated_worker_host.cc.me 2024-01-21 22:37:00.969416148 +0100
|
||||
+++ chromium-121.0.6167.57/content/browser/worker_host/dedicated_worker_host.cc 2024-01-21 22:38:07.754528335 +0100
|
||||
@@ -251,7 +251,7 @@ void DedicatedWorkerHost::StartScriptLoa
|
||||
RenderFrameHostImpl* creator_render_frame_host = nullptr;
|
||||
DedicatedWorkerHost* creator_worker = nullptr;
|
||||
|
||||
- absl::visit(base::Overloaded(
|
||||
+ absl::visit(base::Overloaded{
|
||||
[&](const GlobalRenderFrameHostId& render_frame_host_id) {
|
||||
creator_render_frame_host =
|
||||
RenderFrameHostImpl::FromID(render_frame_host_id);
|
||||
@@ -259,7 +259,7 @@ void DedicatedWorkerHost::StartScriptLoa
|
||||
[&](blink::DedicatedWorkerToken dedicated_worker_token) {
|
||||
creator_worker = service_->GetDedicatedWorkerHostFromToken(
|
||||
dedicated_worker_token);
|
||||
- }),
|
||||
+ }},
|
||||
creator_);
|
||||
|
||||
if (!creator_render_frame_host && !creator_worker) {
|
||||
diff -up chromium-121.0.6167.139/chrome/browser/ui/autofill/autofill_context_menu_manager.cc.me chromium-121.0.6167.139/chrome/browser/ui/autofill/autofill_context_menu_manager.cc
|
||||
--- chromium-121.0.6167.139/chrome/browser/ui/autofill/autofill_context_menu_manager.cc.me 2024-02-02 21:07:42.852096466 +0100
|
||||
+++ chromium-121.0.6167.139/chrome/browser/ui/autofill/autofill_context_menu_manager.cc 2024-02-02 21:07:49.336212697 +0100
|
||||
@@ -249,8 +249,8 @@ void AutofillContextMenuManager::Execute
|
||||
AutofillManager& manager) {
|
||||
auto& driver = static_cast<ContentAutofillDriver&>(manager.driver());
|
||||
driver.browser_events().RendererShouldTriggerSuggestions(
|
||||
- FieldGlobalId(driver.GetFrameToken(),
|
||||
- FieldRendererId(params_.field_renderer_id)),
|
||||
+ FieldGlobalId{driver.GetFrameToken(),
|
||||
+ FieldRendererId(params_.field_renderer_id)},
|
||||
AutofillSuggestionTriggerSource::kManualFallbackPayments);
|
||||
}
|
||||
|
||||
diff -up chromium-121.0.6167.139/chrome/browser/ui/web_applications/sub_apps_service_impl.cc.me chromium-121.0.6167.139/chrome/browser/ui/web_applications/sub_apps_service_impl.cc
|
||||
--- chromium-121.0.6167.139/chrome/browser/ui/web_applications/sub_apps_service_impl.cc.me 2024-02-02 22:24:28.167153031 +0100
|
||||
+++ chromium-121.0.6167.139/chrome/browser/ui/web_applications/sub_apps_service_impl.cc 2024-02-02 22:26:43.994144340 +0100
|
||||
@@ -102,7 +102,7 @@ AddOptionsFromMojo(
|
||||
ConvertPathToUrl(sub_app->manifest_id_path, origin));
|
||||
ASSIGN_OR_RETURN(GURL install_url,
|
||||
ConvertPathToUrl(sub_app->install_url_path, origin));
|
||||
- sub_apps.emplace_back(std::move(manifest_id), std::move(install_url));
|
||||
+ sub_apps.emplace_back() = {std::move(manifest_id), std::move(install_url)};
|
||||
}
|
||||
return sub_apps;
|
||||
}
|
||||
@@ -389,7 +389,7 @@ void SubAppsServiceImpl::ScheduleSubAppI
|
||||
base::BindOnce(
|
||||
[](webapps::ManifestId manifest_id, const webapps::AppId& app_id,
|
||||
webapps::InstallResultCode result_code) {
|
||||
- return SubAppInstallResult(manifest_id, app_id, result_code);
|
||||
+ return SubAppInstallResult{manifest_id, app_id, result_code};
|
||||
},
|
||||
manifest_id)
|
||||
.Then(install_results_collector));
|
||||
@ -1,77 +0,0 @@
|
||||
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py
|
||||
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me 2024-01-15 20:48:28.177397102 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py 2024-01-15 20:48:46.427768328 +0100
|
||||
@@ -18,7 +18,7 @@ class HTMLGenerationController(object):
|
||||
|
||||
def GetHTMLForInlineStylesheet(self, contents):
|
||||
if self.current_module is None:
|
||||
- if re.search('url\(.+\)', contents):
|
||||
+ if re.search(r'url\(.+\)', contents):
|
||||
raise Exception(
|
||||
'Default HTMLGenerationController cannot handle inline style urls')
|
||||
return contents
|
||||
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py
|
||||
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py.me 2024-01-15 20:49:39.363845083 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py 2024-01-15 20:49:57.407212098 +0100
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
|
||||
def EscapeJSIfNeeded(js):
|
||||
- return js.replace('</script>', '<\/script>')
|
||||
+ return js.replace(r'</script>', r'<\/script>')
|
||||
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py
|
||||
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py.me 2024-01-15 20:50:11.819505254 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py 2024-01-15 20:50:38.611050213 +0100
|
||||
@@ -293,6 +293,6 @@ class HTMLModuleParser():
|
||||
html = ''
|
||||
else:
|
||||
if html.find('< /script>') != -1:
|
||||
- raise Exception('Escape script tags with <\/script>')
|
||||
+ raise Exception(r'Escape script tags with <\/script>')
|
||||
|
||||
return HTMLModuleParserResults(html)
|
||||
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py
|
||||
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py.me 2024-01-15 20:48:59.917042709 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py 2024-01-15 20:49:24.402540761 +0100
|
||||
@@ -60,7 +60,7 @@ class ParsedStyleSheet(object):
|
||||
return 'url(data:image/%s;base64,%s)' % (ext[1:], data.decode('utf-8'))
|
||||
|
||||
# I'm assuming we only have url()'s associated with images
|
||||
- return re.sub('url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
|
||||
+ return re.sub(r'url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
|
||||
InlineUrl, self.contents)
|
||||
|
||||
def AppendDirectlyDependentFilenamesTo(self, dependent_filenames):
|
||||
@@ -72,7 +72,7 @@ class ParsedStyleSheet(object):
|
||||
raise Exception('@imports are not supported')
|
||||
|
||||
matches = re.findall(
|
||||
- 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
|
||||
+ r'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
|
||||
self.contents)
|
||||
|
||||
def resolve_url(url):
|
||||
diff -up chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py.me chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py
|
||||
--- chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py.me 2024-01-15 20:50:56.810420400 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py 2024-01-15 20:52:33.506387261 +0100
|
||||
@@ -28,7 +28,7 @@ import platform
|
||||
import sys
|
||||
|
||||
def glob_slash(dirname):
|
||||
- """Like regular glob but replaces \ with / in returned paths."""
|
||||
+ """Like regular glob but replaces \\ with / in returned paths."""
|
||||
return [s.replace('\\', '/') for s in glob.glob(dirname)]
|
||||
|
||||
def main():
|
||||
diff -up chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py.me chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py
|
||||
--- chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py.me 2024-01-15 20:52:38.016479000 +0100
|
||||
+++ chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py 2024-01-15 20:52:48.863699640 +0100
|
||||
@@ -28,7 +28,7 @@ import platform
|
||||
import sys
|
||||
|
||||
def glob_slash(dirname):
|
||||
- """Like regular glob but replaces \ with / in returned paths."""
|
||||
+ """Like regular glob but replaces \\ with / in returned paths."""
|
||||
return [s.replace('\\', '/') for s in glob.glob(dirname)]
|
||||
|
||||
def main():
|
||||
@ -1,121 +0,0 @@
|
||||
diff -up chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
|
||||
--- chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me 2023-05-21 10:05:00.357860329 +0200
|
||||
+++ chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc 2023-05-21 10:18:09.665432735 +0200
|
||||
@@ -41,7 +41,6 @@
|
||||
#include "media/gpu/gpu_video_encode_accelerator_helpers.h"
|
||||
#include "media/gpu/h264_dpb.h"
|
||||
#include "media/gpu/macros.h"
|
||||
-#include "media/gpu/vaapi/av1_vaapi_video_encoder_delegate.h"
|
||||
#include "media/gpu/vaapi/h264_vaapi_video_encoder_delegate.h"
|
||||
#include "media/gpu/vaapi/va_surface.h"
|
||||
#include "media/gpu/vaapi/vaapi_common.h"
|
||||
@@ -200,7 +199,7 @@ bool VaapiVideoEncodeAccelerator::Initia
|
||||
|
||||
const VideoCodec codec = VideoCodecProfileToVideoCodec(config.output_profile);
|
||||
if (codec != VideoCodec::kH264 && codec != VideoCodec::kVP8 &&
|
||||
- codec != VideoCodec::kVP9 && codec != VideoCodec::kAV1) {
|
||||
+ codec != VideoCodec::kVP9) {
|
||||
MEDIA_LOG(ERROR, media_log.get())
|
||||
<< "Unsupported profile: " << GetProfileName(config.output_profile);
|
||||
return false;
|
||||
@@ -293,7 +292,6 @@ void VaapiVideoEncodeAccelerator::Initia
|
||||
break;
|
||||
case VideoCodec::kVP8:
|
||||
case VideoCodec::kVP9:
|
||||
- case VideoCodec::kAV1:
|
||||
mode = VaapiWrapper::kEncodeConstantQuantizationParameter;
|
||||
break;
|
||||
default:
|
||||
@@ -356,12 +354,6 @@ void VaapiVideoEncodeAccelerator::Initia
|
||||
vaapi_wrapper_, error_cb);
|
||||
}
|
||||
break;
|
||||
- case VideoCodec::kAV1:
|
||||
- if (!IsConfiguredForTesting()) {
|
||||
- encoder_ = std::make_unique<AV1VaapiVideoEncoderDelegate>(
|
||||
- vaapi_wrapper_, error_cb);
|
||||
- }
|
||||
- break;
|
||||
default:
|
||||
NOTREACHED() << "Unsupported codec type " << GetCodecName(output_codec_);
|
||||
return;
|
||||
@@ -835,10 +827,6 @@ VaapiVideoEncodeAccelerator::CreateEncod
|
||||
case VideoCodec::kVP9:
|
||||
picture = new VaapiVP9Picture(std::move(reconstructed_surface));
|
||||
break;
|
||||
- case VideoCodec::kAV1:
|
||||
- picture = new VaapiAV1Picture(/*display_va_surface=*/nullptr,
|
||||
- std::move(reconstructed_surface));
|
||||
- break;
|
||||
default:
|
||||
return nullptr;
|
||||
}
|
||||
diff -up chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn
|
||||
--- chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc 2023-05-18 00:37:57.000000000 +0200
|
||||
+++ chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn 2023-05-20 13:14:10.756183626 +0200
|
||||
@@ -38,8 +38,6 @@ source_set("vaapi") {
|
||||
sources = [
|
||||
"av1_vaapi_video_decoder_delegate.cc",
|
||||
"av1_vaapi_video_decoder_delegate.h",
|
||||
- "av1_vaapi_video_encoder_delegate.cc",
|
||||
- "av1_vaapi_video_encoder_delegate.h",
|
||||
"h264_vaapi_video_decoder_delegate.cc",
|
||||
"h264_vaapi_video_decoder_delegate.h",
|
||||
"h264_vaapi_video_encoder_delegate.cc",
|
||||
@@ -107,7 +105,6 @@ source_set("vaapi") {
|
||||
"//media/gpu/chromeos:common",
|
||||
"//media/parsers",
|
||||
"//mojo/public/cpp/bindings",
|
||||
- "//third_party/libaom:libaomrc",
|
||||
"//third_party/libvpx:libvpxrc",
|
||||
"//third_party/libyuv",
|
||||
"//ui/gfx",
|
||||
diff -up chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.cc.me chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.cc
|
||||
--- chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.cc.me 2023-11-02 15:08:30.921325747 +0100
|
||||
+++ chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.cc 2023-11-02 15:09:46.123692602 +0100
|
||||
@@ -3124,6 +3124,7 @@ bool VaapiWrapper::GetSupportedPackedHea
|
||||
return true;
|
||||
}
|
||||
|
||||
+#if 0 //disable AV1 due to old libva on epel9
|
||||
bool VaapiWrapper::GetMinAV1SegmentSize(VideoCodecProfile profile,
|
||||
uint32_t& min_seg_size) {
|
||||
CHECK(!enforce_sequence_affinity_ ||
|
||||
@@ -3141,6 +3142,7 @@ bool VaapiWrapper::GetMinAV1SegmentSize(
|
||||
|
||||
return true;
|
||||
}
|
||||
+#endif
|
||||
|
||||
bool VaapiWrapper::BlitSurface(const VASurface& va_surface_src,
|
||||
const VASurface& va_surface_dest,
|
||||
diff -up chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.h.me chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.h
|
||||
--- chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.h.me 2023-11-02 15:09:58.973928395 +0100
|
||||
+++ chromium-119.0.6045.105/media/gpu/vaapi/vaapi_wrapper.h 2023-11-02 15:10:45.990791114 +0100
|
||||
@@ -553,9 +553,11 @@ class MEDIA_GPU_EXPORT VaapiWrapper
|
||||
bool& packed_pps,
|
||||
bool& packed_slice);
|
||||
|
||||
+#if 0 //disable AV1 due to old libva on epel9
|
||||
// Gets the minimum segment block size supported for AV1 encoding.
|
||||
[[nodiscard]] bool GetMinAV1SegmentSize(VideoCodecProfile profile,
|
||||
uint32_t& min_seg_size);
|
||||
+#endif
|
||||
|
||||
// Blits a VASurface |va_surface_src| into another VASurface
|
||||
// |va_surface_dest| applying pixel format conversion, cropping
|
||||
diff -up chromium-121.0.6167.57/media/gpu/BUILD.gn.than chromium-121.0.6167.57/media/gpu/BUILD.gn
|
||||
--- chromium-121.0.6167.57/media/gpu/BUILD.gn.than 2024-01-15 22:09:21.010029147 +0100
|
||||
+++ chromium-121.0.6167.57/media/gpu/BUILD.gn 2024-01-15 22:10:05.192259340 +0100
|
||||
@@ -391,10 +391,7 @@ source_set("common") {
|
||||
"vp9_svc_layers_stateful.h",
|
||||
]
|
||||
configs += [ "//third_party/libvpx:libvpx_config" ]
|
||||
- deps += [
|
||||
- "//third_party/libaom:libaomrc",
|
||||
- "//third_party/libvpx:libvpxrc",
|
||||
- ]
|
||||
+ deps += [ "//third_party/libvpx:libvpxrc" ]
|
||||
}
|
||||
if (use_libgav1_parser) {
|
||||
sources += [
|
||||
@ -1,259 +0,0 @@
|
||||
--- 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;
|
||||
};
|
||||
|
||||
diff -up chromium-121.0.6167.57/base/functional/bind_internal.h.me chromium-121.0.6167.57/base/functional/bind_internal.h
|
||||
--- chromium-121.0.6167.57/base/functional/bind_internal.h.me 2024-01-21 16:10:09.809037581 +0100
|
||||
+++ chromium-121.0.6167.57/base/functional/bind_internal.h 2024-01-21 16:46:33.759397303 +0100
|
||||
@@ -1533,11 +1533,11 @@ template <int i,
|
||||
typename Param>
|
||||
struct ParamCanBeBound {
|
||||
private:
|
||||
- using UnwrappedParam = BindArgument<i>::template ForwardedAs<
|
||||
+ using UnwrappedParam = typename BindArgument<i>::template ForwardedAs<
|
||||
Unwrapped>::template ToParamWithType<Param>;
|
||||
- using ParamStorage = BindArgument<i>::template ToParamWithType<
|
||||
+ using ParamStorage = typename BindArgument<i>::template ToParamWithType<
|
||||
Param>::template StoredAs<Storage>;
|
||||
- using BoundStorage =
|
||||
+ using BoundStorage = typename
|
||||
BindArgument<i>::template BoundAs<Arg>::template StoredAs<Storage>;
|
||||
|
||||
// We forbid callbacks from using raw_ptr as a parameter. However, we allow
|
||||
diff -up chromium-121.0.6167.57/mojo/public/cpp/bindings/array_traits.h.me chromium-121.0.6167.57/mojo/public/cpp/bindings/array_traits.h
|
||||
--- chromium-121.0.6167.57/mojo/public/cpp/bindings/array_traits.h.me 2024-01-21 17:23:37.786606428 +0100
|
||||
+++ chromium-121.0.6167.57/mojo/public/cpp/bindings/array_traits.h 2024-01-21 17:23:58.582127103 +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-121.0.6167.57/components/optimization_guide/core/model_execution/model_execution_util.h.me chromium-121.0.6167.57/components/optimization_guide/core/model_execution/model_execution_util.h
|
||||
--- chromium-121.0.6167.57/components/optimization_guide/core/model_execution/model_execution_util.h.me 2024-01-21 17:33:40.030897838 +0100
|
||||
+++ chromium-121.0.6167.57/components/optimization_guide/core/model_execution/model_execution_util.h 2024-01-21 17:34:11.518705266 +0100
|
||||
@@ -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-121.0.6167.57/components/optimization_guide/core/model_quality/model_quality_log_entry.h.me chromium-121.0.6167.57/components/optimization_guide/core/model_quality/model_quality_log_entry.h
|
||||
--- chromium-121.0.6167.57/components/optimization_guide/core/model_quality/model_quality_log_entry.h.me 2024-01-21 17:32:42.367417619 +0100
|
||||
+++ chromium-121.0.6167.57/components/optimization_guide/core/model_quality/model_quality_log_entry.h 2024-01-21 17:33:25.732531198 +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();
|
||||
}
|
||||
@ -1,743 +0,0 @@
|
||||
commit 940af9f2c87b436559b97c53763aa9eaaf1254eb
|
||||
Author: Jeremy Roman <jbroman@chromium.org>
|
||||
Date: Wed Nov 15 16:24:54 2023 +0000
|
||||
|
||||
Use C++20 features to simplify blink::NativeValueTraitsBase.
|
||||
|
||||
These allow some of the metaprogramming bits to be simplified a little.
|
||||
|
||||
Change-Id: I052b4397586d21348401616e1792afdb9662f975
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5030335
|
||||
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
|
||||
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1224978}
|
||||
|
||||
diff --git a/third_party/blink/renderer/bindings/core/v8/native_value_traits.h b/third_party/blink/renderer/bindings/core/v8/native_value_traits.h
|
||||
index 7fc91d14acc71..1e5a0790df6da 100644
|
||||
--- a/third_party/blink/renderer/bindings/core/v8/native_value_traits.h
|
||||
+++ b/third_party/blink/renderer/bindings/core/v8/native_value_traits.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_H_
|
||||
|
||||
+#include <concepts>
|
||||
#include <type_traits>
|
||||
|
||||
#include "third_party/blink/renderer/bindings/core/v8/idl_types_base.h"
|
||||
@@ -30,7 +31,7 @@ class ExceptionState;
|
||||
// return toInt32(isolate, value, exceptionState, NormalConversion);
|
||||
// }
|
||||
// }
|
||||
-template <typename T, typename SFINAEHelper = void>
|
||||
+template <typename T>
|
||||
struct NativeValueTraits;
|
||||
|
||||
// This declaration serves only as a blueprint for specializations: the
|
||||
@@ -45,22 +46,15 @@ struct NativeValueTraits;
|
||||
|
||||
namespace bindings {
|
||||
|
||||
-template <typename T, typename = void>
|
||||
-struct NativeValueTraitsHasIsNull : std::false_type {};
|
||||
-
|
||||
template <typename T>
|
||||
-struct NativeValueTraitsHasIsNull<
|
||||
- T,
|
||||
- std::void_t<decltype(std::declval<T>().IsNull())>> : std::true_type {};
|
||||
+struct ImplTypeFor {
|
||||
+ using type = T;
|
||||
+};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraitsHasNullValue {
|
||||
- // true if |T| supports IDL null value.
|
||||
- static constexpr bool value =
|
||||
- // ScriptValue, String, and union types have IsNull member function.
|
||||
- bindings::NativeValueTraitsHasIsNull<T>::value ||
|
||||
- // Pointer types have nullptr as IDL null value.
|
||||
- std::is_pointer<T>::value;
|
||||
+ requires std::derived_from<T, IDLBase>
|
||||
+struct ImplTypeFor<T> {
|
||||
+ using type = typename T::ImplType;
|
||||
};
|
||||
|
||||
} // namespace bindings
|
||||
@@ -78,37 +72,17 @@ struct NativeValueTraitsHasNullValue {
|
||||
// If present, |NullValue()| will be used when converting from the nullable type
|
||||
// T?, and should be used if the impl type has an existing "null" state. If not
|
||||
// present, WTF::Optional will be used to wrap the type.
|
||||
-template <typename T, typename SFINAEHelper = void>
|
||||
-struct NativeValueTraitsBase {
|
||||
- STATIC_ONLY(NativeValueTraitsBase);
|
||||
-
|
||||
- using ImplType = T;
|
||||
-
|
||||
- static constexpr bool has_null_value =
|
||||
- bindings::NativeValueTraitsHasNullValue<ImplType>::value;
|
||||
-
|
||||
- template <typename... ExtraArgs>
|
||||
- static decltype(auto) ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state,
|
||||
- ExtraArgs... extra_args) {
|
||||
- return NativeValueTraits<std::remove_pointer_t<T>>::NativeValue(
|
||||
- isolate, value, exception_state,
|
||||
- std::forward<ExtraArgs>(extra_args)...);
|
||||
- }
|
||||
-};
|
||||
-
|
||||
template <typename T>
|
||||
-struct NativeValueTraitsBase<
|
||||
- T,
|
||||
- std::enable_if_t<std::is_base_of<IDLBase, T>::value>> {
|
||||
+struct NativeValueTraitsBase {
|
||||
STATIC_ONLY(NativeValueTraitsBase);
|
||||
|
||||
- using ImplType = typename T::ImplType;
|
||||
+ using ImplType = bindings::ImplTypeFor<T>::type;
|
||||
|
||||
+ // Pointer types have nullptr as IDL null value.
|
||||
+ // ScriptValue, String, and union types have IsNull member function.
|
||||
static constexpr bool has_null_value =
|
||||
- bindings::NativeValueTraitsHasNullValue<ImplType>::value;
|
||||
+ std::is_pointer_v<ImplType> ||
|
||||
+ requires(ImplType value) { value.IsNull(); };
|
||||
|
||||
template <typename... ExtraArgs>
|
||||
static decltype(auto) ArgumentValue(v8::Isolate* isolate,
|
||||
diff --git a/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc b/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc
|
||||
index 508ea6d8eea48..18de71d84023f 100644
|
||||
--- a/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc
|
||||
+++ b/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "third_party/blink/renderer/core/core_export.h"
|
||||
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
|
||||
#include "third_party/blink/renderer/core/frame/web_feature.h"
|
||||
+#include "third_party/blink/renderer/core/typed_arrays/flexible_array_buffer_view.h"
|
||||
#include "third_party/blink/renderer/core/typed_arrays/typed_flexible_array_buffer_view.h"
|
||||
|
||||
namespace blink {
|
||||
@@ -698,12 +699,11 @@ DOMArrayBufferBase* NativeValueTraits<
|
||||
// ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-NotShared<T> NativeValueTraits<
|
||||
- NotShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- NativeValue(v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+NotShared<T> NativeValueTraits<NotShared<T>>::NativeValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -712,13 +712,12 @@ NotShared<T> NativeValueTraits<
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-NotShared<T> NativeValueTraits<
|
||||
- NotShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+NotShared<T> NativeValueTraits<NotShared<T>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -729,12 +728,11 @@ NotShared<T> NativeValueTraits<
|
||||
// [AllowShared] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- MaybeShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- NativeValue(v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T> NativeValueTraits<MaybeShared<T>>::NativeValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -743,13 +741,12 @@ MaybeShared<T> NativeValueTraits<
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- MaybeShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T> NativeValueTraits<MaybeShared<T>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -760,12 +757,12 @@ MaybeShared<T> NativeValueTraits<
|
||||
// [AllowShared, BufferSourceTypeNoSizeLimit] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- NativeValue(v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T>
|
||||
+NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>::NativeValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<MaybeShared<T>>, ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kDoNotCheck,
|
||||
@@ -774,13 +771,12 @@ MaybeShared<T> NativeValueTraits<
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T> NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<
|
||||
+ MaybeShared<T>>>::ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<MaybeShared<T>>, ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kDoNotCheck,
|
||||
@@ -791,12 +787,11 @@ MaybeShared<T> NativeValueTraits<
|
||||
// Nullable ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-NotShared<T> NativeValueTraits<
|
||||
- IDLNullable<NotShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- NativeValue(v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+NotShared<T> NativeValueTraits<IDLNullable<NotShared<T>>>::NativeValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -805,13 +800,12 @@ NotShared<T> NativeValueTraits<
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-NotShared<T> NativeValueTraits<
|
||||
- IDLNullable<NotShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+NotShared<T> NativeValueTraits<IDLNullable<NotShared<T>>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -822,12 +816,11 @@ NotShared<T> NativeValueTraits<
|
||||
// Nullable [AllowShared] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- IDLNullable<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- NativeValue(v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T> NativeValueTraits<IDLNullable<MaybeShared<T>>>::NativeValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -836,13 +829,12 @@ MaybeShared<T> NativeValueTraits<
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- IDLNullable<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T> NativeValueTraits<IDLNullable<MaybeShared<T>>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -853,9 +845,9 @@ MaybeShared<T> NativeValueTraits<
|
||||
// Nullable [AllowShared, BufferSourceTypeNoSizeLimit] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-MaybeShared<T> NativeValueTraits<
|
||||
- IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+MaybeShared<T>
|
||||
+NativeValueTraits<IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>>::
|
||||
ArgumentValue(v8::Isolate* isolate,
|
||||
int argument_index,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -870,13 +862,11 @@ MaybeShared<T> NativeValueTraits<
|
||||
// [AllowShared, FlexibleArrayBufferView] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-T NativeValueTraits<T,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+T NativeValueTraits<T>::ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<T>, ToFlexibleArrayBufferView,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
ResizableAllowance::kDisallowResizable,
|
||||
@@ -888,13 +878,12 @@ T NativeValueTraits<T,
|
||||
// ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-T NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+T NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<T>, ToFlexibleArrayBufferView, Nullablity::kIsNotNullable,
|
||||
BufferSizeCheck::kDoNotCheck, ResizableAllowance::kDisallowResizable,
|
||||
@@ -905,13 +894,12 @@ T NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>,
|
||||
// Nullable [AllowShared, FlexibleArrayBufferView] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
-T NativeValueTraits<IDLNullable<T>,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
- ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+T NativeValueTraits<IDLNullable<T>>::ArgumentValue(
|
||||
+ v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<T>, ToFlexibleArrayBufferView,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
ResizableAllowance::kDisallowResizable,
|
||||
diff --git a/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h b/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h
|
||||
index 899929dcf49f9..5011503dcf1c0 100644
|
||||
--- a/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h
|
||||
+++ b/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h
|
||||
@@ -5,6 +5,9 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_IMPL_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_IMPL_H_
|
||||
|
||||
+#include <concepts>
|
||||
+#include <type_traits>
|
||||
+
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "third_party/blink/renderer/bindings/core/v8/idl_types.h"
|
||||
#include "third_party/blink/renderer/bindings/core/v8/native_value_traits.h"
|
||||
@@ -715,9 +718,8 @@ struct CORE_EXPORT NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>> {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<T> {
|
||||
// NotShared<T> or MaybeShared<T> should be used instead.
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -729,9 +731,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>> {
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<IDLNullable<T>> {
|
||||
// NotShared<T> or MaybeShared<T> should be used instead.
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -743,9 +744,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- NotShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<NotShared<T>>
|
||||
: public NativeValueTraitsBase<NotShared<T>> {
|
||||
static NotShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -758,9 +758,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<NotShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<IDLNullable<NotShared<T>>>
|
||||
: public NativeValueTraitsBase<NotShared<T>> {
|
||||
static NotShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -773,9 +772,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- MaybeShared<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<MaybeShared<T>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -788,9 +786,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
// FlexibleArrayBufferView uses this in its implementation, so we cannot
|
||||
// delete it.
|
||||
@@ -805,9 +802,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<MaybeShared<T>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
+struct NativeValueTraits<IDLNullable<MaybeShared<T>>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -820,9 +816,9 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
+ requires std::derived_from<T, DOMArrayBufferView>
|
||||
struct NativeValueTraits<
|
||||
- IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>,
|
||||
- typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
+ IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
// BufferSourceTypeNoSizeLimit must be used only as arguments.
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
@@ -836,11 +832,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
- : public NativeValueTraitsBase<T> {
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T> {
|
||||
// FlexibleArrayBufferView must be used only as arguments.
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -853,10 +846,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLBufferSourceTypeNoSizeLimit<T>,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+struct NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>>
|
||||
: public NativeValueTraitsBase<T> {
|
||||
// BufferSourceTypeNoSizeLimit and FlexibleArrayBufferView must be used only
|
||||
// as arguments.
|
||||
@@ -871,11 +862,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
- : public NativeValueTraitsBase<T> {
|
||||
+ requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
+struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T> {
|
||||
// FlexibleArrayBufferView must be used only as arguments.
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1134,9 +1122,8 @@ NativeValueTraits<IDLSequence<T>>::NativeValue(
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<IDLNullable<IDLSequence<T>>,
|
||||
- typename std::enable_if_t<
|
||||
- NativeValueTraits<IDLSequence<T>>::has_null_value>>
|
||||
+ requires NativeValueTraits<IDLSequence<T>>::has_null_value
|
||||
+struct NativeValueTraits<IDLNullable<IDLSequence<T>>>
|
||||
: public NativeValueTraitsBase<HeapVector<AddMemberIfNeeded<T>>*> {
|
||||
using ImplType = typename NativeValueTraits<IDLSequence<T>>::ImplType*;
|
||||
|
||||
@@ -1203,9 +1190,8 @@ struct NativeValueTraits<IDLArray<T>>
|
||||
: public NativeValueTraits<IDLSequence<T>> {};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<IDLNullable<IDLArray<T>>,
|
||||
- typename std::enable_if_t<
|
||||
- NativeValueTraits<IDLSequence<T>>::has_null_value>>
|
||||
+ requires NativeValueTraits<IDLSequence<T>>::has_null_value
|
||||
+struct NativeValueTraits<IDLNullable<IDLArray<T>>>
|
||||
: public NativeValueTraits<IDLNullable<IDLSequence<T>>> {};
|
||||
|
||||
// Record types
|
||||
@@ -1335,10 +1321,8 @@ struct NativeValueTraits<IDLRecord<K, V>>
|
||||
|
||||
// Callback function types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<std::is_base_of<CallbackFunctionBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, CallbackFunctionBase>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1361,9 +1345,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<CallbackFunctionBase, T>::value>>
|
||||
+ requires std::derived_from<T, CallbackFunctionBase>
|
||||
+struct NativeValueTraits<IDLNullable<T>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1392,10 +1375,8 @@ struct NativeValueTraits<
|
||||
|
||||
// Callback interface types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<std::is_base_of<CallbackInterfaceBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, CallbackInterfaceBase>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1418,9 +1399,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<CallbackInterfaceBase, T>::value>>
|
||||
+ requires std::derived_from<T, CallbackInterfaceBase>
|
||||
+struct NativeValueTraits<IDLNullable<T>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1449,11 +1429,8 @@ struct NativeValueTraits<
|
||||
|
||||
// Dictionary types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<bindings::DictionaryBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, bindings::DictionaryBase>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1464,14 +1441,11 @@ struct NativeValueTraits<
|
||||
// We don't support nullable dictionary types in general since it's quite
|
||||
// confusing and often misused.
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<bindings::DictionaryBase, T>::value &&
|
||||
- (std::is_same<T, GPUColorTargetState>::value ||
|
||||
- std::is_same<T, GPURenderPassColorAttachment>::value ||
|
||||
- std::is_same<T, GPUVertexBufferLayout>::value)>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, bindings::DictionaryBase> &&
|
||||
+ (std::same_as<T, GPUColorTargetState> ||
|
||||
+ std::same_as<T, GPURenderPassColorAttachment> ||
|
||||
+ std::same_as<T, GPUVertexBufferLayout>)
|
||||
+struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1483,11 +1457,8 @@ struct NativeValueTraits<
|
||||
|
||||
// Enumeration types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<
|
||||
- std::is_base_of<bindings::EnumerationBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T> {
|
||||
+ requires std::derived_from<T, bindings::EnumerationBase>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T> {
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1497,10 +1468,8 @@ struct NativeValueTraits<
|
||||
|
||||
// Interface types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<std::is_base_of<ScriptWrappable, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, ScriptWrappable>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
static inline T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1528,9 +1497,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<ScriptWrappable, T>::value>>
|
||||
+ requires std::derived_from<T, ScriptWrappable>
|
||||
+struct NativeValueTraits<IDLNullable<T>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static inline T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1565,10 +1533,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- T,
|
||||
- typename std::enable_if_t<std::is_base_of<bindings::UnionBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, bindings::UnionBase>
|
||||
+struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1584,10 +1550,8 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<T>,
|
||||
- typename std::enable_if_t<std::is_base_of<bindings::UnionBase, T>::value>>
|
||||
- : public NativeValueTraitsBase<T*> {
|
||||
+ requires std::derived_from<T, bindings::UnionBase>
|
||||
+struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1608,9 +1572,8 @@ struct NativeValueTraits<
|
||||
|
||||
// Nullable types
|
||||
template <typename InnerType>
|
||||
-struct NativeValueTraits<
|
||||
- IDLNullable<InnerType>,
|
||||
- typename std::enable_if_t<!NativeValueTraits<InnerType>::has_null_value>>
|
||||
+ requires(!NativeValueTraits<InnerType>::has_null_value)
|
||||
+struct NativeValueTraits<IDLNullable<InnerType>>
|
||||
: public NativeValueTraitsBase<IDLNullable<InnerType>> {
|
||||
// https://webidl.spec.whatwg.org/#es-nullable-type
|
||||
using ImplType =
|
||||
@@ -1642,9 +1605,8 @@ struct NativeValueTraits<IDLNullable<IDLNullable<T>>>;
|
||||
|
||||
// Optional types
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<IDLOptional<T>,
|
||||
- typename std::enable_if_t<std::is_arithmetic<
|
||||
- typename NativeValueTraits<T>::ImplType>::value>>
|
||||
+ requires std::is_arithmetic_v<typename NativeValueTraits<T>::ImplType>
|
||||
+struct NativeValueTraits<IDLOptional<T>>
|
||||
: public NativeValueTraitsBase<typename NativeValueTraits<T>::ImplType> {
|
||||
using ImplType = typename NativeValueTraits<T>::ImplType;
|
||||
|
||||
@@ -1666,9 +1628,8 @@ struct NativeValueTraits<IDLOptional<T>,
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-struct NativeValueTraits<IDLOptional<T>,
|
||||
- typename std::enable_if_t<std::is_pointer<
|
||||
- typename NativeValueTraits<T>::ImplType>::value>>
|
||||
+ requires std::is_pointer_v<typename NativeValueTraits<T>::ImplType>
|
||||
+struct NativeValueTraits<IDLOptional<T>>
|
||||
: public NativeValueTraitsBase<typename NativeValueTraits<T>::ImplType> {
|
||||
using ImplType = typename NativeValueTraits<T>::ImplType;
|
||||
|
||||
@ -1,53 +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.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-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.than chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
|
||||
--- chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.than 2023-12-19 17:57:56.205197246 +0100
|
||||
+++ chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc 2023-12-19 18:10:13.778634531 +0100
|
||||
@@ -3527,8 +3527,8 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
DCHECK(out_row_break_between);
|
||||
|
||||
const auto& container_space = GetConstraintSpace();
|
||||
- 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 =
|
||||
container_space.GetWritingDirection();
|
||||
@@ -3691,8 +3691,9 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
|
||||
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
|
||||
const auto& constraint_space = GetConstraintSpace();
|
||||
- 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 =
|
||||
constraint_space.GetWritingDirection();
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-122.0.6261.29/build/config/compiler/BUILD.gn.me chromium-122.0.6261.29/build/config/compiler/BUILD.gn
|
||||
--- chromium-122.0.6261.29/build/config/compiler/BUILD.gn.me 2024-02-12 14:46:52.691992282 +0100
|
||||
+++ chromium-122.0.6261.29/build/config/compiler/BUILD.gn 2024-02-12 14:48:54.256274068 +0100
|
||||
@@ -787,7 +787,7 @@ config("compiler") {
|
||||
|
||||
# We only use one version of LLVM within a build so there's no need to
|
||||
# upgrade debug info, which can be expensive since it runs the verifier.
|
||||
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
+ ldflags += [ "" ]
|
||||
}
|
||||
|
||||
# TODO(https://crbug.com/1211155): investigate why this isn't effective on
|
||||
@ -1,45 +0,0 @@
|
||||
diff -up chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h.me chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h
|
||||
--- chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h.me 2024-02-13 13:07:24.982184485 +0100
|
||||
+++ chromium-122.0.6261.29/components/autofill/core/common/unique_ids.h 2024-02-13 13:07:45.510551589 +0100
|
||||
@@ -137,7 +137,7 @@ struct GlobalId {
|
||||
|
||||
friend constexpr auto operator<=>(const GlobalId<RendererId>& lhs,
|
||||
const GlobalId<RendererId>& rhs) = default;
|
||||
- friend constexpr bool operator==(const GlobalId<RendererId>& lhs,
|
||||
+ friend bool operator==(const GlobalId<RendererId>& lhs,
|
||||
const GlobalId<RendererId>& rhs) = default;
|
||||
};
|
||||
|
||||
diff -up chromium-122.0.6261.29/base/types/strong_alias.h.me chromium-122.0.6261.29/base/types/strong_alias.h
|
||||
--- chromium-122.0.6261.29/base/types/strong_alias.h.me 2024-02-13 14:13:20.311374288 +0100
|
||||
+++ chromium-122.0.6261.29/base/types/strong_alias.h 2024-02-13 12:30:38.596913951 +0100
|
||||
@@ -110,7 +110,7 @@ class StrongAlias {
|
||||
// a `StrongAlias<W>`.
|
||||
friend constexpr auto operator<=>(const StrongAlias& lhs,
|
||||
const StrongAlias& rhs) = default;
|
||||
- friend constexpr bool operator==(const StrongAlias& lhs,
|
||||
+ friend bool operator==(const StrongAlias& lhs,
|
||||
const StrongAlias& rhs) = default;
|
||||
|
||||
// Hasher to use in std::unordered_map, std::unordered_set, etc.
|
||||
diff -up chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h.constexpr chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h
|
||||
--- chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h.constexpr 2024-02-07 19:49:31.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/components/performance_manager/resource_attribution/query_params.h 2024-02-13 11:12:52.913338699 +0100
|
||||
@@ -29,7 +29,7 @@ class ContextCollection {
|
||||
ContextCollection(const ContextCollection& other);
|
||||
ContextCollection& operator=(const ContextCollection& other);
|
||||
|
||||
- friend constexpr bool operator==(const ContextCollection&,
|
||||
+ friend bool operator==(const ContextCollection&,
|
||||
const ContextCollection&) = default;
|
||||
|
||||
// Adds `context` to the collection.
|
||||
@@ -67,7 +67,7 @@ struct QueryParams {
|
||||
QueryParams(const QueryParams& other);
|
||||
QueryParams& operator=(const QueryParams& other);
|
||||
|
||||
- friend constexpr bool operator==(const QueryParams&,
|
||||
+ friend bool operator==(const QueryParams&,
|
||||
const QueryParams&) = default;
|
||||
|
||||
// Resource types to measure.
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-122.0.6261.69/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.me chromium-122.0.6261.69/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h
|
||||
--- chromium-122.0.6261.69/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h.me 2024-02-24 13:02:58.931586003 +0100
|
||||
+++ chromium-122.0.6261.69/third_party/pdfium/core/fxcrt/fx_memory_wrappers.h 2024-02-24 13:03:33.152251546 +0100
|
||||
@@ -82,6 +82,7 @@ struct FxPartitionAllocAllocator {
|
||||
}
|
||||
|
||||
// There's no state, so they are all the same,
|
||||
+ bool operator==(const FxPartitionAllocAllocator&) const { return true; }
|
||||
bool operator==(const FxPartitionAllocAllocator& that) { return true; }
|
||||
bool operator!=(const FxPartitionAllocAllocator& that) { return false; }
|
||||
};
|
||||
@ -1,191 +0,0 @@
|
||||
diff -up chromium-122.0.6261.29/base/check_op.h.missing-header-files chromium-122.0.6261.29/base/check_op.h
|
||||
--- chromium-122.0.6261.29/base/check_op.h.missing-header-files 2024-02-07 19:49:20.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/base/check_op.h 2024-02-12 14:59:48.136415060 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_CHECK_OP_H_
|
||||
#define BASE_CHECK_OP_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
diff -up chromium-122.0.6261.29/base/containers/flat_map.h.missing-header-files chromium-122.0.6261.29/base/containers/flat_map.h
|
||||
--- chromium-122.0.6261.29/base/containers/flat_map.h.missing-header-files 2024-02-07 19:49:20.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/base/containers/flat_map.h 2024-02-12 14:59:48.136415060 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_CONTAINERS_FLAT_MAP_H_
|
||||
#define BASE_CONTAINERS_FLAT_MAP_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <tuple>
|
||||
#include <type_traits>
|
||||
diff -up chromium-122.0.6261.29/chrome/browser/webauthn/authenticator_request_dialog_model.h.missing-header-files chromium-122.0.6261.29/chrome/browser/webauthn/authenticator_request_dialog_model.h
|
||||
--- chromium-122.0.6261.29/chrome/browser/webauthn/authenticator_request_dialog_model.h.missing-header-files 2024-02-12 14:59:48.137415079 +0100
|
||||
+++ chromium-122.0.6261.29/chrome/browser/webauthn/authenticator_request_dialog_model.h 2024-02-12 15:28:17.168395787 +0100
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <variant>
|
||||
|
||||
#include "base/containers/span.h"
|
||||
#include "base/functional/callback_forward.h"
|
||||
diff -up chromium-122.0.6261.29/chrome/test/chromedriver/chrome/web_view_impl.cc.missing-header-files chromium-122.0.6261.29/chrome/test/chromedriver/chrome/web_view_impl.cc
|
||||
--- chromium-122.0.6261.29/chrome/test/chromedriver/chrome/web_view_impl.cc.missing-header-files 2024-02-07 19:49:27.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/chrome/test/chromedriver/chrome/web_view_impl.cc 2024-02-12 14:59:48.137415079 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <queue>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
+#include <cstring>
|
||||
|
||||
#include "base/check.h"
|
||||
#include "base/files/file_path.h"
|
||||
diff -up chromium-122.0.6261.29/components/feature_engagement/internal/never_event_storage_validator.h.missing-header-files chromium-122.0.6261.29/components/feature_engagement/internal/never_event_storage_validator.h
|
||||
--- chromium-122.0.6261.29/components/feature_engagement/internal/never_event_storage_validator.h.missing-header-files 2024-02-07 19:49:30.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/components/feature_engagement/internal/never_event_storage_validator.h 2024-02-12 14:59:48.138415097 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
|
||||
#define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "components/feature_engagement/internal/event_storage_validator.h"
|
||||
diff -up chromium-122.0.6261.29/gin/time_clamper.h.missing-header-files chromium-122.0.6261.29/gin/time_clamper.h
|
||||
--- chromium-122.0.6261.29/gin/time_clamper.h.missing-header-files 2024-02-07 19:49:35.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/gin/time_clamper.h 2024-02-12 14:59:48.138415097 +0100
|
||||
@@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper {
|
||||
const int64_t micros = now_micros % 1000;
|
||||
// abs() is necessary for devices with times before unix-epoch (most likely
|
||||
// configured incorrectly).
|
||||
- if (abs(micros) + kResolutionMicros < 1000) {
|
||||
+ if (std::abs(micros) + kResolutionMicros < 1000) {
|
||||
return now_micros / 1000;
|
||||
}
|
||||
return ClampTimeResolution(now_micros) / 1000;
|
||||
diff -up chromium-122.0.6261.29/net/base/net_export.h.missing-header-files chromium-122.0.6261.29/net/base/net_export.h
|
||||
--- chromium-122.0.6261.29/net/base/net_export.h.missing-header-files 2024-02-07 19:49:38.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/net/base/net_export.h 2024-02-12 14:59:48.139415116 +0100
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef NET_BASE_NET_EXPORT_H_
|
||||
#define NET_BASE_NET_EXPORT_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
// Defines NET_EXPORT so that functionality implemented by the net module can
|
||||
// be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to
|
||||
// access features not intended to be used directly by real consumers.
|
||||
diff -up chromium-122.0.6261.29/third_party/abseil-cpp/absl/strings/string_view.h.missing-header-files chromium-122.0.6261.29/third_party/abseil-cpp/absl/strings/string_view.h
|
||||
--- chromium-122.0.6261.29/third_party/abseil-cpp/absl/strings/string_view.h.missing-header-files 2024-02-07 19:49:40.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/abseil-cpp/absl/strings/string_view.h 2024-02-12 14:59:48.142415172 +0100
|
||||
@@ -27,6 +27,7 @@
|
||||
#ifndef ABSL_STRINGS_STRING_VIEW_H_
|
||||
#define ABSL_STRINGS_STRING_VIEW_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cstddef>
|
||||
diff -up chromium-122.0.6261.29/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.missing-header-files chromium-122.0.6261.29/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h
|
||||
--- chromium-122.0.6261.29/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h.missing-header-files 2024-02-07 19:50:44.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h 2024-02-12 14:59:48.142415172 +0100
|
||||
@@ -28,6 +28,7 @@
|
||||
#ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_
|
||||
#define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
diff -up chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc
|
||||
--- chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc.missing-header-files 2024-02-07 19:52:34.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/material_color_utilities/src/cpp/palettes/tones.cc 2024-02-12 14:59:48.143415190 +0100
|
||||
@@ -14,6 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
+#include <cmath>
|
||||
#include "cpp/palettes/tones.h"
|
||||
|
||||
#include "cpp/cam/cam.h"
|
||||
diff -up chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h
|
||||
--- chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h.missing-header-files 2024-02-07 19:52:59.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/ruy/src/ruy/profiler/instrumentation.h 2024-02-12 14:59:48.143415190 +0100
|
||||
@@ -17,6 +17,7 @@ limitations under the License.
|
||||
#define RUY_RUY_PROFILER_INSTRUMENTATION_H_
|
||||
|
||||
#ifdef RUY_PROFILER
|
||||
+#include <string>
|
||||
#include <cstdio>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
diff -up chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
|
||||
--- chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc.missing-header-files 2024-02-07 19:54:45.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc 2024-02-12 14:59:48.143415190 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "llvm/Support/SaveAndRestore.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <sysexits.h>
|
||||
#ifdef HAVE_BACKTRACE
|
||||
diff -up chromium-122.0.6261.29/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.missing-header-files chromium-122.0.6261.29/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
|
||||
--- chromium-122.0.6261.29/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h.missing-header-files 2024-02-07 19:53:17.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h 2024-02-12 14:59:48.143415190 +0100
|
||||
@@ -31,6 +31,7 @@ limitations under the License.
|
||||
#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
|
||||
#define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <complex>
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
diff -up chromium-122.0.6261.29/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.missing-header-files chromium-122.0.6261.29/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
|
||||
--- chromium-122.0.6261.29/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.missing-header-files 2024-02-07 19:54:20.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2024-02-12 14:59:48.145415228 +0100
|
||||
@@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N
|
||||
|
||||
// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
|
||||
#if VMA_STATS_STRING_ENABLED
|
||||
+#include <stdio.h>
|
||||
static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)
|
||||
{
|
||||
snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
|
||||
diff -up chromium-122.0.6261.29/third_party/webrtc/audio/utility/channel_mixer.cc.missing-header-files chromium-122.0.6261.29/third_party/webrtc/audio/utility/channel_mixer.cc
|
||||
--- chromium-122.0.6261.29/third_party/webrtc/audio/utility/channel_mixer.cc.missing-header-files 2024-02-07 19:53:17.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/webrtc/audio/utility/channel_mixer.cc 2024-02-12 14:59:48.145415228 +0100
|
||||
@@ -8,6 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#include "audio/utility/channel_mixer.h"
|
||||
|
||||
#include "audio/utility/channel_mixing_matrix.h"
|
||||
diff -up chromium-122.0.6261.29/third_party/webrtc/modules/include/module_common_types_public.h.missing-header-files chromium-122.0.6261.29/third_party/webrtc/modules/include/module_common_types_public.h
|
||||
--- chromium-122.0.6261.29/third_party/webrtc/modules/include/module_common_types_public.h.missing-header-files 2024-02-07 19:53:17.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/third_party/webrtc/modules/include/module_common_types_public.h 2024-02-12 14:59:48.145415228 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
|
||||
#include "absl/types/optional.h"
|
||||
diff -up chromium-122.0.6261.29/ui/gfx/linux/drm_util_linux.h.missing-header-files chromium-122.0.6261.29/ui/gfx/linux/drm_util_linux.h
|
||||
--- chromium-122.0.6261.29/ui/gfx/linux/drm_util_linux.h.missing-header-files 2024-02-07 19:50:05.000000000 +0100
|
||||
+++ chromium-122.0.6261.29/ui/gfx/linux/drm_util_linux.h 2024-02-12 14:59:48.147415265 +0100
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
#include "ui/gfx/buffer_types.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace ui {
|
||||
|
||||
int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
|
||||
@ -1,13 +0,0 @@
|
||||
diff -up chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py
|
||||
--- chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me 2024-02-23 12:04:45.451423995 +0100
|
||||
+++ chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py 2024-02-23 12:18:04.099824392 +0100
|
||||
@@ -124,7 +124,8 @@ def _GenerateH(basepath, fileroot, head,
|
||||
f.write(u'#include <cstddef>\n')
|
||||
f.write(u'\n')
|
||||
|
||||
- if system_headers := schema.get(u'system-headers', []):
|
||||
+ system_headers = schema.get(u'system-headers', [])
|
||||
+ if system_headers:
|
||||
for header in system_headers:
|
||||
f.write(u'#include <%s>\n' % header)
|
||||
f.write(u'\n')
|
||||
@ -1,55 +0,0 @@
|
||||
diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chromium-121.0.6167.57/build/config/clang/BUILD.gn
|
||||
--- chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib 2024-01-10 16:43:01.000000000 +0100
|
||||
+++ chromium-121.0.6167.57/build/config/clang/BUILD.gn 2024-01-20 19:51:38.481992799 +0100
|
||||
@@ -112,6 +112,7 @@ template("clang_lib") {
|
||||
_prefix = "lib"
|
||||
_suffix = ""
|
||||
_ext = "a"
|
||||
+ _libprefix = ""
|
||||
if (is_win) {
|
||||
_dir = "windows"
|
||||
_prefix = ""
|
||||
@@ -127,7 +128,33 @@ template("clang_lib") {
|
||||
}
|
||||
} else if (is_apple) {
|
||||
_dir = "darwin"
|
||||
- } else if (is_linux || is_chromeos) {
|
||||
+ } else if (is_linux) {
|
||||
+ if (current_cpu == "x64") {
|
||||
+ _dir = "x86_64-redhat-linux-gnu"
|
||||
+ _suffix ="-x86_64"
|
||||
+ } else if (current_cpu == "x86") {
|
||||
+ _dir = "i386-redhat-linux-gnu"
|
||||
+ _suffix = "-i386"
|
||||
+ } else if (current_cpu == "arm64") {
|
||||
+ _dir = "aarch64-redhat-linux-gnu"
|
||||
+ _suffix = "-aarch64"
|
||||
+ } else if (current_cpu == "arm") {
|
||||
+ _dir = "armhf-redhat-linux-gnu"
|
||||
+ _suffix = "-armhf"
|
||||
+ } else if (current_cpu == "ppc64") {
|
||||
+ _dir = "powerpc64le-redhat-linux-gnu"
|
||||
+ _suffix = "-powerpc64le"
|
||||
+ } else {
|
||||
+ assert(false) # Unhandled cpu type
|
||||
+ }
|
||||
+ # different clang lib dir in fedora/epel
|
||||
+ if (clang_version == "17" || clang_version == "18") {
|
||||
+ _suffix = ""
|
||||
+ } else if (clang_version == "16" || clang_version == "14") {
|
||||
+ _libprefix = "64"
|
||||
+ _dir = ""
|
||||
+ }
|
||||
+ } else if (is_chromeos) {
|
||||
if (current_cpu == "x64") {
|
||||
_dir = "x86_64-unknown-linux-gnu"
|
||||
} else if (current_cpu == "x86") {
|
||||
@@ -166,7 +193,7 @@ template("clang_lib") {
|
||||
assert(false) # Unhandled target platform
|
||||
}
|
||||
|
||||
- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
||||
+ _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib"
|
||||
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
||||
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
||||
}
|
||||
@ -1,740 +0,0 @@
|
||||
commit 940af9f2c87b436559b97c53763aa9eaaf1254eb
|
||||
Author: Jeremy Roman <jbroman@chromium.org>
|
||||
Date: Wed Nov 15 16:24:54 2023 +0000
|
||||
|
||||
Use C++20 features to simplify blink::NativeValueTraitsBase.
|
||||
|
||||
These allow some of the metaprogramming bits to be simplified a little.
|
||||
|
||||
Change-Id: I052b4397586d21348401616e1792afdb9662f975
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5030335
|
||||
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
|
||||
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1224978}
|
||||
|
||||
diff -up chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc.me chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc
|
||||
--- chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc.me 2024-02-21 01:20:53.138946500 +0100
|
||||
+++ chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_buffer_sources.cc 2024-02-21 12:33:53.226207103 +0100
|
||||
@@ -7,7 +7,6 @@
|
||||
#include "third_party/blink/renderer/core/core_export.h"
|
||||
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
|
||||
#include "third_party/blink/renderer/core/frame/web_feature.h"
|
||||
-#include "third_party/blink/renderer/core/typed_arrays/flexible_array_buffer_view.h"
|
||||
#include "third_party/blink/renderer/core/typed_arrays/typed_flexible_array_buffer_view.h"
|
||||
|
||||
namespace blink {
|
||||
@@ -699,11 +698,12 @@ DOMArrayBufferBase* NativeValueTraits<
|
||||
// ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-NotShared<T> NativeValueTraits<NotShared<T>>::NativeValue(
|
||||
- v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+NotShared<T> NativeValueTraits<
|
||||
+ NotShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ NativeValue(v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -712,12 +712,13 @@ NotShared<T> NativeValueTraits<NotShared
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-NotShared<T> NativeValueTraits<NotShared<T>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+NotShared<T> NativeValueTraits<
|
||||
+ NotShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -728,11 +729,12 @@ NotShared<T> NativeValueTraits<NotShared
|
||||
// [AllowShared] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T> NativeValueTraits<MaybeShared<T>>::NativeValue(
|
||||
- v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ MaybeShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ NativeValue(v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -741,12 +743,13 @@ MaybeShared<T> NativeValueTraits<MaybeSh
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T> NativeValueTraits<MaybeShared<T>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ MaybeShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
@@ -757,12 +760,12 @@ MaybeShared<T> NativeValueTraits<MaybeSh
|
||||
// [AllowShared, BufferSourceTypeNoSizeLimit] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T>
|
||||
-NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>::NativeValue(
|
||||
- v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ NativeValue(v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<MaybeShared<T>>, ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kDoNotCheck,
|
||||
@@ -771,12 +774,13 @@ NativeValueTraits<IDLBufferSourceTypeNoS
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T> NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<
|
||||
- MaybeShared<T>>>::ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<MaybeShared<T>>, ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kDoNotCheck,
|
||||
@@ -787,11 +791,12 @@ MaybeShared<T> NativeValueTraits<IDLBuff
|
||||
// Nullable ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-NotShared<T> NativeValueTraits<IDLNullable<NotShared<T>>>::NativeValue(
|
||||
- v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+NotShared<T> NativeValueTraits<
|
||||
+ IDLNullable<NotShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ NativeValue(v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -800,12 +805,13 @@ NotShared<T> NativeValueTraits<IDLNullab
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-NotShared<T> NativeValueTraits<IDLNullable<NotShared<T>>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+NotShared<T> NativeValueTraits<
|
||||
+ IDLNullable<NotShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<NotShared<T>>, ToDOMViewType<T, kNotShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -816,11 +822,12 @@ NotShared<T> NativeValueTraits<IDLNullab
|
||||
// Nullable [AllowShared] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T> NativeValueTraits<IDLNullable<MaybeShared<T>>>::NativeValue(
|
||||
- v8::Isolate* isolate,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ IDLNullable<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ NativeValue(v8::Isolate* isolate,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return NativeValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -829,12 +836,13 @@ MaybeShared<T> NativeValueTraits<IDLNull
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T> NativeValueTraits<IDLNullable<MaybeShared<T>>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ IDLNullable<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<MaybeShared<T>>,
|
||||
ToDOMViewType<T, kMaybeShared>,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
@@ -845,9 +853,9 @@ MaybeShared<T> NativeValueTraits<IDLNull
|
||||
// Nullable [AllowShared, BufferSourceTypeNoSizeLimit] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-MaybeShared<T>
|
||||
-NativeValueTraits<IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>>::
|
||||
+MaybeShared<T> NativeValueTraits<
|
||||
+ IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>::
|
||||
ArgumentValue(v8::Isolate* isolate,
|
||||
int argument_index,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -862,11 +870,13 @@ NativeValueTraits<IDLNullable<IDLBufferS
|
||||
// [AllowShared, FlexibleArrayBufferView] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-T NativeValueTraits<T>::ArgumentValue(v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+T NativeValueTraits<T,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<T>, ToFlexibleArrayBufferView,
|
||||
Nullablity::kIsNotNullable, BufferSizeCheck::kCheck,
|
||||
ResizableAllowance::kDisallowResizable,
|
||||
@@ -878,12 +888,13 @@ T NativeValueTraits<T>::ArgumentValue(v8
|
||||
// ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-T NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+T NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<
|
||||
RecipeTrait<T>, ToFlexibleArrayBufferView, Nullablity::kIsNotNullable,
|
||||
BufferSizeCheck::kDoNotCheck, ResizableAllowance::kDisallowResizable,
|
||||
@@ -894,12 +905,13 @@ T NativeValueTraits<IDLBufferSourceTypeN
|
||||
// Nullable [AllowShared, FlexibleArrayBufferView] ArrayBufferView
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-T NativeValueTraits<IDLNullable<T>>::ArgumentValue(
|
||||
- v8::Isolate* isolate,
|
||||
- int argument_index,
|
||||
- v8::Local<v8::Value> value,
|
||||
- ExceptionState& exception_state) {
|
||||
+T NativeValueTraits<IDLNullable<T>,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>::
|
||||
+ ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state) {
|
||||
return ArgumentValueImpl<RecipeTrait<T>, ToFlexibleArrayBufferView,
|
||||
Nullablity::kIsNullable, BufferSizeCheck::kCheck,
|
||||
ResizableAllowance::kDisallowResizable,
|
||||
diff -up chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits.h.me chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits.h
|
||||
--- chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits.h.me 2024-02-21 01:20:53.138946500 +0100
|
||||
+++ chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits.h 2024-02-21 12:33:53.225207075 +0100
|
||||
@@ -5,7 +5,6 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_H_
|
||||
|
||||
-#include <concepts>
|
||||
#include <type_traits>
|
||||
|
||||
#include "third_party/blink/renderer/bindings/core/v8/idl_types_base.h"
|
||||
@@ -31,7 +30,7 @@ class ExceptionState;
|
||||
// return toInt32(isolate, value, exceptionState, NormalConversion);
|
||||
// }
|
||||
// }
|
||||
-template <typename T>
|
||||
+template <typename T, typename SFINAEHelper = void>
|
||||
struct NativeValueTraits;
|
||||
|
||||
// This declaration serves only as a blueprint for specializations: the
|
||||
@@ -46,15 +45,22 @@ struct NativeValueTraits;
|
||||
|
||||
namespace bindings {
|
||||
|
||||
+template <typename T, typename = void>
|
||||
+struct NativeValueTraitsHasIsNull : std::false_type {};
|
||||
+
|
||||
template <typename T>
|
||||
-struct ImplTypeFor {
|
||||
- using type = T;
|
||||
-};
|
||||
+struct NativeValueTraitsHasIsNull<
|
||||
+ T,
|
||||
+ std::void_t<decltype(std::declval<T>().IsNull())>> : std::true_type {};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, IDLBase>
|
||||
-struct ImplTypeFor<T> {
|
||||
- using type = typename T::ImplType;
|
||||
+struct NativeValueTraitsHasNullValue {
|
||||
+ // true if |T| supports IDL null value.
|
||||
+ static constexpr bool value =
|
||||
+ // ScriptValue, String, and union types have IsNull member function.
|
||||
+ bindings::NativeValueTraitsHasIsNull<T>::value ||
|
||||
+ // Pointer types have nullptr as IDL null value.
|
||||
+ std::is_pointer<T>::value;
|
||||
};
|
||||
|
||||
} // namespace bindings
|
||||
@@ -72,17 +78,37 @@ struct ImplTypeFor<T> {
|
||||
// If present, |NullValue()| will be used when converting from the nullable type
|
||||
// T?, and should be used if the impl type has an existing "null" state. If not
|
||||
// present, WTF::Optional will be used to wrap the type.
|
||||
-template <typename T>
|
||||
+template <typename T, typename SFINAEHelper = void>
|
||||
struct NativeValueTraitsBase {
|
||||
STATIC_ONLY(NativeValueTraitsBase);
|
||||
|
||||
- using ImplType = bindings::ImplTypeFor<T>::type;
|
||||
+ using ImplType = T;
|
||||
+
|
||||
+ static constexpr bool has_null_value =
|
||||
+ bindings::NativeValueTraitsHasNullValue<ImplType>::value;
|
||||
+
|
||||
+ template <typename... ExtraArgs>
|
||||
+ static decltype(auto) ArgumentValue(v8::Isolate* isolate,
|
||||
+ int argument_index,
|
||||
+ v8::Local<v8::Value> value,
|
||||
+ ExceptionState& exception_state,
|
||||
+ ExtraArgs... extra_args) {
|
||||
+ return NativeValueTraits<std::remove_pointer_t<T>>::NativeValue(
|
||||
+ isolate, value, exception_state,
|
||||
+ std::forward<ExtraArgs>(extra_args)...);
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+template <typename T>
|
||||
+struct NativeValueTraitsBase<
|
||||
+ T,
|
||||
+ std::enable_if_t<std::is_base_of<IDLBase, T>::value>> {
|
||||
+ STATIC_ONLY(NativeValueTraitsBase);
|
||||
+
|
||||
+ using ImplType = typename T::ImplType;
|
||||
|
||||
- // Pointer types have nullptr as IDL null value.
|
||||
- // ScriptValue, String, and union types have IsNull member function.
|
||||
static constexpr bool has_null_value =
|
||||
- std::is_pointer_v<ImplType> ||
|
||||
- requires(ImplType value) { value.IsNull(); };
|
||||
+ bindings::NativeValueTraitsHasNullValue<ImplType>::value;
|
||||
|
||||
// This should only be true for certain subclasses of ScriptWrappable
|
||||
// that satisfy the assumptions of CreateIDLSequenceFromV8ArraySlow() with
|
||||
diff -up chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h.me chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h
|
||||
--- chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h.me 2024-02-21 01:20:53.138946500 +0100
|
||||
+++ chromium-122.0.6261.57/third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h 2024-02-21 12:33:53.227207131 +0100
|
||||
@@ -5,9 +5,6 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_IMPL_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_NATIVE_VALUE_TRAITS_IMPL_H_
|
||||
|
||||
-#include <concepts>
|
||||
-#include <type_traits>
|
||||
-
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "third_party/blink/renderer/bindings/core/v8/idl_types.h"
|
||||
#include "third_party/blink/renderer/bindings/core/v8/native_value_traits.h"
|
||||
@@ -736,8 +733,9 @@ struct CORE_EXPORT NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<T> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>> {
|
||||
// NotShared<T> or MaybeShared<T> should be used instead.
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -749,8 +747,9 @@ struct NativeValueTraits<T> {
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<IDLNullable<T>> {
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>> {
|
||||
// NotShared<T> or MaybeShared<T> should be used instead.
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -762,8 +761,9 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<NotShared<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ NotShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<NotShared<T>> {
|
||||
static NotShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -776,8 +776,9 @@ struct NativeValueTraits<NotShared<T>>
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<IDLNullable<NotShared<T>>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<NotShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<NotShared<T>> {
|
||||
static NotShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -790,8 +791,9 @@ struct NativeValueTraits<IDLNullable<Not
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<MaybeShared<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ MaybeShared<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -804,8 +806,9 @@ struct NativeValueTraits<MaybeShared<T>>
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
// FlexibleArrayBufferView uses this in its implementation, so we cannot
|
||||
// delete it.
|
||||
@@ -820,8 +823,9 @@ struct NativeValueTraits<IDLBufferSource
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
-struct NativeValueTraits<IDLNullable<MaybeShared<T>>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<MaybeShared<T>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -834,9 +838,9 @@ struct NativeValueTraits<IDLNullable<May
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, DOMArrayBufferView>
|
||||
struct NativeValueTraits<
|
||||
- IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>>
|
||||
+ IDLNullable<IDLBufferSourceTypeNoSizeLimit<MaybeShared<T>>>,
|
||||
+ typename std::enable_if_t<std::is_base_of<DOMArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<MaybeShared<T>> {
|
||||
// BufferSourceTypeNoSizeLimit must be used only as arguments.
|
||||
static MaybeShared<T> NativeValue(v8::Isolate* isolate,
|
||||
@@ -850,8 +854,11 @@ struct NativeValueTraits<
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T> {
|
||||
// FlexibleArrayBufferView must be used only as arguments.
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -864,8 +871,10 @@ struct NativeValueTraits<T> : public Nat
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-struct NativeValueTraits<IDLBufferSourceTypeNoSizeLimit<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLBufferSourceTypeNoSizeLimit<T>,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
: public NativeValueTraitsBase<T> {
|
||||
// BufferSourceTypeNoSizeLimit and FlexibleArrayBufferView must be used only
|
||||
// as arguments.
|
||||
@@ -880,8 +889,11 @@ struct NativeValueTraits<IDLBufferSource
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, FlexibleArrayBufferView>
|
||||
-struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T> {
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<FlexibleArrayBufferView, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T> {
|
||||
// FlexibleArrayBufferView must be used only as arguments.
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1217,8 +1229,9 @@ NativeValueTraits<IDLSequence<T>>::Nativ
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
- requires NativeValueTraits<IDLSequence<T>>::has_null_value
|
||||
-struct NativeValueTraits<IDLNullable<IDLSequence<T>>>
|
||||
+struct NativeValueTraits<IDLNullable<IDLSequence<T>>,
|
||||
+ typename std::enable_if_t<
|
||||
+ NativeValueTraits<IDLSequence<T>>::has_null_value>>
|
||||
: public NativeValueTraitsBase<HeapVector<AddMemberIfNeeded<T>>*> {
|
||||
using ImplType = typename NativeValueTraits<IDLSequence<T>>::ImplType*;
|
||||
|
||||
@@ -1294,8 +1307,9 @@ struct NativeValueTraits<IDLArray<T>>
|
||||
: public NativeValueTraits<IDLSequence<T>> {};
|
||||
|
||||
template <typename T>
|
||||
- requires NativeValueTraits<IDLSequence<T>>::has_null_value
|
||||
-struct NativeValueTraits<IDLNullable<IDLArray<T>>>
|
||||
+struct NativeValueTraits<IDLNullable<IDLArray<T>>,
|
||||
+ typename std::enable_if_t<
|
||||
+ NativeValueTraits<IDLSequence<T>>::has_null_value>>
|
||||
: public NativeValueTraits<IDLNullable<IDLSequence<T>>> {};
|
||||
|
||||
// Record types
|
||||
@@ -1425,8 +1439,10 @@ struct NativeValueTraits<IDLRecord<K, V>
|
||||
|
||||
// Callback function types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, CallbackFunctionBase>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<std::is_base_of<CallbackFunctionBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1449,8 +1465,9 @@ struct NativeValueTraits<T> : public Nat
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, CallbackFunctionBase>
|
||||
-struct NativeValueTraits<IDLNullable<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<CallbackFunctionBase, T>::value>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1479,8 +1496,10 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
|
||||
// Callback interface types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, CallbackInterfaceBase>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<std::is_base_of<CallbackInterfaceBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1504,8 +1523,9 @@ struct NativeValueTraits<T> : public Nat
|
||||
|
||||
// Interface types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, CallbackInterfaceBase>
|
||||
-struct NativeValueTraits<IDLNullable<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<CallbackInterfaceBase, T>::value>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1534,8 +1554,11 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
|
||||
// Dictionary types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, bindings::DictionaryBase>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<bindings::DictionaryBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1546,11 +1569,14 @@ struct NativeValueTraits<T> : public Nat
|
||||
// We don't support nullable dictionary types in general since it's quite
|
||||
// confusing and often misused.
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, bindings::DictionaryBase> &&
|
||||
- (std::same_as<T, GPUColorTargetState> ||
|
||||
- std::same_as<T, GPURenderPassColorAttachment> ||
|
||||
- std::same_as<T, GPUVertexBufferLayout>)
|
||||
-struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<bindings::DictionaryBase, T>::value &&
|
||||
+ (std::is_same<T, GPUColorTargetState>::value ||
|
||||
+ std::is_same<T, GPURenderPassColorAttachment>::value ||
|
||||
+ std::is_same<T, GPUVertexBufferLayout>::value)>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1562,8 +1588,11 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
|
||||
// Enumeration types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, bindings::EnumerationBase>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<
|
||||
+ std::is_base_of<bindings::EnumerationBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T> {
|
||||
static T NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1573,8 +1602,10 @@ struct NativeValueTraits<T> : public Nat
|
||||
|
||||
// Interface types
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, ScriptWrappable>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<std::is_base_of<ScriptWrappable, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
// This signifies that CreateIDLSequenceFromV8ArraySlow() may apply
|
||||
// certain optimization based on assumptions about `NativeValue()`
|
||||
// implementation below. For subclasses of ScriptWrappable that have
|
||||
@@ -1611,8 +1642,9 @@ struct NativeValueTraits<T> : public Nat
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, ScriptWrappable>
|
||||
-struct NativeValueTraits<IDLNullable<T>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<ScriptWrappable, T>::value>>
|
||||
: public NativeValueTraitsBase<IDLNullable<T>> {
|
||||
static inline T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
@@ -1647,8 +1679,10 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, bindings::UnionBase>
|
||||
-struct NativeValueTraits<T> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ T,
|
||||
+ typename std::enable_if_t<std::is_base_of<bindings::UnionBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1664,8 +1698,10 @@ struct NativeValueTraits<T> : public Nat
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::derived_from<T, bindings::UnionBase>
|
||||
-struct NativeValueTraits<IDLNullable<T>> : public NativeValueTraitsBase<T*> {
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<T>,
|
||||
+ typename std::enable_if_t<std::is_base_of<bindings::UnionBase, T>::value>>
|
||||
+ : public NativeValueTraitsBase<T*> {
|
||||
static T* NativeValue(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> value,
|
||||
ExceptionState& exception_state) {
|
||||
@@ -1686,8 +1722,9 @@ struct NativeValueTraits<IDLNullable<T>>
|
||||
|
||||
// Nullable types
|
||||
template <typename InnerType>
|
||||
- requires(!NativeValueTraits<InnerType>::has_null_value)
|
||||
-struct NativeValueTraits<IDLNullable<InnerType>>
|
||||
+struct NativeValueTraits<
|
||||
+ IDLNullable<InnerType>,
|
||||
+ typename std::enable_if_t<!NativeValueTraits<InnerType>::has_null_value>>
|
||||
: public NativeValueTraitsBase<IDLNullable<InnerType>> {
|
||||
// https://webidl.spec.whatwg.org/#es-nullable-type
|
||||
using ImplType =
|
||||
@@ -1719,8 +1756,9 @@ struct NativeValueTraits<IDLNullable<IDL
|
||||
|
||||
// Optional types
|
||||
template <typename T>
|
||||
- requires std::is_arithmetic_v<typename NativeValueTraits<T>::ImplType>
|
||||
-struct NativeValueTraits<IDLOptional<T>>
|
||||
+struct NativeValueTraits<IDLOptional<T>,
|
||||
+ typename std::enable_if_t<std::is_arithmetic<
|
||||
+ typename NativeValueTraits<T>::ImplType>::value>>
|
||||
: public NativeValueTraitsBase<typename NativeValueTraits<T>::ImplType> {
|
||||
using ImplType = typename NativeValueTraits<T>::ImplType;
|
||||
|
||||
@@ -1742,8 +1780,9 @@ struct NativeValueTraits<IDLOptional<T>>
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
- requires std::is_pointer_v<typename NativeValueTraits<T>::ImplType>
|
||||
-struct NativeValueTraits<IDLOptional<T>>
|
||||
+struct NativeValueTraits<IDLOptional<T>,
|
||||
+ typename std::enable_if_t<std::is_pointer<
|
||||
+ typename NativeValueTraits<T>::ImplType>::value>>
|
||||
: public NativeValueTraitsBase<typename NativeValueTraits<T>::ImplType> {
|
||||
using ImplType = typename NativeValueTraits<T>::ImplType;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,78 +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.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-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.than chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
|
||||
--- chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.than 2023-12-19 17:57:56.205197246 +0100
|
||||
+++ chromium-121.0.6167.16/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc 2023-12-19 18:10:13.778634531 +0100
|
||||
@@ -3527,8 +3527,8 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
DCHECK(out_row_break_between);
|
||||
|
||||
const auto& container_space = GetConstraintSpace();
|
||||
- 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 =
|
||||
container_space.GetWritingDirection();
|
||||
@@ -3691,8 +3691,9 @@ void GridLayoutAlgorithm::PlaceGridItems
|
||||
|
||||
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
|
||||
const auto& constraint_space = GetConstraintSpace();
|
||||
- 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 =
|
||||
constraint_space.GetWritingDirection();
|
||||
diff -up chromium-122.0.6261.69/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc.me chromium-122.0.6261.69/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc
|
||||
--- chromium-122.0.6261.69/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc.me 2024-02-25 18:03:51.654579579 +0100
|
||||
+++ chromium-122.0.6261.69/chrome/browser/predictors/lcp_critical_path_predictor/prewarm_http_disk_cache_manager.cc 2024-02-25 18:12:45.144287750 +0100
|
||||
@@ -136,7 +136,8 @@ void PrewarmHttpDiskCacheManager::MaybeP
|
||||
std::pair<url::Origin, GURL> origin_and_url;
|
||||
std::swap(origin_and_url, queued_jobs_.front());
|
||||
queued_jobs_.pop();
|
||||
- const auto& [origin, url] = origin_and_url;
|
||||
+ const auto& [origin, u] = origin_and_url;
|
||||
+ const auto& url = u;
|
||||
TRACE_EVENT_WITH_FLOW1(
|
||||
"loading", "PrewarmHttpDiskCacheManager::MaybeProcessNextQueuedJob",
|
||||
TRACE_ID_LOCAL(this),
|
||||
--- chromium-123.0.6312.46/content/common/service_worker/race_network_request_url_loader_client.cc.orig 2024-03-15 15:37:58.201209354 +0100
|
||||
+++ chromium-123.0.6312.46/content/common/service_worker/race_network_request_url_loader_client.cc 2024-03-15 15:40:35.003250723 +0100
|
||||
@@ -639,7 +639,8 @@
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
- auto [result, read_buffer] = BeginReadData();
|
||||
+ auto [r, read_buffer] = BeginReadData();
|
||||
+ auto result = r;
|
||||
TRACE_EVENT_WITH_FLOW2(
|
||||
"ServiceWorker",
|
||||
"ServiceWorkerRaceNetworkRequestURLLoaderClient::ReadAndWrite",
|
||||
@ -1,22 +0,0 @@
|
||||
diff -up chromium-124.0.6367.49/build/config/compiler/BUILD.gn.orig chromium-124.0.6367.49/build/config/compiler/BUILD.gn
|
||||
--- chromium-124.0.6367.49/build/config/compiler/BUILD.gn.orig 2024-04-14 22:43:02.906578948 +0200
|
||||
+++ chromium-124.0.6367.49/build/config/compiler/BUILD.gn 2024-04-14 22:46:19.513353809 +0200
|
||||
@@ -1890,9 +1890,6 @@ config("default_warnings") {
|
||||
|
||||
# TODO(crbug.com/1494809): Evaluate and possibly enable.
|
||||
"-Wno-vla-extension",
|
||||
-
|
||||
- # TODO(https://crbug.com/1490607): Fix and re-enable.
|
||||
- "-Wno-thread-safety-reference-return",
|
||||
]
|
||||
|
||||
cflags_cc += [
|
||||
@@ -1903,7 +1900,7 @@ config("default_warnings") {
|
||||
if (!is_nacl) {
|
||||
cflags_cc += [
|
||||
# TODO(https://crbug.com/1513724): Fix and re-enable.
|
||||
- "-Wno-c++11-narrowing-const-reference",
|
||||
+ "-Wno-c++11-narrowing",
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
commit a976cb05b4024b7a6452d1541378d718cdfe33e6
|
||||
Author: Takuto Ikuta <tikuta@chromium.org>
|
||||
Date: Thu Apr 25 07:25:32 2024 +0000
|
||||
|
||||
[devtools] fix a missing build dependency to a generated file
|
||||
|
||||
Bug: 336911498
|
||||
Change-Id: I6e6d3afaf33ace53a68271b70165b8c3ab596340
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5487538
|
||||
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
|
||||
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
|
||||
Reviewed-by: Danil Somsikov <dsv@chromium.org>
|
||||
Commit-Queue: Danil Somsikov <dsv@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1292300}
|
||||
|
||||
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
|
||||
index f0c07cad8cfb4..053199e462f55 100644
|
||||
--- a/chrome/browser/devtools/BUILD.gn
|
||||
+++ b/chrome/browser/devtools/BUILD.gn
|
||||
@@ -117,6 +117,7 @@ static_library("devtools") {
|
||||
"//chrome/browser/autofill:autofill",
|
||||
"//components/autofill/content/browser:browser",
|
||||
"//components/autofill/core/browser:browser",
|
||||
+ "//components/enterprise/buildflags",
|
||||
"//components/paint_preview/buildflags:buildflags",
|
||||
"//components/variations/service:service",
|
||||
"//components/webapps/common:common",
|
||||
@ -1,242 +0,0 @@
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h.const 2024-05-18 18:57:37.099203314 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h 2024-05-18 22:16:52.879603051 +0200
|
||||
@@ -42,7 +42,7 @@ class ShoppingInsightsSidePanelUI
|
||||
mojo::PendingReceiver<
|
||||
shopping_service::mojom::ShoppingServiceHandlerFactory> receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "ShoppingInsightsSidePanel";
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/compose/compose_untrusted_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/compose/compose_untrusted_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/compose/compose_untrusted_ui.h.const 2024-05-18 19:03:13.999255471 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/compose/compose_untrusted_ui.h 2024-05-18 22:16:52.883603124 +0200
|
||||
@@ -58,7 +58,7 @@ class ComposeUntrustedUI
|
||||
triggering_web_contents_ = web_contents->GetWeakPtr();
|
||||
}
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "Compose"; }
|
||||
+ static const std::string GetWebUIName() { return "Compose"; }
|
||||
|
||||
private:
|
||||
void CreateComposeSessionUntrustedPageHandler(
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/lens/lens_untrusted_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/lens/lens_untrusted_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/lens/lens_untrusted_ui.h.const 2024-05-18 18:59:16.859995432 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/lens/lens_untrusted_ui.h 2024-05-18 22:16:52.883603124 +0200
|
||||
@@ -47,7 +47,7 @@ class LensUntrustedUI : public Untrusted
|
||||
mojo::PendingReceiver<color_change_listener::mojom::PageHandler>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "LensUntrusted"; }
|
||||
+ static const std::string GetWebUIName() { return "LensUntrusted"; }
|
||||
|
||||
private:
|
||||
// lens::mojom::LensPageHandlerFactory:
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/lens/search_bubble_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/lens/search_bubble_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/lens/search_bubble_ui.h.const 2024-05-18 18:59:49.020573177 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/lens/search_bubble_ui.h 2024-05-18 22:16:52.883603124 +0200
|
||||
@@ -26,7 +26,7 @@ class SearchBubbleUI : public TopChromeW
|
||||
mojo::PendingReceiver<lens::mojom::SearchBubblePageHandlerFactory>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "LensSearchBubble"; }
|
||||
+ static const std::string GetWebUIName() { return "LensSearchBubble"; }
|
||||
|
||||
private:
|
||||
// lens::mojom::SearchBubblePageHandlerFactory
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h.const 2024-05-18 19:00:08.686926471 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h 2024-05-18 22:16:52.883603124 +0200
|
||||
@@ -63,7 +63,7 @@ class BookmarksSidePanelUI
|
||||
commerce::ShoppingListContextMenuController*
|
||||
GetShoppingListContextMenuController();
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "BookmarksSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "BookmarksSidePanel"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::BookmarksPageHandlerFactory:
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h.const 2024-05-18 19:00:36.351423440 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h 2024-05-18 22:16:52.884603143 +0200
|
||||
@@ -34,7 +34,7 @@ class CompanionSidePanelUntrustedUI
|
||||
// Gets a weak pointer to this object.
|
||||
base::WeakPtr<CompanionSidePanelUntrustedUI> GetWeakPtr();
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "CompanionSidePanelUntrusted";
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h.const 2024-05-18 19:00:56.088778012 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h 2024-05-18 22:16:52.884603143 +0200
|
||||
@@ -102,7 +102,7 @@ class CustomizeChromeUI
|
||||
side_panel::customize_chrome::mojom::WallpaperSearchHandlerFactory>
|
||||
pending_receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "CustomizeChrome"; }
|
||||
+ static const std::string GetWebUIName() { return "CustomizeChrome"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::CustomizeChromePageHandlerFactory
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h.const 2024-05-18 19:01:15.986135446 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h 2024-05-18 22:16:52.884603143 +0200
|
||||
@@ -70,7 +70,7 @@ class HistoryClustersSidePanelUI : publi
|
||||
void DidFinishNavigation(
|
||||
content::NavigationHandle* navigation_handle) override;
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "HistoryClustersSidePanel";
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h.const 2024-05-18 19:01:34.274463982 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h 2024-05-18 22:16:52.884603143 +0200
|
||||
@@ -41,7 +41,7 @@ class PerformanceSidePanelUI
|
||||
mojo::PendingReceiver<color_change_listener::mojom::PageHandler>
|
||||
pending_receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "PerformanceSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "PerformanceSidePanel"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::PerformancePageHandlerFactory:
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h.const 2024-05-18 19:01:52.842797556 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h 2024-05-18 22:16:52.884603143 +0200
|
||||
@@ -55,7 +55,7 @@ class ReadAnythingUntrustedUI
|
||||
mojo::PendingReceiver<read_anything::mojom::UntrustedPageHandlerFactory>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "ReadAnythingUntrusted";
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h.const 2024-05-18 19:02:17.381238375 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h 2024-05-18 22:16:52.885603162 +0200
|
||||
@@ -47,7 +47,7 @@ class ReadingListUI : public TopChromeWe
|
||||
|
||||
void SetActiveTabURL(const GURL& url);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "ReadingList"; }
|
||||
+ static const std::string GetWebUIName() { return "ReadingList"; }
|
||||
|
||||
private:
|
||||
// reading_list::mojom::PageHandlerFactory:
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h.const 2024-05-18 19:02:34.413544341 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h 2024-05-18 22:16:52.885603162 +0200
|
||||
@@ -35,7 +35,7 @@ class UserNotesSidePanelUI
|
||||
|
||||
void set_browser(Browser* browser) { browser_ = browser; }
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "UserNotesSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "UserNotesSidePanel"; }
|
||||
|
||||
private:
|
||||
// user_notes::mojom::UserNotesPageHandlerFactory
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/webui/tab_search/tab_search_ui.h.const chromium-125.0.6422.60/chrome/browser/ui/webui/tab_search/tab_search_ui.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/webui/tab_search/tab_search_ui.h.const 2024-05-18 19:02:52.261864965 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/webui/tab_search/tab_search_ui.h 2024-05-18 22:16:52.885603162 +0200
|
||||
@@ -46,7 +46,7 @@ class TabSearchUI : public TopChromeWebU
|
||||
return page_handler_.get();
|
||||
}
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "TabSearch"; }
|
||||
+ static const std::string GetWebUIName() { return "TabSearch"; }
|
||||
|
||||
private:
|
||||
// tab_search::mojom::PageHandlerFactory
|
||||
diff -up chromium-125.0.6422.60/components/omnibox/browser/on_device_tail_model_service.cc.const chromium-125.0.6422.60/components/omnibox/browser/on_device_tail_model_service.cc
|
||||
--- chromium-125.0.6422.60/components/omnibox/browser/on_device_tail_model_service.cc.const 2024-05-18 23:06:22.071586909 +0200
|
||||
+++ chromium-125.0.6422.60/components/omnibox/browser/on_device_tail_model_service.cc 2024-05-18 23:06:44.827133461 +0200
|
||||
@@ -30,7 +30,7 @@ namespace {
|
||||
// The maximum idle time before the model executor is unloaded from memory.
|
||||
constexpr base::TimeDelta kMaxExecutorIdleSeconds = base::Seconds(60);
|
||||
// Constants for TFlite model validation.
|
||||
-constexpr std::string kTestPrefix = "face";
|
||||
+const std::string kTestPrefix = "face";
|
||||
constexpr std::string_view kModelValidationSwitchName =
|
||||
"omnibox-on-device-tail-model-validation";
|
||||
|
||||
diff -up chromium-124.0.6367.118/components/autofill/core/browser/data_model/autofill_i18n_api.h.me chromium-124.0.6367.118/components/autofill/core/browser/data_model/autofill_i18n_api.h
|
||||
--- chromium-124.0.6367.118/components/autofill/core/browser/data_model/autofill_i18n_api.h.me 2024-05-07 07:58:10.202960298 +0200
|
||||
+++ chromium-124.0.6367.118/components/autofill/core/browser/data_model/autofill_i18n_api.h 2024-05-07 07:59:29.413411767 +0200
|
||||
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definitio
|
||||
// Country code that represents autofill's legacy address hierarchy model as
|
||||
// stored `kAutofillModelRules`. As a workaround for GCC we declare the
|
||||
// std::string constexpr first.
|
||||
-constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||||
-constexpr AddressCountryCode kLegacyHierarchyCountryCode =
|
||||
+const inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||||
+const AddressCountryCode kLegacyHierarchyCountryCode =
|
||||
AddressCountryCode(kLegacyHierarchyCountryCodeString);
|
||||
|
||||
// Creates an instance of the address hierarchy model corresponding to the
|
||||
diff -up chromium-124.0.6367.118/components/autofill/core/browser/metrics/log_event.h.me chromium-124.0.6367.118/components/autofill/core/browser/metrics/log_event.h
|
||||
--- chromium-124.0.6367.118/components/autofill/core/browser/metrics/log_event.h.me 2024-05-07 07:59:38.239573497 +0200
|
||||
+++ chromium-124.0.6367.118/components/autofill/core/browser/metrics/log_event.h 2024-05-07 08:00:55.578990659 +0200
|
||||
@@ -57,7 +57,7 @@ struct IsRequired {
|
||||
// This function is not defined and consteval. Therefore, any evaluation will
|
||||
// fail and fail at compile time.
|
||||
template <typename T>
|
||||
- consteval operator T(); // NOLINT
|
||||
+ operator T(); // NOLINT
|
||||
};
|
||||
|
||||
} // namespace internal
|
||||
diff -up chromium-124.0.6367.118/components/history/core/browser/history_types.h.me chromium-124.0.6367.118/components/history/core/browser/history_types.h
|
||||
--- chromium-124.0.6367.118/components/history/core/browser/history_types.h.me 2024-05-06 18:01:28.606845554 +0200
|
||||
+++ chromium-124.0.6367.118/components/history/core/browser/history_types.h 2024-05-06 18:06:15.492751252 +0200
|
||||
@@ -70,7 +70,7 @@ constexpr VisitedLinkID kInvalidVisitedL
|
||||
typedef std::map<VisitID, VisitSource> VisitSourceMap;
|
||||
|
||||
// Constant used to represent that no app_id is used for matching.
|
||||
-inline constexpr std::optional<std::string> kNoAppIdFilter = std::nullopt;
|
||||
+inline const std::optional<std::string> kNoAppIdFilter = std::nullopt;
|
||||
|
||||
// VisitRow -------------------------------------------------------------------
|
||||
|
||||
diff -up chromium-124.0.6367.118/services/network/shared_dictionary/simple_url_pattern_matcher.cc.me chromium-124.0.6367.118/services/network/shared_dictionary/simple_url_pattern_matcher.cc
|
||||
--- chromium-124.0.6367.118/services/network/shared_dictionary/simple_url_pattern_matcher.cc.me 2024-05-07 00:07:15.720573794 +0200
|
||||
+++ chromium-124.0.6367.118/services/network/shared_dictionary/simple_url_pattern_matcher.cc 2024-05-07 00:08:07.633519604 +0200
|
||||
@@ -28,17 +28,17 @@ namespace network {
|
||||
namespace {
|
||||
|
||||
// https://urlpattern.spec.whatwg.org/#default-options
|
||||
-constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||||
+const liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||||
.prefix_list = "",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
// https://urlpattern.spec.whatwg.org/#hostname-options
|
||||
-constexpr liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||||
+const liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||||
.prefix_list = "",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
// https://urlpattern.spec.whatwg.org/#pathname-options
|
||||
-constexpr liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||||
+const liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||||
.prefix_list = "/",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
diff -up chromium-124.0.6367.118/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py.me1 chromium-124.0.6367.118/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py
|
||||
--- chromium-124.0.6367.118/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py.me1 2024-05-07 10:58:13.316756926 +0200
|
||||
+++ chromium-124.0.6367.118/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py 2024-05-07 10:58:30.821083061 +0200
|
||||
@@ -54,7 +54,7 @@ def generate_matching_pattern_equals(nam
|
||||
yield '// Checks if all the matching patterns for the given PatternSources'
|
||||
yield '// and language are the same - meaning that computing predictions for'
|
||||
yield '// both is unnecessary, since it will yield the same result.'
|
||||
- yield 'constexpr bool AreMatchingPatternsEqualImpl(PatternSource a,'
|
||||
+ yield 'const bool AreMatchingPatternsEqualImpl(PatternSource a,'
|
||||
yield ' PatternSource b,'
|
||||
yield ' LanguageCode lang_code) {'
|
||||
yield ' if (a == b) {'
|
||||
@ -1,747 +0,0 @@
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/build.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/build.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/build.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/build.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -36,10 +36,10 @@
|
||||
|
||||
use std::env;
|
||||
use std::ffi::OsString;
|
||||
+use std::iter;
|
||||
use std::path::Path;
|
||||
use std::process::{self, Command, Stdio};
|
||||
use std::str;
|
||||
-use std::u32;
|
||||
|
||||
fn main() {
|
||||
let rustc = rustc_minor_version().unwrap_or(u32::MAX);
|
||||
@@ -63,6 +63,11 @@
|
||||
println!("cargo:rustc-cfg=no_source_text");
|
||||
}
|
||||
|
||||
+ if rustc < 79 {
|
||||
+ println!("cargo:rustc-cfg=no_literal_byte_character");
|
||||
+ println!("cargo:rustc-cfg=no_literal_c_string");
|
||||
+ }
|
||||
+
|
||||
if !cfg!(feature = "proc-macro") {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
return;
|
||||
@@ -138,15 +143,15 @@
|
||||
let out_dir = cargo_env_var("OUT_DIR");
|
||||
let probefile = Path::new("build").join("probe.rs");
|
||||
|
||||
- // Make sure to pick up Cargo rustc configuration.
|
||||
- let mut cmd = if let Some(wrapper) = env::var_os("RUSTC_WRAPPER") {
|
||||
- let mut cmd = Command::new(wrapper);
|
||||
- // The wrapper's first argument is supposed to be the path to rustc.
|
||||
- cmd.arg(rustc);
|
||||
- cmd
|
||||
- } else {
|
||||
- Command::new(rustc)
|
||||
- };
|
||||
+ let rustc_wrapper = env::var_os("RUSTC_WRAPPER").filter(|wrapper| !wrapper.is_empty());
|
||||
+ let rustc_workspace_wrapper =
|
||||
+ env::var_os("RUSTC_WORKSPACE_WRAPPER").filter(|wrapper| !wrapper.is_empty());
|
||||
+ let mut rustc = rustc_wrapper
|
||||
+ .into_iter()
|
||||
+ .chain(rustc_workspace_wrapper)
|
||||
+ .chain(iter::once(rustc));
|
||||
+ let mut cmd = Command::new(rustc.next().unwrap());
|
||||
+ cmd.args(rustc);
|
||||
|
||||
if !rustc_bootstrap {
|
||||
cmd.env_remove("RUSTC_BOOTSTRAP");
|
||||
@@ -156,6 +161,7 @@
|
||||
.arg("--edition=2021")
|
||||
.arg("--crate-name=proc_macro2")
|
||||
.arg("--crate-type=lib")
|
||||
+ .arg("--cap-lints=allow")
|
||||
.arg("--emit=dep-info,metadata")
|
||||
.arg("--out-dir")
|
||||
.arg(out_dir)
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/Cargo.toml chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/Cargo.toml
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/Cargo.toml 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/Cargo.toml 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
edition = "2021"
|
||||
rust-version = "1.56"
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.78"
|
||||
+version = "1.0.80"
|
||||
authors = [
|
||||
"David Tolnay <dtolnay@gmail.com>",
|
||||
"Alex Crichton <alex@alexcrichton.com>",
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/Cargo.toml.orig chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/Cargo.toml.orig
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/Cargo.toml.orig 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/Cargo.toml.orig 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.78"
|
||||
+version = "1.0.80"
|
||||
authors = ["David Tolnay <dtolnay@gmail.com>", "Alex Crichton <alex@alexcrichton.com>"]
|
||||
autobenches = false
|
||||
categories = ["development-tools::procedural-macro-helpers"]
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/.cargo_vcs_info.json chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/.cargo_vcs_info.json
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/.cargo_vcs_info.json 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/.cargo_vcs_info.json 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"git": {
|
||||
- "sha1": "d850a1db5e3fe7732d62cacbfc4145e496c2a80e"
|
||||
+ "sha1": "da51f8d005cc5d8299c1872fad9bbe63b07c31c7"
|
||||
},
|
||||
"path_in_vcs": ""
|
||||
}
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/.github/workflows/ci.yml chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/.github/workflows/ci.yml
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/.github/workflows/ci.yml 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/.github/workflows/ci.yml 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -198,6 +198,7 @@
|
||||
timeout-minutes: 45
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
+ - uses: dtolnay/rust-toolchain@stable
|
||||
- uses: dtolnay/install@cargo-outdated
|
||||
- run: cargo outdated --workspace --exit-code 1
|
||||
- run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/fallback.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/fallback.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/fallback.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/fallback.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -15,7 +15,9 @@
|
||||
use core::ops::Range;
|
||||
use core::ops::RangeBounds;
|
||||
use core::ptr;
|
||||
-use core::str::FromStr;
|
||||
+use core::str::{self, FromStr};
|
||||
+use std::ffi::CStr;
|
||||
+#[cfg(procmacro2_semver_exempt)]
|
||||
use std::path::PathBuf;
|
||||
|
||||
/// Force use of proc-macro2's fallback implementation of the API for now, even
|
||||
@@ -297,11 +299,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#[cfg(procmacro2_semver_exempt)]
|
||||
#[derive(Clone, PartialEq, Eq)]
|
||||
pub(crate) struct SourceFile {
|
||||
path: PathBuf,
|
||||
}
|
||||
|
||||
+#[cfg(procmacro2_semver_exempt)]
|
||||
impl SourceFile {
|
||||
/// Get the path to this source file as a string.
|
||||
pub fn path(&self) -> PathBuf {
|
||||
@@ -313,6 +317,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#[cfg(procmacro2_semver_exempt)]
|
||||
impl Debug for SourceFile {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
f.debug_struct("SourceFile")
|
||||
@@ -922,7 +927,7 @@
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct Literal {
|
||||
- repr: String,
|
||||
+ pub(crate) repr: String,
|
||||
span: Span,
|
||||
}
|
||||
|
||||
@@ -1003,71 +1008,98 @@
|
||||
Literal::_new(s)
|
||||
}
|
||||
|
||||
- pub fn string(t: &str) -> Literal {
|
||||
- let mut repr = String::with_capacity(t.len() + 2);
|
||||
+ pub fn string(string: &str) -> Literal {
|
||||
+ let mut repr = String::with_capacity(string.len() + 2);
|
||||
repr.push('"');
|
||||
- let mut chars = t.chars();
|
||||
- while let Some(ch) = chars.next() {
|
||||
- if ch == '\0' {
|
||||
- repr.push_str(
|
||||
- if chars
|
||||
- .as_str()
|
||||
- .starts_with(|next| '0' <= next && next <= '7')
|
||||
- {
|
||||
- // circumvent clippy::octal_escapes lint
|
||||
- "\\x00"
|
||||
- } else {
|
||||
- "\\0"
|
||||
- },
|
||||
- );
|
||||
- } else if ch == '\'' {
|
||||
- // escape_debug turns this into "\'" which is unnecessary.
|
||||
- repr.push(ch);
|
||||
- } else {
|
||||
- repr.extend(ch.escape_debug());
|
||||
- }
|
||||
- }
|
||||
+ escape_utf8(string, &mut repr);
|
||||
repr.push('"');
|
||||
Literal::_new(repr)
|
||||
}
|
||||
|
||||
- pub fn character(t: char) -> Literal {
|
||||
+ pub fn character(ch: char) -> Literal {
|
||||
let mut repr = String::new();
|
||||
repr.push('\'');
|
||||
- if t == '"' {
|
||||
+ if ch == '"' {
|
||||
// escape_debug turns this into '\"' which is unnecessary.
|
||||
- repr.push(t);
|
||||
+ repr.push(ch);
|
||||
} else {
|
||||
- repr.extend(t.escape_debug());
|
||||
+ repr.extend(ch.escape_debug());
|
||||
+ }
|
||||
+ repr.push('\'');
|
||||
+ Literal::_new(repr)
|
||||
+ }
|
||||
+
|
||||
+ pub fn byte_character(byte: u8) -> Literal {
|
||||
+ let mut repr = "b'".to_string();
|
||||
+ #[allow(clippy::match_overlapping_arm)]
|
||||
+ match byte {
|
||||
+ b'\0' => repr.push_str(r"\0"),
|
||||
+ b'\t' => repr.push_str(r"\t"),
|
||||
+ b'\n' => repr.push_str(r"\n"),
|
||||
+ b'\r' => repr.push_str(r"\r"),
|
||||
+ b'\'' => repr.push_str(r"\'"),
|
||||
+ b'\\' => repr.push_str(r"\\"),
|
||||
+ b'\x20'..=b'\x7E' => repr.push(byte as char),
|
||||
+ _ => {
|
||||
+ let _ = write!(repr, r"\x{:02X}", byte);
|
||||
+ }
|
||||
}
|
||||
repr.push('\'');
|
||||
Literal::_new(repr)
|
||||
}
|
||||
|
||||
pub fn byte_string(bytes: &[u8]) -> Literal {
|
||||
- let mut escaped = "b\"".to_string();
|
||||
+ let mut repr = "b\"".to_string();
|
||||
let mut bytes = bytes.iter();
|
||||
while let Some(&b) = bytes.next() {
|
||||
#[allow(clippy::match_overlapping_arm)]
|
||||
match b {
|
||||
- b'\0' => escaped.push_str(match bytes.as_slice().first() {
|
||||
+ b'\0' => repr.push_str(match bytes.as_slice().first() {
|
||||
// circumvent clippy::octal_escapes lint
|
||||
Some(b'0'..=b'7') => r"\x00",
|
||||
_ => r"\0",
|
||||
}),
|
||||
- b'\t' => escaped.push_str(r"\t"),
|
||||
- b'\n' => escaped.push_str(r"\n"),
|
||||
- b'\r' => escaped.push_str(r"\r"),
|
||||
- b'"' => escaped.push_str("\\\""),
|
||||
- b'\\' => escaped.push_str("\\\\"),
|
||||
- b'\x20'..=b'\x7E' => escaped.push(b as char),
|
||||
+ b'\t' => repr.push_str(r"\t"),
|
||||
+ b'\n' => repr.push_str(r"\n"),
|
||||
+ b'\r' => repr.push_str(r"\r"),
|
||||
+ b'"' => repr.push_str("\\\""),
|
||||
+ b'\\' => repr.push_str(r"\\"),
|
||||
+ b'\x20'..=b'\x7E' => repr.push(b as char),
|
||||
_ => {
|
||||
- let _ = write!(escaped, "\\x{:02X}", b);
|
||||
+ let _ = write!(repr, r"\x{:02X}", b);
|
||||
}
|
||||
}
|
||||
}
|
||||
- escaped.push('"');
|
||||
- Literal::_new(escaped)
|
||||
+ repr.push('"');
|
||||
+ Literal::_new(repr)
|
||||
+ }
|
||||
+
|
||||
+ pub fn c_string(string: &CStr) -> Literal {
|
||||
+ let mut repr = "c\"".to_string();
|
||||
+ let mut bytes = string.to_bytes();
|
||||
+ while !bytes.is_empty() {
|
||||
+ let (valid, invalid) = match str::from_utf8(bytes) {
|
||||
+ Ok(all_valid) => {
|
||||
+ bytes = b"";
|
||||
+ (all_valid, bytes)
|
||||
+ }
|
||||
+ Err(utf8_error) => {
|
||||
+ let (valid, rest) = bytes.split_at(utf8_error.valid_up_to());
|
||||
+ let valid = str::from_utf8(valid).unwrap();
|
||||
+ let invalid = utf8_error
|
||||
+ .error_len()
|
||||
+ .map_or(rest, |error_len| &rest[..error_len]);
|
||||
+ bytes = &bytes[valid.len() + invalid.len()..];
|
||||
+ (valid, invalid)
|
||||
+ }
|
||||
+ };
|
||||
+ escape_utf8(valid, &mut repr);
|
||||
+ for &byte in invalid {
|
||||
+ let _ = write!(repr, r"\x{:02X}", byte);
|
||||
+ }
|
||||
+ }
|
||||
+ repr.push('"');
|
||||
+ Literal::_new(repr)
|
||||
}
|
||||
|
||||
pub fn span(&self) -> Span {
|
||||
@@ -1168,3 +1200,27 @@
|
||||
debug.finish()
|
||||
}
|
||||
}
|
||||
+
|
||||
+fn escape_utf8(string: &str, repr: &mut String) {
|
||||
+ let mut chars = string.chars();
|
||||
+ while let Some(ch) = chars.next() {
|
||||
+ if ch == '\0' {
|
||||
+ repr.push_str(
|
||||
+ if chars
|
||||
+ .as_str()
|
||||
+ .starts_with(|next| '0' <= next && next <= '7')
|
||||
+ {
|
||||
+ // circumvent clippy::octal_escapes lint
|
||||
+ r"\x00"
|
||||
+ } else {
|
||||
+ r"\0"
|
||||
+ },
|
||||
+ );
|
||||
+ } else if ch == '\'' {
|
||||
+ // escape_debug turns this into "\'" which is unnecessary.
|
||||
+ repr.push(ch);
|
||||
+ } else {
|
||||
+ repr.extend(ch.escape_debug());
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/lib.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/lib.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/lib.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/lib.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -86,7 +86,7 @@
|
||||
//! a different thread.
|
||||
|
||||
// Proc-macro2 types in rustdoc of other crates get linked to here.
|
||||
-#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.78")]
|
||||
+#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.80")]
|
||||
#![cfg_attr(any(proc_macro_span, super_unstable), feature(proc_macro_span))]
|
||||
#![cfg_attr(super_unstable, feature(proc_macro_def_site))]
|
||||
#![cfg_attr(doc_cfg, feature(doc_cfg))]
|
||||
@@ -96,6 +96,7 @@
|
||||
clippy::cast_possible_truncation,
|
||||
clippy::checked_conversions,
|
||||
clippy::doc_markdown,
|
||||
+ clippy::incompatible_msrv,
|
||||
clippy::items_after_statements,
|
||||
clippy::iter_without_into_iter,
|
||||
clippy::let_underscore_untyped,
|
||||
@@ -169,6 +170,7 @@
|
||||
use core::ops::RangeBounds;
|
||||
use core::str::FromStr;
|
||||
use std::error::Error;
|
||||
+use std::ffi::CStr;
|
||||
#[cfg(procmacro2_semver_exempt)]
|
||||
use std::path::PathBuf;
|
||||
|
||||
@@ -1233,9 +1235,19 @@
|
||||
Literal::_new(imp::Literal::character(ch))
|
||||
}
|
||||
|
||||
+ /// Byte character literal.
|
||||
+ pub fn byte_character(byte: u8) -> Literal {
|
||||
+ Literal::_new(imp::Literal::byte_character(byte))
|
||||
+ }
|
||||
+
|
||||
/// Byte string literal.
|
||||
- pub fn byte_string(s: &[u8]) -> Literal {
|
||||
- Literal::_new(imp::Literal::byte_string(s))
|
||||
+ pub fn byte_string(bytes: &[u8]) -> Literal {
|
||||
+ Literal::_new(imp::Literal::byte_string(bytes))
|
||||
+ }
|
||||
+
|
||||
+ /// C string literal.
|
||||
+ pub fn c_string(string: &CStr) -> Literal {
|
||||
+ Literal::_new(imp::Literal::c_string(string))
|
||||
}
|
||||
|
||||
/// Returns the span encompassing this literal.
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/wrapper.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/wrapper.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/src/wrapper.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/src/wrapper.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -7,6 +7,7 @@
|
||||
use core::ops::Range;
|
||||
use core::ops::RangeBounds;
|
||||
use core::str::FromStr;
|
||||
+use std::ffi::CStr;
|
||||
use std::panic;
|
||||
#[cfg(super_unstable)]
|
||||
use std::path::PathBuf;
|
||||
@@ -846,19 +847,38 @@
|
||||
}
|
||||
}
|
||||
|
||||
- pub fn string(t: &str) -> Literal {
|
||||
+ pub fn string(string: &str) -> Literal {
|
||||
if inside_proc_macro() {
|
||||
- Literal::Compiler(proc_macro::Literal::string(t))
|
||||
+ Literal::Compiler(proc_macro::Literal::string(string))
|
||||
} else {
|
||||
- Literal::Fallback(fallback::Literal::string(t))
|
||||
+ Literal::Fallback(fallback::Literal::string(string))
|
||||
}
|
||||
}
|
||||
|
||||
- pub fn character(t: char) -> Literal {
|
||||
+ pub fn character(ch: char) -> Literal {
|
||||
if inside_proc_macro() {
|
||||
- Literal::Compiler(proc_macro::Literal::character(t))
|
||||
+ Literal::Compiler(proc_macro::Literal::character(ch))
|
||||
} else {
|
||||
- Literal::Fallback(fallback::Literal::character(t))
|
||||
+ Literal::Fallback(fallback::Literal::character(ch))
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ pub fn byte_character(byte: u8) -> Literal {
|
||||
+ if inside_proc_macro() {
|
||||
+ Literal::Compiler({
|
||||
+ #[cfg(not(no_literal_byte_character))]
|
||||
+ {
|
||||
+ proc_macro::Literal::byte_character(byte)
|
||||
+ }
|
||||
+
|
||||
+ #[cfg(no_literal_byte_character)]
|
||||
+ {
|
||||
+ let fallback = fallback::Literal::byte_character(byte);
|
||||
+ fallback.repr.parse::<proc_macro::Literal>().unwrap()
|
||||
+ }
|
||||
+ })
|
||||
+ } else {
|
||||
+ Literal::Fallback(fallback::Literal::byte_character(byte))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -870,6 +890,25 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ pub fn c_string(string: &CStr) -> Literal {
|
||||
+ if inside_proc_macro() {
|
||||
+ Literal::Compiler({
|
||||
+ #[cfg(not(no_literal_c_string))]
|
||||
+ {
|
||||
+ proc_macro::Literal::c_string(string)
|
||||
+ }
|
||||
+
|
||||
+ #[cfg(no_literal_c_string)]
|
||||
+ {
|
||||
+ let fallback = fallback::Literal::c_string(string);
|
||||
+ fallback.repr.parse::<proc_macro::Literal>().unwrap()
|
||||
+ }
|
||||
+ })
|
||||
+ } else {
|
||||
+ Literal::Fallback(fallback::Literal::c_string(string))
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
pub fn span(&self) -> Span {
|
||||
match self {
|
||||
Literal::Compiler(lit) => Span::Compiler(lit.span()),
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/tests/marker.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/tests/marker.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/tests/marker.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/tests/marker.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
$(
|
||||
{
|
||||
// Implemented for types that implement $marker.
|
||||
+ #[allow(dead_code)]
|
||||
trait IsNotImplemented {
|
||||
fn assert_not_implemented() {}
|
||||
}
|
||||
diff -Nur chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/tests/test.rs chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/tests/test.rs
|
||||
--- chromium-123.0.6312.122/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.78/tests/test.rs 2024-04-10 23:25:21.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/rust/chromium_crates_io/vendor/proc-macro2-1.0.80/tests/test.rs 2024-05-15 23:47:24.000000000 +0200
|
||||
@@ -1,11 +1,14 @@
|
||||
#![allow(
|
||||
clippy::assertions_on_result_states,
|
||||
clippy::items_after_statements,
|
||||
+ clippy::needless_pass_by_value,
|
||||
+ clippy::needless_raw_string_hashes,
|
||||
clippy::non_ascii_literal,
|
||||
clippy::octal_escapes
|
||||
)]
|
||||
|
||||
use proc_macro2::{Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
|
||||
+use std::ffi::CStr;
|
||||
use std::iter;
|
||||
use std::str::{self, FromStr};
|
||||
|
||||
@@ -96,12 +99,22 @@
|
||||
|
||||
#[test]
|
||||
fn literal_string() {
|
||||
- assert_eq!(Literal::string("foo").to_string(), "\"foo\"");
|
||||
- assert_eq!(Literal::string("\"").to_string(), "\"\\\"\"");
|
||||
- assert_eq!(Literal::string("didn't").to_string(), "\"didn't\"");
|
||||
- assert_eq!(
|
||||
- Literal::string("a\00b\07c\08d\0e\0").to_string(),
|
||||
- "\"a\\x000b\\x007c\\08d\\0e\\0\"",
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected.trim());
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::string(""), r#" "" "#);
|
||||
+ assert(Literal::string("aA"), r#" "aA" "#);
|
||||
+ assert(Literal::string("\t"), r#" "\t" "#);
|
||||
+ assert(Literal::string("❤"), r#" "❤" "#);
|
||||
+ assert(Literal::string("'"), r#" "'" "#);
|
||||
+ assert(Literal::string("\""), r#" "\"" "#);
|
||||
+ assert(Literal::string("\0"), r#" "\0" "#);
|
||||
+ assert(Literal::string("\u{1}"), r#" "\u{1}" "#);
|
||||
+ assert(
|
||||
+ Literal::string("a\00b\07c\08d\0e\0"),
|
||||
+ r#" "a\x000b\x007c\08d\0e\0" "#,
|
||||
);
|
||||
|
||||
"\"\\\r\n x\"".parse::<TokenStream>().unwrap();
|
||||
@@ -133,15 +146,42 @@
|
||||
}
|
||||
|
||||
#[test]
|
||||
+fn literal_byte_character() {
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected.trim());
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::byte_character(b'a'), r#" b'a' "#);
|
||||
+ assert(Literal::byte_character(b'\0'), r#" b'\0' "#);
|
||||
+ assert(Literal::byte_character(b'\t'), r#" b'\t' "#);
|
||||
+ assert(Literal::byte_character(b'\n'), r#" b'\n' "#);
|
||||
+ assert(Literal::byte_character(b'\r'), r#" b'\r' "#);
|
||||
+ assert(Literal::byte_character(b'\''), r#" b'\'' "#);
|
||||
+ assert(Literal::byte_character(b'\\'), r#" b'\\' "#);
|
||||
+ assert(Literal::byte_character(b'\x1f'), r#" b'\x1F' "#);
|
||||
+ assert(Literal::byte_character(b'"'), r#" b'"' "#);
|
||||
+}
|
||||
+
|
||||
+#[test]
|
||||
fn literal_byte_string() {
|
||||
- assert_eq!(Literal::byte_string(b"").to_string(), "b\"\"");
|
||||
- assert_eq!(
|
||||
- Literal::byte_string(b"\0\t\n\r\"\\2\x10").to_string(),
|
||||
- "b\"\\0\\t\\n\\r\\\"\\\\2\\x10\"",
|
||||
- );
|
||||
- assert_eq!(
|
||||
- Literal::byte_string(b"a\00b\07c\08d\0e\0").to_string(),
|
||||
- "b\"a\\x000b\\x007c\\08d\\0e\\0\"",
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected.trim());
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::byte_string(b""), r#" b"" "#);
|
||||
+ assert(Literal::byte_string(b"\0"), r#" b"\0" "#);
|
||||
+ assert(Literal::byte_string(b"\t"), r#" b"\t" "#);
|
||||
+ assert(Literal::byte_string(b"\n"), r#" b"\n" "#);
|
||||
+ assert(Literal::byte_string(b"\r"), r#" b"\r" "#);
|
||||
+ assert(Literal::byte_string(b"\""), r#" b"\"" "#);
|
||||
+ assert(Literal::byte_string(b"\\"), r#" b"\\" "#);
|
||||
+ assert(Literal::byte_string(b"\x1f"), r#" b"\x1F" "#);
|
||||
+ assert(Literal::byte_string(b"'"), r#" b"'" "#);
|
||||
+ assert(
|
||||
+ Literal::byte_string(b"a\00b\07c\08d\0e\0"),
|
||||
+ r#" b"a\x000b\x007c\08d\0e\0" "#,
|
||||
);
|
||||
|
||||
"b\"\\\r\n x\"".parse::<TokenStream>().unwrap();
|
||||
@@ -152,6 +192,41 @@
|
||||
|
||||
#[test]
|
||||
fn literal_c_string() {
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected.trim());
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::c_string(<&CStr>::default()), r#" c"" "#);
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"aA\0").unwrap()),
|
||||
+ r#" c"aA" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"aA\0").unwrap()),
|
||||
+ r#" c"aA" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"\t\0").unwrap()),
|
||||
+ r#" c"\t" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"\xE2\x9D\xA4\0").unwrap()),
|
||||
+ r#" c"❤" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"'\0").unwrap()),
|
||||
+ r#" c"'" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"\"\0").unwrap()),
|
||||
+ r#" c"\"" "#,
|
||||
+ );
|
||||
+ assert(
|
||||
+ Literal::c_string(CStr::from_bytes_with_nul(b"\x7F\xFF\xFE\xCC\xB3\0").unwrap()),
|
||||
+ r#" c"\u{7f}\xFF\xFE\u{333}" "#,
|
||||
+ );
|
||||
+
|
||||
let strings = r###"
|
||||
c"hello\x80我叫\u{1F980}" // from the RFC
|
||||
cr"\"
|
||||
@@ -188,49 +263,80 @@
|
||||
|
||||
#[test]
|
||||
fn literal_character() {
|
||||
- assert_eq!(Literal::character('x').to_string(), "'x'");
|
||||
- assert_eq!(Literal::character('\'').to_string(), "'\\''");
|
||||
- assert_eq!(Literal::character('"').to_string(), "'\"'");
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected.trim());
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::character('a'), r#" 'a' "#);
|
||||
+ assert(Literal::character('\t'), r#" '\t' "#);
|
||||
+ assert(Literal::character('❤'), r#" '❤' "#);
|
||||
+ assert(Literal::character('\''), r#" '\'' "#);
|
||||
+ assert(Literal::character('"'), r#" '"' "#);
|
||||
+ assert(Literal::character('\0'), r#" '\0' "#);
|
||||
+ assert(Literal::character('\u{1}'), r#" '\u{1}' "#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn literal_integer() {
|
||||
- assert_eq!(Literal::u8_suffixed(10).to_string(), "10u8");
|
||||
- assert_eq!(Literal::u16_suffixed(10).to_string(), "10u16");
|
||||
- assert_eq!(Literal::u32_suffixed(10).to_string(), "10u32");
|
||||
- assert_eq!(Literal::u64_suffixed(10).to_string(), "10u64");
|
||||
- assert_eq!(Literal::u128_suffixed(10).to_string(), "10u128");
|
||||
- assert_eq!(Literal::usize_suffixed(10).to_string(), "10usize");
|
||||
-
|
||||
- assert_eq!(Literal::i8_suffixed(10).to_string(), "10i8");
|
||||
- assert_eq!(Literal::i16_suffixed(10).to_string(), "10i16");
|
||||
- assert_eq!(Literal::i32_suffixed(10).to_string(), "10i32");
|
||||
- assert_eq!(Literal::i64_suffixed(10).to_string(), "10i64");
|
||||
- assert_eq!(Literal::i128_suffixed(10).to_string(), "10i128");
|
||||
- assert_eq!(Literal::isize_suffixed(10).to_string(), "10isize");
|
||||
-
|
||||
- assert_eq!(Literal::u8_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::u16_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::u32_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::u64_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::u128_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::usize_unsuffixed(10).to_string(), "10");
|
||||
-
|
||||
- assert_eq!(Literal::i8_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::i16_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::i32_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::i64_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::i128_unsuffixed(10).to_string(), "10");
|
||||
- assert_eq!(Literal::isize_unsuffixed(10).to_string(), "10");
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected);
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::u8_suffixed(10), "10u8");
|
||||
+ assert(Literal::u16_suffixed(10), "10u16");
|
||||
+ assert(Literal::u32_suffixed(10), "10u32");
|
||||
+ assert(Literal::u64_suffixed(10), "10u64");
|
||||
+ assert(Literal::u128_suffixed(10), "10u128");
|
||||
+ assert(Literal::usize_suffixed(10), "10usize");
|
||||
+
|
||||
+ assert(Literal::i8_suffixed(10), "10i8");
|
||||
+ assert(Literal::i16_suffixed(10), "10i16");
|
||||
+ assert(Literal::i32_suffixed(10), "10i32");
|
||||
+ assert(Literal::i64_suffixed(10), "10i64");
|
||||
+ assert(Literal::i128_suffixed(10), "10i128");
|
||||
+ assert(Literal::isize_suffixed(10), "10isize");
|
||||
+
|
||||
+ assert(Literal::u8_unsuffixed(10), "10");
|
||||
+ assert(Literal::u16_unsuffixed(10), "10");
|
||||
+ assert(Literal::u32_unsuffixed(10), "10");
|
||||
+ assert(Literal::u64_unsuffixed(10), "10");
|
||||
+ assert(Literal::u128_unsuffixed(10), "10");
|
||||
+ assert(Literal::usize_unsuffixed(10), "10");
|
||||
+
|
||||
+ assert(Literal::i8_unsuffixed(10), "10");
|
||||
+ assert(Literal::i16_unsuffixed(10), "10");
|
||||
+ assert(Literal::i32_unsuffixed(10), "10");
|
||||
+ assert(Literal::i64_unsuffixed(10), "10");
|
||||
+ assert(Literal::i128_unsuffixed(10), "10");
|
||||
+ assert(Literal::isize_unsuffixed(10), "10");
|
||||
+
|
||||
+ assert(Literal::i32_suffixed(-10), "-10i32");
|
||||
+ assert(Literal::i32_unsuffixed(-10), "-10");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn literal_float() {
|
||||
- assert_eq!(Literal::f32_suffixed(10.0).to_string(), "10f32");
|
||||
- assert_eq!(Literal::f64_suffixed(10.0).to_string(), "10f64");
|
||||
-
|
||||
- assert_eq!(Literal::f32_unsuffixed(10.0).to_string(), "10.0");
|
||||
- assert_eq!(Literal::f64_unsuffixed(10.0).to_string(), "10.0");
|
||||
+ #[track_caller]
|
||||
+ fn assert(literal: Literal, expected: &str) {
|
||||
+ assert_eq!(literal.to_string(), expected);
|
||||
+ }
|
||||
+
|
||||
+ assert(Literal::f32_suffixed(10.0), "10f32");
|
||||
+ assert(Literal::f32_suffixed(-10.0), "-10f32");
|
||||
+ assert(Literal::f64_suffixed(10.0), "10f64");
|
||||
+ assert(Literal::f64_suffixed(-10.0), "-10f64");
|
||||
+
|
||||
+ assert(Literal::f32_unsuffixed(10.0), "10.0");
|
||||
+ assert(Literal::f32_unsuffixed(-10.0), "-10.0");
|
||||
+ assert(Literal::f64_unsuffixed(10.0), "10.0");
|
||||
+ assert(Literal::f64_unsuffixed(-10.0), "-10.0");
|
||||
+
|
||||
+ assert(
|
||||
+ Literal::f64_unsuffixed(1e100),
|
||||
+ "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0",
|
||||
+ );
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -248,9 +354,13 @@
|
||||
assert_eq!(token_count("1._m"), 3);
|
||||
assert_eq!(token_count("\"\"s"), 1);
|
||||
assert_eq!(token_count("r\"\"r"), 1);
|
||||
+ assert_eq!(token_count("r#\"\"#r"), 1);
|
||||
assert_eq!(token_count("b\"\"b"), 1);
|
||||
assert_eq!(token_count("br\"\"br"), 1);
|
||||
- assert_eq!(token_count("r#\"\"#r"), 1);
|
||||
+ assert_eq!(token_count("br#\"\"#br"), 1);
|
||||
+ assert_eq!(token_count("c\"\"c"), 1);
|
||||
+ assert_eq!(token_count("cr\"\"cr"), 1);
|
||||
+ assert_eq!(token_count("cr#\"\"#cr"), 1);
|
||||
assert_eq!(token_count("'c'c"), 1);
|
||||
assert_eq!(token_count("b'b'b"), 1);
|
||||
assert_eq!(token_count("0E"), 1);
|
||||
@@ -378,7 +488,7 @@
|
||||
roundtrip("'a");
|
||||
roundtrip("'_");
|
||||
roundtrip("'static");
|
||||
- roundtrip("'\\u{10__FFFF}'");
|
||||
+ roundtrip(r"'\u{10__FFFF}'");
|
||||
roundtrip("\"\\u{10_F0FF__}foo\\u{1_0_0_0__}\"");
|
||||
}
|
||||
|
||||
@@ -401,6 +511,7 @@
|
||||
fail("\"\\\r \""); // backslash carriage return
|
||||
fail("'aa'aa");
|
||||
fail("br##\"\"#");
|
||||
+ fail("cr##\"\"#");
|
||||
fail("\"\\\n\u{85}\r\"");
|
||||
}
|
||||
|
||||
@ -0,0 +1,417 @@
|
||||
diff -up chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.typename chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h
|
||||
--- chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h.typename 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/internal_allocator.h 2024-05-17 12:33:58.735650966 +0200
|
||||
@@ -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-125.0.6422.60/base/containers/heap_array.h.typename chromium-125.0.6422.60/base/containers/heap_array.h
|
||||
--- chromium-125.0.6422.60/base/containers/heap_array.h.typename 2024-05-17 13:51:39.923426461 +0200
|
||||
+++ chromium-125.0.6422.60/base/containers/heap_array.h 2024-05-17 13:54:01.866085730 +0200
|
||||
@@ -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;
|
||||
// We don't put this default value in the template parameter list to allow the
|
||||
// static_assert on is_reference_v to give a nicer error message.
|
||||
using deleter_type = std::
|
||||
diff -up chromium-125.0.6422.60/base/containers/map_util.h.typename chromium-125.0.6422.60/base/containers/map_util.h
|
||||
--- chromium-125.0.6422.60/base/containers/map_util.h.typename 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/containers/map_util.h 2024-05-17 12:33:58.735650966 +0200
|
||||
@@ -44,7 +44,7 @@ constexpr internal::MappedType<Map>* Fin
|
||||
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);
|
||||
@@ -60,7 +60,7 @@ constexpr const MappedElementType* FindP
|
||||
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() ? base::to_address(it->second) : nullptr;
|
||||
diff -up chromium-125.0.6422.60/base/containers/to_vector.h.typename chromium-125.0.6422.60/base/containers/to_vector.h
|
||||
--- chromium-125.0.6422.60/base/containers/to_vector.h.typename 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/containers/to_vector.h 2024-05-17 12:33:58.736650987 +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-125.0.6422.60/base/functional/bind_internal.h.typename chromium-125.0.6422.60/base/functional/bind_internal.h
|
||||
--- chromium-125.0.6422.60/base/functional/bind_internal.h.typename 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/functional/bind_internal.h 2024-05-17 12:33:58.736650987 +0200
|
||||
@@ -1505,11 +1505,11 @@ template <int i,
|
||||
typename Param>
|
||||
struct ParamCanBeBound {
|
||||
private:
|
||||
- using UnwrappedParam = BindArgument<i>::template ForwardedAs<
|
||||
+ using UnwrappedParam = typename BindArgument<i>::template ForwardedAs<
|
||||
Unwrapped>::template ToParamWithType<Param>;
|
||||
- using ParamStorage = BindArgument<i>::template ToParamWithType<
|
||||
+ using ParamStorage = typename BindArgument<i>::template ToParamWithType<
|
||||
Param>::template StoredAs<Storage>;
|
||||
- using BoundStorage =
|
||||
+ using BoundStorage = typename
|
||||
BindArgument<i>::template BoundAs<Arg>::template StoredAs<Storage>;
|
||||
|
||||
template <bool v = !UnwrappedParam::kRawPtr ||
|
||||
diff -up chromium-125.0.6422.60/base/functional/function_ref.h.typename chromium-125.0.6422.60/base/functional/function_ref.h
|
||||
--- chromium-125.0.6422.60/base/functional/function_ref.h.typename 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/functional/function_ref.h 2024-05-17 12:33:58.736650987 +0200
|
||||
@@ -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-125.0.6422.60/base/types/fixed_array.h.typename chromium-125.0.6422.60/base/types/fixed_array.h
|
||||
--- chromium-125.0.6422.60/base/types/fixed_array.h.typename 2024-05-15 23:45:50.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/types/fixed_array.h 2024-05-17 12:33:58.737651008 +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-125.0.6422.60/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-125.0.6422.60/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
--- chromium-125.0.6422.60/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2024-05-15 23:46:00.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/download/bubble/download_bubble_update_service.cc 2024-05-17 12:33:58.737651008 +0200
|
||||
@@ -94,7 +94,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);
|
||||
@@ -1173,9 +1173,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-125.0.6422.60/chrome/browser/web_applications/commands/internal/command_internal.h.typename chromium-125.0.6422.60/chrome/browser/web_applications/commands/internal/command_internal.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/web_applications/commands/internal/command_internal.h.typename 2024-05-15 23:46:06.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/web_applications/commands/internal/command_internal.h 2024-05-17 12:33:58.737651008 +0200
|
||||
@@ -121,7 +121,7 @@ class CommandBase {
|
||||
template <typename LockType>
|
||||
class CommandWithLock : public CommandBase {
|
||||
public:
|
||||
- using LockDescription = LockType::LockDescription;
|
||||
+ using LockDescription = typename LockType::LockDescription;
|
||||
explicit CommandWithLock(const std::string& name,
|
||||
LockDescription initial_lock_request);
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/web_applications/commands/web_app_command.h.typename chromium-125.0.6422.60/chrome/browser/web_applications/commands/web_app_command.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/web_applications/commands/web_app_command.h.typename 2024-05-15 23:46:06.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/web_applications/commands/web_app_command.h 2024-05-17 12:33:58.738651028 +0200
|
||||
@@ -106,7 +106,7 @@ class WebAppLockManager;
|
||||
template <typename LockType, typename... CallbackArgs>
|
||||
class WebAppCommand : public internal::CommandWithLock<LockType> {
|
||||
public:
|
||||
- using LockDescription = LockType::LockDescription;
|
||||
+ using LockDescription = typename LockType::LockDescription;
|
||||
using CallbackType = base::OnceCallback<void(CallbackArgs...)>;
|
||||
using ShutdownArgumentsTuple = std::tuple<std::decay_t<CallbackArgs>...>;
|
||||
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/web_applications/web_app_command_scheduler.h.typename chromium-125.0.6422.60/chrome/browser/web_applications/web_app_command_scheduler.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/web_applications/web_app_command_scheduler.h.typename 2024-05-15 23:46:06.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/web_applications/web_app_command_scheduler.h 2024-05-17 12:33:58.738651028 +0200
|
||||
@@ -373,7 +373,7 @@ class WebAppCommandScheduler {
|
||||
// command system.
|
||||
template <typename LockType>
|
||||
void ScheduleCallback(const std::string& operation_name,
|
||||
- LockType::LockDescription lock_description,
|
||||
+ typename LockType::LockDescription lock_description,
|
||||
CallbackCommand<LockType, void> callback,
|
||||
base::OnceClosure on_complete,
|
||||
const base::Location& location = FROM_HERE) {
|
||||
@@ -391,7 +391,7 @@ class WebAppCommandScheduler {
|
||||
typename CallbackReturnValue = std::decay_t<CompletionCallbackArg>>
|
||||
void ScheduleCallbackWithResult(
|
||||
const std::string& operation_name,
|
||||
- LockType::LockDescription lock_description,
|
||||
+ typename LockType::LockDescription lock_description,
|
||||
CallbackCommand<LockType, CallbackReturnValue> callback,
|
||||
base::OnceCallback<void(CompletionCallbackArg)> on_complete,
|
||||
CallbackReturnValue arg_for_shutdown,
|
||||
diff -up chromium-125.0.6422.60/components/optimization_guide/core/model_execution/model_execution_util.h.typename chromium-125.0.6422.60/components/optimization_guide/core/model_execution/model_execution_util.h
|
||||
--- chromium-125.0.6422.60/components/optimization_guide/core/model_execution/model_execution_util.h.typename 2024-05-15 23:46:13.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/optimization_guide/core/model_execution/model_execution_util.h 2024-05-17 12:33:58.738651028 +0200
|
||||
@@ -26,7 +26,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-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_log_entry.h
|
||||
--- chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_log_entry.h.typename 2024-05-15 23:46:13.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_log_entry.h 2024-05-17 12:33:58.738651028 +0200
|
||||
@@ -33,7 +33,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-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_util.h.typename chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_util.h
|
||||
--- chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_util.h.typename 2024-05-15 23:46:13.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/optimization_guide/core/model_quality/model_quality_util.h 2024-05-17 12:33:58.739651049 +0200
|
||||
@@ -20,7 +20,7 @@ std::optional<UserVisibleFeatureKey> Get
|
||||
// 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-125.0.6422.60/components/optimization_guide/core/tflite_model_executor.h.typename chromium-125.0.6422.60/components/optimization_guide/core/tflite_model_executor.h
|
||||
--- chromium-125.0.6422.60/components/optimization_guide/core/tflite_model_executor.h.typename 2024-05-15 23:46:13.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/optimization_guide/core/tflite_model_executor.h 2024-05-17 12:33:58.739651049 +0200
|
||||
@@ -242,7 +242,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_);
|
||||
@@ -264,7 +264,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<std::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_);
|
||||
@@ -422,7 +422,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_);
|
||||
|
||||
@@ -439,7 +439,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<std::optional<OutputType>>* outputs) {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -499,7 +499,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-125.0.6422.60/components/supervised_user/core/browser/proto_fetcher.h.typename chromium-125.0.6422.60/components/supervised_user/core/browser/proto_fetcher.h
|
||||
--- chromium-125.0.6422.60/components/supervised_user/core/browser/proto_fetcher.h.typename 2024-05-15 23:46:15.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/supervised_user/core/browser/proto_fetcher.h 2024-05-17 12:33:58.739651049 +0200
|
||||
@@ -458,7 +458,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();
|
||||
}
|
||||
@@ -504,7 +504,7 @@ class RetryingFetcherImpl final : public
|
||||
}
|
||||
|
||||
// Client callback.
|
||||
- TypedProtoFetcher<Response>::Callback callback_;
|
||||
+ typename TypedProtoFetcher<Response>::Callback callback_;
|
||||
|
||||
// Retry controls.
|
||||
base::OneShotTimer timer_;
|
||||
@@ -525,7 +525,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.
|
||||
@@ -541,7 +541,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-125.0.6422.60/mojo/public/cpp/bindings/array_traits.h.typename chromium-125.0.6422.60/mojo/public/cpp/bindings/array_traits.h
|
||||
--- chromium-125.0.6422.60/mojo/public/cpp/bindings/array_traits.h.typename 2024-05-15 23:46:29.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/mojo/public/cpp/bindings/array_traits.h 2024-05-17 12:33:58.739651049 +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-125.0.6422.60/mojo/public/cpp/bindings/type_converter.h.typename chromium-125.0.6422.60/mojo/public/cpp/bindings/type_converter.h
|
||||
--- chromium-125.0.6422.60/mojo/public/cpp/bindings/type_converter.h.typename 2024-05-15 23:46:30.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/mojo/public/cpp/bindings/type_converter.h 2024-05-17 12:33:58.740651070 +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-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/async_iterable.h
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/async_iterable.h.typename 2024-05-15 23:46:40.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/async_iterable.h 2024-05-17 12:33:58.740651070 +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-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.typename chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/script_promise_property.h
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/script_promise_property.h.typename 2024-05-15 23:46:40.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/bindings/core/v8/script_promise_property.h 2024-05-17 12:33:58.740651070 +0200
|
||||
@@ -171,7 +171,7 @@ class ScriptPromiseProperty final
|
||||
template <typename T>
|
||||
requires std::derived_from<T, bindings::EnumerationBase>
|
||||
static T DefaultPromiseResultValue() {
|
||||
- return T(static_cast<T::Enum>(0));
|
||||
+ return T(static_cast<typename T::Enum>(0));
|
||||
}
|
||||
|
||||
State state_ = kPending;
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename chromium-125.0.6422.60/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.typename 2024-05-15 23:46:41.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2024-05-17 12:33:58.741651090 +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-125.0.6422.60/third_party/blink/renderer/core/paint/object_paint_properties.h.typename chromium-125.0.6422.60/third_party/blink/renderer/core/paint/object_paint_properties.h
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/core/paint/object_paint_properties.h.typename 2024-05-15 23:46:41.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/core/paint/object_paint_properties.h 2024-05-17 12:33:58.741651090 +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)) {
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/platform/wtf/hash_table.h.typename chromium-125.0.6422.60/third_party/blink/renderer/platform/wtf/hash_table.h
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/platform/wtf/hash_table.h.typename 2024-05-15 23:46:43.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/platform/wtf/hash_table.h 2024-05-17 12:33:58.742651111 +0200
|
||||
@@ -2013,7 +2013,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&;
|
||||
@@ -2065,7 +2065,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&;
|
||||
@@ -2119,7 +2119,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&;
|
||||
@@ -2167,7 +2167,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&;
|
||||
@ -1,32 +0,0 @@
|
||||
commit aa53c3ab8df7f7c1d42c30d4b184a8f8b0a8e50d
|
||||
Author: Jose Dapena Paz <jdapena@igalia.com>
|
||||
Date: Tue Apr 16 12:14:15 2024 +0000
|
||||
|
||||
IWYU: add missing include for usage of FieldDataManager in autofill_agent.h
|
||||
|
||||
Change-Id: I70575d1dd72b9334e3b8d4805779a7e45788989e
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5392840
|
||||
Reviewed-by: Florian Leimgruber <fleimgruber@google.com>
|
||||
Commit-Queue: José Dapena Paz <jdapena@igalia.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1287967}
|
||||
|
||||
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
|
||||
index 76a25d72c87cc..01462aefdaae6 100644
|
||||
--- a/components/autofill/content/renderer/autofill_agent.h
|
||||
+++ b/components/autofill/content/renderer/autofill_agent.h
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "components/autofill/content/renderer/form_autofill_util.h"
|
||||
#include "components/autofill/content/renderer/form_tracker.h"
|
||||
#include "components/autofill/core/common/autofill_features.h"
|
||||
+#include "components/autofill/core/common/field_data_manager.h"
|
||||
#include "components/autofill/core/common/mojom/autofill_types.mojom-shared.h"
|
||||
#include "components/autofill/core/common/unique_ids.h"
|
||||
#include "content/public/renderer/render_frame_observer.h"
|
||||
@@ -51,7 +52,6 @@ namespace autofill {
|
||||
class FormCache;
|
||||
class PasswordAutofillAgent;
|
||||
class PasswordGenerationAgent;
|
||||
-class FieldDataManager;
|
||||
|
||||
// AutofillAgent deals with Autofill related communications between Blink and
|
||||
// the browser.
|
||||
@ -1,896 +0,0 @@
|
||||
diff -up chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h
|
||||
--- chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ 2024-05-15 23:45:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h 2024-05-19 09:07:38.199437617 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
-#include "partition_alloc/internal_allocator_forward.h"
|
||||
+#include "partition_alloc/internal_allocator.h"
|
||||
#include "partition_alloc/partition_alloc_base/threading/platform_thread.h"
|
||||
#include "partition_alloc/partition_alloc_base/time/time.h"
|
||||
#include "partition_alloc/partition_alloc_check.h"
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/lens/lens_overlay/lens_overlay_url_builder.h.system-libstdc++ chromium-125.0.6422.60/chrome/browser/lens/lens_overlay/lens_overlay_url_builder.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/lens/lens_overlay/lens_overlay_url_builder.h.system-libstdc++ 2024-05-15 23:46:01.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/lens/lens_overlay/lens_overlay_url_builder.h 2024-05-19 09:07:38.200437638 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef CHROME_BROWSER_LENS_LENS_OVERLAY_LENS_OVERLAY_URL_BUILDER_H_
|
||||
#define CHROME_BROWSER_LENS_LENS_OVERLAY_LENS_OVERLAY_URL_BUILDER_H_
|
||||
|
||||
+#include <optional>
|
||||
#include <string>
|
||||
|
||||
#include "third_party/lens_server_proto/lens_overlay_cluster_info.pb.h"
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/sync/test/integration/product_specifications_helper.cc.system-libstdc++ chromium-125.0.6422.60/chrome/browser/sync/test/integration/product_specifications_helper.cc
|
||||
--- chromium-125.0.6422.60/chrome/browser/sync/test/integration/product_specifications_helper.cc.system-libstdc++ 2024-05-19 13:16:01.140442423 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/sync/test/integration/product_specifications_helper.cc 2024-05-19 13:16:38.029246015 +0200
|
||||
@@ -41,9 +41,9 @@ bool ProductSpecificationsChecker::IsExi
|
||||
bool ProductSpecificationsChecker::IsSpecificsAvailableAndEqual() {
|
||||
for (const ProductSpecificationsSet& product_specifications_set :
|
||||
service_->GetAllProductSpecifications()) {
|
||||
- std::vector<const GURL> specifics_urls;
|
||||
+ std::vector<GURL> specifics_urls;
|
||||
for (sync_pb::ComparisonData data : compare_specifics_->data()) {
|
||||
- specifics_urls.push_back(GURL(data.url()));
|
||||
+ specifics_urls.emplace_back(data.url());
|
||||
}
|
||||
if (product_specifications_set.uuid().AsLowercaseString() ==
|
||||
compare_specifics_->uuid() &&
|
||||
diff -up chromium-125.0.6422.60/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ chromium-125.0.6422.60/chrome/browser/ui/tabs/tab_strip_model.h
|
||||
--- chromium-125.0.6422.60/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ 2024-05-15 23:46:05.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/chrome/browser/ui/tabs/tab_strip_model.h 2024-05-19 09:07:38.200437638 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
+#include <variant>
|
||||
#include <vector>
|
||||
|
||||
#include "base/containers/span.h"
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.cc.system-libstdc++ 2024-05-19 13:08:44.920571765 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.cc 2024-05-19 13:11:08.451775188 +0200
|
||||
@@ -24,11 +24,11 @@ ProductSpecificationsService::GetSyncCon
|
||||
return bridge_->change_processor()->GetControllerDelegate();
|
||||
}
|
||||
|
||||
-const std::vector<const ProductSpecificationsSet>
|
||||
+const std::vector<ProductSpecificationsSet>
|
||||
ProductSpecificationsService::GetAllProductSpecifications() {
|
||||
- std::vector<const ProductSpecificationsSet> product_specifications;
|
||||
+ std::vector<ProductSpecificationsSet> product_specifications;
|
||||
for (auto& entry : bridge_->entries()) {
|
||||
- std::vector<const GURL> urls;
|
||||
+ std::vector<GURL> urls;
|
||||
for (auto& data : entry.second.data()) {
|
||||
urls.emplace_back(data.url());
|
||||
}
|
||||
@@ -43,7 +43,7 @@ ProductSpecificationsService::GetAllProd
|
||||
const std::optional<const ProductSpecificationsSet>
|
||||
ProductSpecificationsService::AddProductSpecificationsSet(
|
||||
const std::string& name,
|
||||
- const std::vector<const GURL>& urls) {
|
||||
+ const std::vector<GURL>& urls) {
|
||||
// TODO(crbug.com/332545064) add for a product specification set being added.
|
||||
std::optional<sync_pb::CompareSpecifics> specifics =
|
||||
bridge_->AddProductSpecifications(name, urls);
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.h.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.h
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.h.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service.h 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -26,14 +26,13 @@ class ProductSpecificationsService : pub
|
||||
base::WeakPtr<syncer::ModelTypeControllerDelegate>
|
||||
GetSyncControllerDelegate();
|
||||
|
||||
- const std::vector<const ProductSpecificationsSet>
|
||||
- GetAllProductSpecifications();
|
||||
+ const std::vector<ProductSpecificationsSet> GetAllProductSpecifications();
|
||||
|
||||
// Add new product specifications set called |name| with product pages
|
||||
// corresponding to |urls|.
|
||||
const std::optional<const ProductSpecificationsSet>
|
||||
AddProductSpecificationsSet(const std::string& name,
|
||||
- const std::vector<const GURL>& urls);
|
||||
+ const std::vector<GURL>& urls);
|
||||
|
||||
// Deletes product specification set corresponding to identifier |uuid|.
|
||||
void DeleteProductSpecificationsSet(const std::string& uuid);
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service_unittest.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service_unittest.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service_unittest.cc.system-libstdc++ 2024-05-19 13:12:01.840028873 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_service_unittest.cc 2024-05-19 13:13:44.363473948 +0200
|
||||
@@ -82,9 +82,9 @@ void AddTestSpecifics(commerce::ProductS
|
||||
}
|
||||
|
||||
MATCHER_P(HasAllProductSpecs, compare_specifics, "") {
|
||||
- std::vector<const GURL> specifics_urls;
|
||||
+ std::vector<GURL> specifics_urls;
|
||||
for (const sync_pb::ComparisonData& data : compare_specifics.data()) {
|
||||
- specifics_urls.push_back(GURL(data.url()));
|
||||
+ specifics_urls.emplace_back(data.url());
|
||||
}
|
||||
return arg.uuid().AsLowercaseString() == compare_specifics.uuid() &&
|
||||
arg.creation_time() ==
|
||||
@@ -217,7 +217,7 @@ class ProductSpecificationsServiceTest :
|
||||
specifics.update_time_unix_epoch_micros()),
|
||||
specifications.update_time());
|
||||
EXPECT_EQ(specifics.name(), specifications.name());
|
||||
- std::vector<const GURL> urls;
|
||||
+ std::vector<GURL> urls;
|
||||
for (const sync_pb::ComparisonData& data : specifics.data()) {
|
||||
urls.emplace_back(data.url());
|
||||
}
|
||||
@@ -243,7 +243,7 @@ TEST_F(ProductSpecificationsServiceTest,
|
||||
for (const sync_pb::CompareSpecifics& specifics : kCompareSpecifics) {
|
||||
bridge()->AddCompareSpecifics(specifics);
|
||||
}
|
||||
- const std::vector<const ProductSpecificationsSet> specifications =
|
||||
+ const std::vector<ProductSpecificationsSet> specifications =
|
||||
service()->GetAllProductSpecifications();
|
||||
EXPECT_EQ(2u, specifications.size());
|
||||
for (uint64_t i = 0; i < specifications.size(); i++) {
|
||||
@@ -252,7 +252,7 @@ TEST_F(ProductSpecificationsServiceTest,
|
||||
}
|
||||
|
||||
TEST_F(ProductSpecificationsServiceTest, TestAddProductSpecificationsSuccess) {
|
||||
- std::vector<const GURL> expected_product_urls{GURL(kProductOneUrl),
|
||||
+ std::vector<GURL> expected_product_urls{GURL(kProductOneUrl),
|
||||
GURL(kProductTwoUrl)};
|
||||
EXPECT_CALL(*observer(),
|
||||
OnProductSpecificationsSetAdded(HasProductSpecsNameUrl(
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.cc.system-libstdc++ 2024-05-19 13:06:20.870445163 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.cc 2024-05-19 13:07:44.385278233 +0200
|
||||
@@ -12,7 +12,7 @@ ProductSpecificationsSet::ProductSpecifi
|
||||
const std::string& uuid,
|
||||
const int64_t creation_time_usec_since_epoch,
|
||||
const int64_t update_time_usec_since_epoch,
|
||||
- const std::vector<const GURL>& urls,
|
||||
+ const std::vector<GURL>& urls,
|
||||
const std::string& name)
|
||||
: uuid_(base::Uuid::ParseLowercase(uuid)),
|
||||
creation_time_(base::Time::FromMillisecondsSinceUnixEpoch(
|
||||
@@ -34,9 +34,9 @@ ProductSpecificationsSet::~ProductSpecif
|
||||
|
||||
ProductSpecificationsSet ProductSpecificationsSet::FromProto(
|
||||
const sync_pb::CompareSpecifics& specifics) {
|
||||
- std::vector<const GURL> urls;
|
||||
+ std::vector<GURL> urls;
|
||||
for (const sync_pb::ComparisonData& data : specifics.data()) {
|
||||
- urls.push_back(GURL(data.url()));
|
||||
+ urls.emplace_back(data.url());
|
||||
}
|
||||
return ProductSpecificationsSet(
|
||||
specifics.uuid(), specifics.creation_time_unix_epoch_micros(),
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.h.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.h
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.h.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_set.h 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -43,7 +43,7 @@ class ProductSpecificationsSet {
|
||||
ProductSpecificationsSet(const std::string& uuid,
|
||||
const int64_t creation_time_usec_since_epoch,
|
||||
const int64_t update_time_usec_since_epoch,
|
||||
- const std::vector<const GURL>& urls,
|
||||
+ const std::vector<GURL>& urls,
|
||||
const std::string& name);
|
||||
|
||||
ProductSpecificationsSet(const ProductSpecificationsSet&);
|
||||
@@ -61,7 +61,7 @@ class ProductSpecificationsSet {
|
||||
const base::Time& update_time() const { return update_time_; }
|
||||
|
||||
// Product urls for each item in the set
|
||||
- const std::vector<const GURL>& urls() const { return urls_; }
|
||||
+ const std::vector<GURL>& urls() const { return urls_; }
|
||||
|
||||
// Name of the set
|
||||
const std::string& name() const { return name_; }
|
||||
@@ -76,7 +76,7 @@ class ProductSpecificationsSet {
|
||||
const base::Uuid uuid_;
|
||||
const base::Time creation_time_;
|
||||
const base::Time update_time_;
|
||||
- const std::vector<const GURL> urls_;
|
||||
+ const std::vector<GURL> urls_;
|
||||
const std::string name_;
|
||||
};
|
||||
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.cc.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.cc 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -131,7 +131,7 @@ void ProductSpecificationsSyncBridge::Ge
|
||||
const std::optional<sync_pb::CompareSpecifics>
|
||||
ProductSpecificationsSyncBridge::AddProductSpecifications(
|
||||
const std::string& name,
|
||||
- const std::vector<const GURL>& urls) {
|
||||
+ const std::vector<GURL>& urls) {
|
||||
if (!change_processor()->IsTrackingMetadata()) {
|
||||
return std::nullopt;
|
||||
}
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.h.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.h
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.h.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge.h 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -64,7 +64,7 @@ class ProductSpecificationsSyncBridge :
|
||||
|
||||
virtual const std::optional<sync_pb::CompareSpecifics>
|
||||
AddProductSpecifications(const std::string& name,
|
||||
- const std::vector<const GURL>& urls);
|
||||
+ const std::vector<GURL>& urls);
|
||||
|
||||
void DeleteProductSpecificationsSet(const std::string& uuid);
|
||||
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge_unittest.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge_unittest.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge_unittest.cc.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/product_specifications/product_specifications_sync_bridge_unittest.cc 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -178,7 +178,7 @@ class ProductSpecificationsSyncBridgeTes
|
||||
|
||||
std::optional<sync_pb::CompareSpecifics> AddProductSpecifications(
|
||||
const std::string& name,
|
||||
- const std::vector<const GURL> urls) {
|
||||
+ const std::vector<GURL> urls) {
|
||||
return bridge().AddProductSpecifications(name, urls);
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/shopping_service.cc.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/shopping_service.cc
|
||||
--- chromium-125.0.6422.60/components/commerce/core/shopping_service.cc.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/shopping_service.cc 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -1734,7 +1734,7 @@ void ShoppingService::GetProductIdentifi
|
||||
std::move(callback)));
|
||||
}
|
||||
|
||||
-const std::vector<const ProductSpecificationsSet>
|
||||
+const std::vector<ProductSpecificationsSet>
|
||||
ShoppingService::GetAllProductSpecificationSets() {
|
||||
return product_specifications_service_->GetAllProductSpecifications();
|
||||
}
|
||||
diff -up chromium-125.0.6422.60/components/commerce/core/shopping_service.h.system-libstdc++ chromium-125.0.6422.60/components/commerce/core/shopping_service.h
|
||||
--- chromium-125.0.6422.60/components/commerce/core/shopping_service.h.system-libstdc++ 2024-05-15 23:46:11.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/commerce/core/shopping_service.h 2024-05-19 09:07:38.201437659 +0200
|
||||
@@ -624,7 +624,7 @@ class ShoppingService : public KeyedServ
|
||||
UrlProductIdentifierTupleCallback callback);
|
||||
|
||||
// Return all ProductSpecificationsSets from ProductSpecificationsService.
|
||||
- virtual const std::vector<const ProductSpecificationsSet>
|
||||
+ virtual const std::vector<ProductSpecificationsSet>
|
||||
GetAllProductSpecificationSets();
|
||||
|
||||
// Updates the bookmark model used for sync (and shopping) if needed. Invoked
|
||||
diff -up chromium-125.0.6422.60/components/services/app_service/public/cpp/app_types.h.system-libstdc++ chromium-125.0.6422.60/components/services/app_service/public/cpp/app_types.h
|
||||
--- chromium-125.0.6422.60/components/services/app_service/public/cpp/app_types.h.system-libstdc++ 2024-05-15 23:46:14.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/services/app_service/public/cpp/app_types.h 2024-05-19 09:07:38.202437679 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_APP_TYPES_H_
|
||||
#define COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_APP_TYPES_H_
|
||||
|
||||
+#include <optional>
|
||||
#include "base/component_export.h"
|
||||
#include "components/services/app_service/public/cpp/macros.h"
|
||||
#include "components/services/app_service/public/protos/app_types.pb.h"
|
||||
diff -up chromium-125.0.6422.60/components/viz/service/display/surface_aggregator.cc.system-libstdc++ chromium-125.0.6422.60/components/viz/service/display/surface_aggregator.cc
|
||||
--- chromium-125.0.6422.60/components/viz/service/display/surface_aggregator.cc.system-libstdc++ 2024-05-15 23:46:17.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/components/viz/service/display/surface_aggregator.cc 2024-05-19 09:07:38.202437679 +0200
|
||||
@@ -2275,7 +2275,7 @@ AggregatedFrame SurfaceAggregator::Aggre
|
||||
root_surface_id_ = surface_id;
|
||||
|
||||
// Start recording new stats for this aggregation.
|
||||
- stats_.emplace();
|
||||
+ stats_ = AggregateStatistics{};
|
||||
|
||||
base::ElapsedTimer prewalk_timer;
|
||||
ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
|
||||
diff -up chromium-125.0.6422.60/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ chromium-125.0.6422.60/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc
|
||||
--- chromium-125.0.6422.60/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ 2024-05-15 23:46:17.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc 2024-05-19 09:07:38.202437679 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <optional>
|
||||
#include "content/browser/first_party_sets/first_party_sets_handler_database_helper.h"
|
||||
|
||||
#include "base/containers/contains.h"
|
||||
diff -up chromium-125.0.6422.60/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ chromium-125.0.6422.60/gpu/command_buffer/service/shared_image/shared_image_backing.h
|
||||
--- chromium-125.0.6422.60/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ 2024-05-15 23:46:22.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/gpu/command_buffer/service/shared_image/shared_image_backing.h 2024-05-19 09:07:38.202437679 +0200
|
||||
@@ -111,6 +111,25 @@ using VideoDecodeDevice = Microsoft::WRL
|
||||
using VideoDecodeDevice = void*;
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
+class ScopedWriteUMA {
|
||||
+ public:
|
||||
+ ScopedWriteUMA() = default;
|
||||
+
|
||||
+ ScopedWriteUMA(const ScopedWriteUMA&) = delete;
|
||||
+ ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
|
||||
+
|
||||
+ ~ScopedWriteUMA() {
|
||||
+ UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
|
||||
+ content_consumed_);
|
||||
+ }
|
||||
+
|
||||
+ bool content_consumed() const { return content_consumed_; }
|
||||
+ void SetConsumed() { content_consumed_ = true; }
|
||||
+
|
||||
+ private:
|
||||
+ bool content_consumed_ = false;
|
||||
+};
|
||||
+
|
||||
// Represents the actual storage (GL texture, VkImage, GMB) for a SharedImage.
|
||||
// Should not be accessed directly, instead is accessed through a
|
||||
// SharedImageRepresentation.
|
||||
@@ -370,25 +389,6 @@ class GPU_GLES2_EXPORT SharedImageBackin
|
||||
mutable std::optional<base::Lock> lock_;
|
||||
|
||||
private:
|
||||
- class ScopedWriteUMA {
|
||||
- public:
|
||||
- ScopedWriteUMA() = default;
|
||||
-
|
||||
- ScopedWriteUMA(const ScopedWriteUMA&) = delete;
|
||||
- ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
|
||||
-
|
||||
- ~ScopedWriteUMA() {
|
||||
- UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
|
||||
- content_consumed_);
|
||||
- }
|
||||
-
|
||||
- bool content_consumed() const { return content_consumed_; }
|
||||
- void SetConsumed() { content_consumed_ = true; }
|
||||
-
|
||||
- private:
|
||||
- bool content_consumed_ = false;
|
||||
- };
|
||||
-
|
||||
const Mailbox mailbox_;
|
||||
const viz::SharedImageFormat format_;
|
||||
const gfx::Size size_;
|
||||
diff -up chromium-125.0.6422.60/mojo/public/cpp/base/proto_wrapper.cc.system-libstdc++ chromium-125.0.6422.60/mojo/public/cpp/base/proto_wrapper.cc
|
||||
--- chromium-125.0.6422.60/mojo/public/cpp/base/proto_wrapper.cc.system-libstdc++ 2024-05-15 23:46:29.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/mojo/public/cpp/base/proto_wrapper.cc 2024-05-19 09:07:38.203437700 +0200
|
||||
@@ -57,7 +57,7 @@ bool ProtoWrapper::DeserializeToMessage(
|
||||
// Make an in-process copy here as protobuf is not designed to
|
||||
// safely parse data that might be changing underneath it.
|
||||
auto as_span = base::make_span(bytes_->data(), bytes_->size());
|
||||
- const std::vector<const uint8_t> copy(as_span.begin(), as_span.end());
|
||||
+ const std::vector<uint8_t> copy(as_span.begin(), as_span.end());
|
||||
return message.ParseFromArray(copy.data(), copy.size());
|
||||
}
|
||||
}
|
||||
diff -up chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/bindings_internal.h.system-libstdc++ chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/bindings_internal.h
|
||||
--- chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/bindings_internal.h.system-libstdc++ 2024-05-15 23:46:29.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/bindings_internal.h 2024-05-19 09:07:38.203437700 +0200
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include <functional>
|
||||
+#include <optional>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
|
||||
diff -up chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
||||
--- chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ 2024-05-15 23:46:29.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/mojo/public/cpp/bindings/lib/multiplex_router.cc 2024-05-19 09:07:38.203437700 +0200
|
||||
@@ -892,7 +892,7 @@ bool MultiplexRouter::ExclusiveSyncWaitF
|
||||
DCHECK(!exclusive_sync_wait_);
|
||||
|
||||
scoped_refptr<MultiplexRouter> keep_alive(this);
|
||||
- exclusive_sync_wait_.emplace();
|
||||
+ exclusive_sync_wait_ = ExclusiveSyncWaitInfo{};
|
||||
exclusive_sync_wait_->interface_id = interface_id;
|
||||
exclusive_sync_wait_->request_id = request_id;
|
||||
while (!exclusive_sync_wait_->finished) {
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ chromium-125.0.6422.60/third_party/blink/common/interest_group/auction_config_mojom_traits.cc
|
||||
--- chromium-125.0.6422.60/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ 2024-05-15 23:46:38.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/common/interest_group/auction_config_mojom_traits.cc 2024-05-19 09:07:38.206437763 +0200
|
||||
@@ -218,8 +218,6 @@ bool StructTraits<blink::mojom::AuctionA
|
||||
!data.ReadAllBuyersPrioritySignals(&out->all_buyers_priority_signals) ||
|
||||
!data.ReadAuctionReportBuyerKeys(&out->auction_report_buyer_keys) ||
|
||||
!data.ReadAuctionReportBuyers(&out->auction_report_buyers) ||
|
||||
- !data.ReadAuctionReportBuyerDebugModeConfig(
|
||||
- &out->auction_report_buyer_debug_mode_config) ||
|
||||
!data.ReadRequiredSellerCapabilities(
|
||||
&out->required_seller_capabilities) ||
|
||||
!data.ReadRequestedSize(&out->requested_size) ||
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ chromium-125.0.6422.60/third_party/blink/renderer/core/loader/history_item.cc
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ 2024-05-15 23:46:41.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/core/loader/history_item.cc 2024-05-19 09:07:38.209437825 +0200
|
||||
@@ -182,26 +182,26 @@ void HistoryItem::SetReferrerPolicy(netw
|
||||
|
||||
void HistoryItem::SetVisualViewportScrollOffset(const ScrollOffset& offset) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->visual_viewport_scroll_offset_ = offset;
|
||||
}
|
||||
|
||||
void HistoryItem::SetScrollOffset(const ScrollOffset& offset) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->scroll_offset_ = offset;
|
||||
}
|
||||
|
||||
void HistoryItem::SetPageScaleFactor(float scale_factor) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->page_scale_factor_ = scale_factor;
|
||||
}
|
||||
|
||||
void HistoryItem::SetScrollAnchorData(
|
||||
const ScrollAnchorData& scroll_anchor_data) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->scroll_anchor_data_ = scroll_anchor_data;
|
||||
}
|
||||
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ chromium-125.0.6422.60/third_party/blink/renderer/core/paint/fragment_data_iterator.h
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ 2024-05-15 23:46:41.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/core/paint/fragment_data_iterator.h 2024-05-19 09:07:38.209437825 +0200
|
||||
@@ -22,7 +22,7 @@ class FragmentDataIteratorBase {
|
||||
|
||||
public:
|
||||
explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {}
|
||||
- explicit FragmentDataIteratorBase(nullptr_t) {}
|
||||
+ explicit FragmentDataIteratorBase(std::nullptr_t) {}
|
||||
|
||||
Data* GetFragmentData() const {
|
||||
return !IsDone() ? &fragment_head_.at(idx_) : nullptr;
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ chromium-125.0.6422.60/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ 2024-05-15 23:46:42.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc 2024-05-19 09:07:38.210437846 +0200
|
||||
@@ -101,7 +101,7 @@ void MediaControlTimelineElement::Update
|
||||
void MediaControlTimelineElement::SetPosition(double current_time,
|
||||
bool suppress_aria) {
|
||||
if (is_live_ && !live_anchor_time_ && current_time != 0) {
|
||||
- live_anchor_time_.emplace();
|
||||
+ live_anchor_time_ = LiveAnchorTime{};
|
||||
live_anchor_time_->clock_time_ = base::TimeTicks::Now();
|
||||
live_anchor_time_->media_time_ = MediaElement().currentTime();
|
||||
}
|
||||
diff -up chromium-125.0.6422.60/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ chromium-125.0.6422.60/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
|
||||
--- chromium-125.0.6422.60/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ 2024-05-15 23:46:42.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc 2024-05-19 09:07:38.210437846 +0200
|
||||
@@ -70,7 +70,7 @@ void GeometryMapperTransformCache::Updat
|
||||
to_2d_translation_root_ += translation;
|
||||
|
||||
if (parent.plane_root_transform_) {
|
||||
- plane_root_transform_.emplace();
|
||||
+ plane_root_transform_ = PlaneRootTransform{};
|
||||
plane_root_transform_->plane_root = parent.plane_root();
|
||||
plane_root_transform_->to_plane_root = parent.to_plane_root();
|
||||
plane_root_transform_->to_plane_root.Translate(translation.x(),
|
||||
@@ -98,7 +98,7 @@ void GeometryMapperTransformCache::Updat
|
||||
// as the 2d translation root.
|
||||
plane_root_transform_ = std::nullopt;
|
||||
} else {
|
||||
- plane_root_transform_.emplace();
|
||||
+ plane_root_transform_ = PlaneRootTransform{};
|
||||
plane_root_transform_->plane_root = parent.plane_root();
|
||||
plane_root_transform_->to_plane_root.MakeIdentity();
|
||||
parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
|
||||
@@ -140,7 +140,7 @@ void GeometryMapperTransformCache::Updat
|
||||
parent_node->UpdateScreenTransform();
|
||||
const auto& parent = parent_node->GetTransformCache();
|
||||
|
||||
- screen_transform_.emplace();
|
||||
+ screen_transform_ = ScreenTransform{};
|
||||
parent.ApplyToScreen(screen_transform_->to_screen);
|
||||
if (node.FlattensInheritedTransform())
|
||||
screen_transform_->to_screen.Flatten();
|
||||
diff -up chromium-125.0.6422.60/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ chromium-125.0.6422.60/third_party/ruy/src/ruy/profiler/instrumentation.h
|
||||
--- chromium-125.0.6422.60/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ 2024-05-15 23:47:49.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/ruy/src/ruy/profiler/instrumentation.h 2024-05-19 09:07:38.211437867 +0200
|
||||
@@ -19,6 +19,7 @@ limitations under the License.
|
||||
#ifdef RUY_PROFILER
|
||||
#include <cstdio>
|
||||
#include <mutex>
|
||||
+#include <string>
|
||||
#include <vector>
|
||||
#endif
|
||||
|
||||
diff -up chromium-125.0.6422.60/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_small_containers.hpp.system-libstdc++ chromium-125.0.6422.60/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_small_containers.hpp
|
||||
--- chromium-125.0.6422.60/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_small_containers.hpp.system-libstdc++ 2024-05-15 23:48:05.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_small_containers.hpp 2024-05-19 09:07:38.211437867 +0200
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <memory>
|
||||
#include <cassert>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
diff -up chromium-125.0.6422.60/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ chromium-125.0.6422.60/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
|
||||
--- chromium-125.0.6422.60/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ 2024-05-15 23:48:09.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc 2024-05-19 09:07:38.212437888 +0200
|
||||
@@ -549,7 +549,7 @@ absl::optional<LossBasedBweV2::Config> L
|
||||
if (!enabled.Get()) {
|
||||
return config;
|
||||
}
|
||||
- config.emplace();
|
||||
+ config = Config{};
|
||||
config->bandwidth_rampup_upper_bound_factor =
|
||||
bandwidth_rampup_upper_bound_factor.Get();
|
||||
config->bandwidth_rampup_upper_bound_factor_in_hold =
|
||||
diff -up chromium-125.0.6422.60/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/randr.cc
|
||||
--- chromium-125.0.6422.60/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ 2024-05-15 23:47:33.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/randr.cc 2024-05-19 09:07:38.212437888 +0200
|
||||
@@ -305,7 +305,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
// data
|
||||
auto data_expr = subCode;
|
||||
if (CaseEq(data_expr, RandR::Notify::CrtcChange)) {
|
||||
- data.cc.emplace();
|
||||
+ data.cc = RandR::NotifyEvent::Cc{};
|
||||
auto& timestamp = (*data.cc).timestamp;
|
||||
auto& window = (*data.cc).window;
|
||||
auto& crtc = (*data.cc).crtc;
|
||||
@@ -349,7 +349,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Read(&height, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::OutputChange)) {
|
||||
- data.oc.emplace();
|
||||
+ data.oc = RandR::NotifyEvent::Oc{};
|
||||
auto& timestamp = (*data.oc).timestamp;
|
||||
auto& config_timestamp = (*data.oc).config_timestamp;
|
||||
auto& window = (*data.oc).window;
|
||||
@@ -394,7 +394,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
subpixel_order = static_cast<Render::SubPixel>(tmp6);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::OutputProperty)) {
|
||||
- data.op.emplace();
|
||||
+ data.op = RandR::NotifyEvent::Op{};
|
||||
auto& window = (*data.op).window;
|
||||
auto& output = (*data.op).output;
|
||||
auto& atom = (*data.op).atom;
|
||||
@@ -422,7 +422,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 11);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ProviderChange)) {
|
||||
- data.pc.emplace();
|
||||
+ data.pc = RandR::NotifyEvent::Pc{};
|
||||
auto& timestamp = (*data.pc).timestamp;
|
||||
auto& window = (*data.pc).window;
|
||||
auto& provider = (*data.pc).provider;
|
||||
@@ -440,7 +440,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 16);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ProviderProperty)) {
|
||||
- data.pp.emplace();
|
||||
+ data.pp = RandR::NotifyEvent::Pp{};
|
||||
auto& window = (*data.pp).window;
|
||||
auto& provider = (*data.pp).provider;
|
||||
auto& atom = (*data.pp).atom;
|
||||
@@ -466,7 +466,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 11);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ResourceChange)) {
|
||||
- data.rc.emplace();
|
||||
+ data.rc = RandR::NotifyEvent::Rc{};
|
||||
auto& timestamp = (*data.rc).timestamp;
|
||||
auto& window = (*data.rc).window;
|
||||
|
||||
@@ -480,7 +480,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 20);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::Lease)) {
|
||||
- data.lc.emplace();
|
||||
+ data.lc = RandR::NotifyEvent::Lc{};
|
||||
auto& timestamp = (*data.lc).timestamp;
|
||||
auto& window = (*data.lc).window;
|
||||
auto& lease = (*data.lc).lease;
|
||||
diff -up chromium-125.0.6422.60/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/xinput.cc
|
||||
--- chromium-125.0.6422.60/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ 2024-05-15 23:47:33.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/xinput.cc 2024-05-19 09:07:38.216437971 +0200
|
||||
@@ -567,7 +567,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
// data
|
||||
auto data_expr = type;
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = Input::DeviceClass::Key{};
|
||||
uint16_t num_keys{};
|
||||
auto& keys = (*data.key).keys;
|
||||
size_t keys_len = keys.size();
|
||||
@@ -583,7 +583,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = Input::DeviceClass::Button{};
|
||||
uint16_t num_buttons{};
|
||||
auto& state = (*data.button).state;
|
||||
size_t state_len = state.size();
|
||||
@@ -608,7 +608,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = Input::DeviceClass::Valuator{};
|
||||
auto& number = (*data.valuator).number;
|
||||
auto& label = (*data.valuator).label;
|
||||
auto& min = (*data.valuator).min;
|
||||
@@ -671,7 +671,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
|
||||
- data.scroll.emplace();
|
||||
+ data.scroll = Input::DeviceClass::Scroll{};
|
||||
auto& number = (*data.scroll).number;
|
||||
auto& scroll_type = (*data.scroll).scroll_type;
|
||||
auto& flags = (*data.scroll).flags;
|
||||
@@ -706,7 +706,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
|
||||
- data.touch.emplace();
|
||||
+ data.touch = Input::DeviceClass::Touch{};
|
||||
auto& mode = (*data.touch).mode;
|
||||
auto& num_touches = (*data.touch).num_touches;
|
||||
|
||||
@@ -719,7 +719,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
Read(&num_touches, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
|
||||
- data.gesture.emplace();
|
||||
+ data.gesture = Input::DeviceClass::Gesture{};
|
||||
auto& num_touches = (*data.gesture).num_touches;
|
||||
|
||||
// num_touches
|
||||
@@ -2206,7 +2206,7 @@ std::unique_ptr<Input::ListInputDevicesR
|
||||
// info
|
||||
auto info_expr = class_id;
|
||||
if (CaseEq(info_expr, Input::InputClass::Key)) {
|
||||
- info.key.emplace();
|
||||
+ info.key = Input::InputInfo::Key{};
|
||||
auto& min_keycode = (*info.key).min_keycode;
|
||||
auto& max_keycode = (*info.key).max_keycode;
|
||||
auto& num_keys = (*info.key).num_keys;
|
||||
@@ -2224,14 +2224,14 @@ std::unique_ptr<Input::ListInputDevicesR
|
||||
Pad(&buf, 2);
|
||||
}
|
||||
if (CaseEq(info_expr, Input::InputClass::Button)) {
|
||||
- info.button.emplace();
|
||||
+ info.button = Input::InputInfo::Button{};
|
||||
auto& num_buttons = (*info.button).num_buttons;
|
||||
|
||||
// num_buttons
|
||||
Read(&num_buttons, &buf);
|
||||
}
|
||||
if (CaseEq(info_expr, Input::InputClass::Valuator)) {
|
||||
- info.valuator.emplace();
|
||||
+ info.valuator = Input::InputInfo::Valuator{};
|
||||
uint8_t axes_len{};
|
||||
auto& mode = (*info.valuator).mode;
|
||||
auto& motion_size = (*info.valuator).motion_size;
|
||||
@@ -3844,7 +3844,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
// data
|
||||
auto data_expr = class_id;
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Keyboard)) {
|
||||
- data.keyboard.emplace();
|
||||
+ data.keyboard = x11::Input::FeedbackState::Keyboard{};
|
||||
auto& pitch = (*data.keyboard).pitch;
|
||||
auto& duration = (*data.keyboard).duration;
|
||||
auto& led_mask = (*data.keyboard).led_mask;
|
||||
@@ -3886,7 +3886,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Pointer)) {
|
||||
- data.pointer.emplace();
|
||||
+ data.pointer = x11::Input::FeedbackState::Pointer{};
|
||||
auto& accel_num = (*data.pointer).accel_num;
|
||||
auto& accel_denom = (*data.pointer).accel_denom;
|
||||
auto& threshold = (*data.pointer).threshold;
|
||||
@@ -3904,7 +3904,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&threshold, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::String)) {
|
||||
- data.string.emplace();
|
||||
+ data.string = x11::Input::FeedbackState::String{};
|
||||
auto& max_symbols = (*data.string).max_symbols;
|
||||
uint16_t num_keysyms{};
|
||||
auto& keysyms = (*data.string).keysyms;
|
||||
@@ -3924,7 +3924,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Integer)) {
|
||||
- data.integer.emplace();
|
||||
+ data.integer = x11::Input::FeedbackState::Integer{};
|
||||
auto& resolution = (*data.integer).resolution;
|
||||
auto& min_value = (*data.integer).min_value;
|
||||
auto& max_value = (*data.integer).max_value;
|
||||
@@ -3939,7 +3939,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&max_value, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Led)) {
|
||||
- data.led.emplace();
|
||||
+ data.led = x11::Input::FeedbackState::Led{};
|
||||
auto& led_mask = (*data.led).led_mask;
|
||||
auto& led_values = (*data.led).led_values;
|
||||
|
||||
@@ -3950,7 +3950,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&led_values, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Bell)) {
|
||||
- data.bell.emplace();
|
||||
+ data.bell = x11::Input::FeedbackState::Bell{};
|
||||
auto& percent = (*data.bell).percent;
|
||||
auto& pitch = (*data.bell).pitch;
|
||||
auto& duration = (*data.bell).duration;
|
||||
@@ -4768,7 +4768,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
// data
|
||||
auto data_expr = class_id;
|
||||
if (CaseEq(data_expr, Input::InputClass::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = x11::Input::InputState::Key{};
|
||||
auto& num_keys = (*data.key).num_keys;
|
||||
auto& keys = (*data.key).keys;
|
||||
size_t keys_len = keys.size();
|
||||
@@ -4786,7 +4786,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::InputClass::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = x11::Input::InputState::Button{};
|
||||
auto& num_buttons = (*data.button).num_buttons;
|
||||
auto& buttons = (*data.button).buttons;
|
||||
size_t buttons_len = buttons.size();
|
||||
@@ -4804,7 +4804,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::InputClass::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = x11::Input::InputState::Valuator{};
|
||||
uint8_t num_valuators{};
|
||||
auto& mode = (*data.valuator).mode;
|
||||
auto& valuators = (*data.valuator).valuators;
|
||||
@@ -5075,7 +5075,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
// data
|
||||
auto data_expr = control_id;
|
||||
if (CaseEq(data_expr, Input::DeviceControl::resolution)) {
|
||||
- data.resolution.emplace();
|
||||
+ data.resolution = x11::Input::DeviceState::Resolution{};
|
||||
uint32_t num_valuators{};
|
||||
auto& resolution_values = (*data.resolution).resolution_values;
|
||||
size_t resolution_values_len = resolution_values.size();
|
||||
@@ -5109,7 +5109,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::abs_calib)) {
|
||||
- data.abs_calib.emplace();
|
||||
+ data.abs_calib = x11::Input::DeviceState::AbsCalib{};
|
||||
auto& min_x = (*data.abs_calib).min_x;
|
||||
auto& max_x = (*data.abs_calib).max_x;
|
||||
auto& min_y = (*data.abs_calib).min_y;
|
||||
@@ -5144,7 +5144,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Read(&button_threshold, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::core)) {
|
||||
- data.core.emplace();
|
||||
+ data.core = x11::Input::DeviceState::Core{};
|
||||
auto& status = (*data.core).status;
|
||||
auto& iscore = (*data.core).iscore;
|
||||
|
||||
@@ -5158,7 +5158,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Pad(&buf, 2);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::enable)) {
|
||||
- data.enable.emplace();
|
||||
+ data.enable = x11::Input::DeviceState::Enable{};
|
||||
auto& enable = (*data.enable).enable;
|
||||
|
||||
// enable
|
||||
@@ -5168,7 +5168,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::abs_area)) {
|
||||
- data.abs_area.emplace();
|
||||
+ data.abs_area = x11::Input::DeviceState::AbsArea{};
|
||||
auto& offset_x = (*data.abs_area).offset_x;
|
||||
auto& offset_y = (*data.abs_area).offset_y;
|
||||
auto& width = (*data.abs_area).width;
|
||||
@@ -6659,7 +6659,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
// data
|
||||
auto data_expr = type;
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = Input::DeviceClass::Key{};
|
||||
uint16_t num_keys{};
|
||||
auto& keys = (*data.key).keys;
|
||||
size_t keys_len = keys.size();
|
||||
@@ -6675,7 +6675,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = Input::DeviceClass::Button{};
|
||||
uint16_t num_buttons{};
|
||||
auto& state = (*data.button).state;
|
||||
size_t state_len = state.size();
|
||||
@@ -6700,7 +6700,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = Input::DeviceClass::Valuator{};
|
||||
auto& number = (*data.valuator).number;
|
||||
auto& label = (*data.valuator).label;
|
||||
auto& min = (*data.valuator).min;
|
||||
@@ -6763,7 +6763,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
|
||||
- data.scroll.emplace();
|
||||
+ data.scroll = Input::DeviceClass::Scroll{};
|
||||
auto& number = (*data.scroll).number;
|
||||
auto& scroll_type = (*data.scroll).scroll_type;
|
||||
auto& flags = (*data.scroll).flags;
|
||||
@@ -6798,7 +6798,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
|
||||
- data.touch.emplace();
|
||||
+ data.touch = Input::DeviceClass::Touch{};
|
||||
auto& mode = (*data.touch).mode;
|
||||
auto& num_touches = (*data.touch).num_touches;
|
||||
|
||||
@@ -6811,7 +6811,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
Read(&num_touches, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
|
||||
- data.gesture.emplace();
|
||||
+ data.gesture = Input::DeviceClass::Gesture{};
|
||||
auto& num_touches = (*data.gesture).num_touches;
|
||||
|
||||
// num_touches
|
||||
diff -up chromium-125.0.6422.60/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/xkb.cc
|
||||
--- chromium-125.0.6422.60/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ 2024-05-15 23:47:33.000000000 +0200
|
||||
+++ chromium-125.0.6422.60/ui/gfx/x/generated_protos/xkb.cc 2024-05-19 09:07:38.220438054 +0200
|
||||
@@ -2346,7 +2346,7 @@ std::unique_ptr<Xkb::GetMapReply> detail
|
||||
// map
|
||||
auto map_expr = present;
|
||||
if (CaseAnd(map_expr, Xkb::MapPart::KeyTypes)) {
|
||||
- map.types_rtrn.emplace();
|
||||
+ map.types_rtrn = std::vector<Xkb::KeyType>{};
|
||||
auto& types_rtrn = *map.types_rtrn;
|
||||
size_t types_rtrn_len = types_rtrn.size();
|
||||
|
||||
@@ -5276,7 +5276,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::Types) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::ClientSymbols) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::ServerSymbols)) {
|
||||
- replies.types.emplace();
|
||||
+ replies.types = Xkb::GetKbdByNameReply::Types{};
|
||||
auto& getmap_type = (*replies.types).getmap_type;
|
||||
auto& typeDeviceID = (*replies.types).typeDeviceID;
|
||||
auto& getmap_sequence = (*replies.types).getmap_sequence;
|
||||
@@ -5708,7 +5708,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::CompatMap)) {
|
||||
- replies.compat_map.emplace();
|
||||
+ replies.compat_map = Xkb::GetKbdByNameReply::CompatMap{};
|
||||
auto& compatmap_type = (*replies.compat_map).compatmap_type;
|
||||
auto& compatDeviceID = (*replies.compat_map).compatDeviceID;
|
||||
auto& compatmap_sequence = (*replies.compat_map).compatmap_sequence;
|
||||
@@ -5832,7 +5832,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::IndicatorMaps)) {
|
||||
- replies.indicator_maps.emplace();
|
||||
+ replies.indicator_maps = Xkb::GetKbdByNameReply::IndicatorMaps{};
|
||||
auto& indicatormap_type = (*replies.indicator_maps).indicatormap_type;
|
||||
auto& indicatorDeviceID = (*replies.indicator_maps).indicatorDeviceID;
|
||||
auto& indicatormap_sequence =
|
||||
@@ -5926,7 +5926,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::KeyNames) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::OtherNames)) {
|
||||
- replies.key_names.emplace();
|
||||
+ replies.key_names = Xkb::GetKbdByNameReply::KeyNames{};
|
||||
auto& keyname_type = (*replies.key_names).keyname_type;
|
||||
auto& keyDeviceID = (*replies.key_names).keyDeviceID;
|
||||
auto& keyname_sequence = (*replies.key_names).keyname_sequence;
|
||||
@@ -6185,7 +6185,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::Geometry)) {
|
||||
- replies.geometry.emplace();
|
||||
+ replies.geometry = Xkb::GetKbdByNameReply::Geometry{};
|
||||
auto& geometry_type = (*replies.geometry).geometry_type;
|
||||
auto& geometryDeviceID = (*replies.geometry).geometryDeviceID;
|
||||
auto& geometry_sequence = (*replies.geometry).geometry_sequence;
|
||||
@ -0,0 +1,22 @@
|
||||
diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.clang16-buildflag chromium-126.0.6478.26/build/config/compiler/BUILD.gn
|
||||
--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.clang16-buildflag 2024-06-02 14:55:55.298242780 +0200
|
||||
+++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 15:04:43.839882669 +0200
|
||||
@@ -1889,9 +1889,6 @@ config("default_warnings") {
|
||||
|
||||
# TODO(crbug.com/40286317): Evaluate and possibly enable.
|
||||
"-Wno-vla-extension",
|
||||
-
|
||||
- # TODO(crbug.com/40284799): Fix and re-enable.
|
||||
- "-Wno-thread-safety-reference-return",
|
||||
]
|
||||
|
||||
cflags_cc += [
|
||||
@@ -1902,7 +1899,7 @@ config("default_warnings") {
|
||||
if (!is_nacl) {
|
||||
cflags_cc += [
|
||||
# TODO(crbug.com/41486292): Fix and re-enable.
|
||||
- "-Wno-c++11-narrowing-const-reference",
|
||||
+ "-Wno-c++11-narrowing",
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.clang16-disable-auto-upgrade-debug-info chromium-126.0.6478.26/build/config/compiler/BUILD.gn
|
||||
--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.clang16-disable-auto-upgrade-debug-info 2024-06-02 18:00:17.914641767 +0200
|
||||
+++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 18:02:32.153544892 +0200
|
||||
@@ -780,7 +780,7 @@ config("compiler") {
|
||||
|
||||
# We only use one version of LLVM within a build so there's no need to
|
||||
# upgrade debug info, which can be expensive since it runs the verifier.
|
||||
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
+ ldflags += [ "" ]
|
||||
}
|
||||
|
||||
# TODO(crbug.com/335365324): Enable on other platforms.
|
||||
@ -0,0 +1,681 @@
|
||||
diff -up chromium-126.0.6478.26/ash/style/ash_color_mixer_unittest.cc.mee chromium-126.0.6478.26/ash/style/ash_color_mixer_unittest.cc
|
||||
--- chromium-126.0.6478.26/ash/style/ash_color_mixer_unittest.cc.mee 2024-05-29 18:00:44.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ash/style/ash_color_mixer_unittest.cc 2024-06-03 16:22:10.549568854 +0200
|
||||
@@ -37,6 +37,9 @@ void InitializeColorProvider(const ui::C
|
||||
// Roughly mimics the ColorMixer configuration for Ash.
|
||||
ash::AddCrosStylesColorMixer(&color_provider, key);
|
||||
ash::AddAshColorMixer(&color_provider, key);
|
||||
+
|
||||
+ // Populates the color map with computed color values.
|
||||
+ color_provider.GenerateColorMap();
|
||||
}
|
||||
|
||||
// Initializes the `color_provider` with `seed_color` and the relevant
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/chrome_content_browser_client_browsertest.cc.mee chromium-126.0.6478.26/chrome/browser/chrome_content_browser_client_browsertest.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/chrome_content_browser_client_browsertest.cc.mee 2024-05-29 18:00:52.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/chrome_content_browser_client_browsertest.cc 2024-06-03 16:22:10.550568873 +0200
|
||||
@@ -602,6 +602,7 @@ class PrefersColorSchemeTest
|
||||
explicit MockColorProviderSource(bool is_dark) {
|
||||
key_.color_mode = is_dark ? ui::ColorProviderKey::ColorMode::kDark
|
||||
: ui::ColorProviderKey::ColorMode::kLight;
|
||||
+ provider_.GenerateColorMap();
|
||||
}
|
||||
MockColorProviderSource(const MockColorProviderSource&) = delete;
|
||||
MockColorProviderSource& operator=(const MockColorProviderSource&) = delete;
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/themes/browser_theme_pack_unittest.cc.mee chromium-126.0.6478.26/chrome/browser/themes/browser_theme_pack_unittest.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/themes/browser_theme_pack_unittest.cc.mee 2024-05-29 18:00:57.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/themes/browser_theme_pack_unittest.cc 2024-06-03 16:22:10.550568873 +0200
|
||||
@@ -750,6 +750,7 @@ TEST_F(BrowserThemePackTest, TestCreateC
|
||||
"omnibox_background": [120, 140, 160] })";
|
||||
LoadColorJSON(color_json);
|
||||
theme_pack().AddColorMixers(&provider, ui::ColorProviderKey());
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SkColorSetRGB(0, 20, 40), provider.GetColor(kColorToolbar));
|
||||
EXPECT_EQ(SkColorSetRGB(60, 80, 100), provider.GetColor(kColorOmniboxText));
|
||||
EXPECT_EQ(SkColorSetRGB(120, 140, 160),
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/color/material_new_tab_page_color_mixer_unittest.cc.mee chromium-126.0.6478.26/chrome/browser/ui/color/material_new_tab_page_color_mixer_unittest.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/color/material_new_tab_page_color_mixer_unittest.cc.mee 2024-05-29 18:00:58.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/color/material_new_tab_page_color_mixer_unittest.cc 2024-06-03 16:22:10.551568891 +0200
|
||||
@@ -26,6 +26,7 @@ class MaterialNewTabPageColorMixerTest :
|
||||
void AddMaterialColorMixers() {
|
||||
AddColorMixers(&color_provider_, color_provider_key_);
|
||||
AddChromeColorMixers(&color_provider_, color_provider_key_);
|
||||
+ color_provider_.GenerateColorMap();
|
||||
}
|
||||
|
||||
private:
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc.mee chromium-126.0.6478.26/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc.mee 2024-05-29 18:00:58.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc 2024-06-03 16:22:10.551568891 +0200
|
||||
@@ -33,6 +33,7 @@ TEST(NewTabPageColorMixer, LightAndDarkT
|
||||
if (color_utils::IsDark(toolbar_color))
|
||||
key.color_mode = ui::ColorProviderKey::ColorMode::kDark;
|
||||
AddNewTabPageColorMixer(&provider, key);
|
||||
+ provider.GenerateColorMap();
|
||||
|
||||
EXPECT_EQ(provider.GetColor(kColorToolbar), toolbar_color);
|
||||
EXPECT_EQ(provider.GetColor(kColorNewTabPageBackground), toolbar_color);
|
||||
@@ -51,6 +52,7 @@ TEST(NewTabPageColorMixer, CustomColorCo
|
||||
key.custom_theme =
|
||||
base::WrapRefCounted(new CustomThemeSupplier(ThemeType::kAutogenerated));
|
||||
AddNewTabPageColorMixer(&provider, key);
|
||||
+ provider.GenerateColorMap();
|
||||
|
||||
EXPECT_EQ(provider.GetColor(kColorToolbar), gfx::kGoogleGreen300);
|
||||
EXPECT_EQ(provider.GetColor(kColorNewTabPageBackground),
|
||||
@@ -72,6 +74,7 @@ TEST(NewTabPageColorMixer, DefaultColorC
|
||||
key.custom_theme =
|
||||
base::WrapRefCounted(new CustomThemeSupplier(ThemeType::kAutogenerated));
|
||||
AddNewTabPageColorMixer(&provider, key);
|
||||
+ provider.GenerateColorMap();
|
||||
|
||||
EXPECT_EQ(provider.GetColor(kColorToolbar), kSampleToolbarColor);
|
||||
EXPECT_EQ(provider.GetColor(kColorNewTabPageBackground), kSampleToolbarColor);
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/color/tools/dump_colors.cc.mee chromium-126.0.6478.26/chrome/browser/ui/color/tools/dump_colors.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/color/tools/dump_colors.cc.mee 2024-05-29 18:00:58.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/color/tools/dump_colors.cc 2024-06-03 16:22:10.551568891 +0200
|
||||
@@ -56,6 +56,7 @@ int main(int argc, const char* argv[]) {
|
||||
ui::AddColorMixers(provider, key);
|
||||
color::AddComponentsColorMixers(provider, key);
|
||||
AddChromeColorMixers(provider, key);
|
||||
+ provider->GenerateColorMap();
|
||||
};
|
||||
ui::ColorProvider light_provider, dark_provider, light_high_contrast_provider,
|
||||
dark_high_contrast_provider;
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc.mee chromium-126.0.6478.26/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc.mee 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc 2024-06-03 16:22:10.552568911 +0200
|
||||
@@ -117,7 +117,7 @@ class MockLogoService : public search_pr
|
||||
|
||||
class MockColorProviderSource : public ui::ColorProviderSource {
|
||||
public:
|
||||
- MockColorProviderSource() = default;
|
||||
+ MockColorProviderSource() { color_provider_.GenerateColorMap(); }
|
||||
MockColorProviderSource(const MockColorProviderSource&) = delete;
|
||||
MockColorProviderSource& operator=(const MockColorProviderSource&) = delete;
|
||||
~MockColorProviderSource() override = default;
|
||||
diff -up chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_browsertest.cc.mee chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_browsertest.cc
|
||||
--- chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_browsertest.cc.mee 2024-05-29 18:01:13.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_browsertest.cc 2024-06-03 16:22:10.553568929 +0200
|
||||
@@ -6300,7 +6300,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplSt
|
||||
|
||||
class MockColorProviderSource : public ui::ColorProviderSource {
|
||||
public:
|
||||
- MockColorProviderSource() = default;
|
||||
+ MockColorProviderSource() { provider_.GenerateColorMap(); }
|
||||
MockColorProviderSource(const MockColorProviderSource&) = delete;
|
||||
MockColorProviderSource& operator=(const MockColorProviderSource&) = delete;
|
||||
~MockColorProviderSource() override = default;
|
||||
diff -up chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_unittest.cc.mee chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_unittest.cc
|
||||
--- chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_unittest.cc.mee 2024-05-29 18:01:13.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/content/browser/web_contents/web_contents_impl_unittest.cc 2024-06-03 16:22:10.554568949 +0200
|
||||
@@ -337,7 +337,7 @@ class MockPageBroadcast : public TestPag
|
||||
|
||||
class TestColorProviderSource : public ui::ColorProviderSource {
|
||||
public:
|
||||
- TestColorProviderSource() = default;
|
||||
+ TestColorProviderSource() { provider_.GenerateColorMap(); }
|
||||
|
||||
const ui::ColorProvider* GetColorProvider() const override {
|
||||
return &provider_;
|
||||
diff -up chromium-126.0.6478.26/content/public/test/render_view_test.cc.mee chromium-126.0.6478.26/content/public/test/render_view_test.cc
|
||||
--- chromium-126.0.6478.26/content/public/test/render_view_test.cc.mee 2024-05-29 18:01:14.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/content/public/test/render_view_test.cc 2024-06-03 16:22:10.554568949 +0200
|
||||
@@ -150,7 +150,7 @@ class FailingURLLoaderFactory : public n
|
||||
|
||||
class MockColorProviderSource : public ui::ColorProviderSource {
|
||||
public:
|
||||
- explicit MockColorProviderSource() = default;
|
||||
+ explicit MockColorProviderSource() { provider_.GenerateColorMap(); }
|
||||
MockColorProviderSource(const MockColorProviderSource&) = delete;
|
||||
MockColorProviderSource& operator=(const MockColorProviderSource&) = delete;
|
||||
~MockColorProviderSource() override = default;
|
||||
diff -up chromium-126.0.6478.26/extensions/browser/extension_host.cc.mee chromium-126.0.6478.26/extensions/browser/extension_host.cc
|
||||
--- chromium-126.0.6478.26/extensions/browser/extension_host.cc.mee 2024-05-29 18:01:22.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/extensions/browser/extension_host.cc 2024-06-03 16:22:10.555568967 +0200
|
||||
@@ -58,7 +58,7 @@ namespace {
|
||||
// the UI-less extension background page.
|
||||
class NoOpColorProviderSource : public ui::ColorProviderSource {
|
||||
public:
|
||||
- NoOpColorProviderSource() = default;
|
||||
+ NoOpColorProviderSource() { color_provider_.GenerateColorMap(); }
|
||||
NoOpColorProviderSource(const NoOpColorProviderSource&) = delete;
|
||||
NoOpColorProviderSource& operator=(const NoOpColorProviderSource&) = delete;
|
||||
~NoOpColorProviderSource() override = default;
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/layout/layout_theme.cc.mee chromium-126.0.6478.26/third_party/blink/renderer/core/layout/layout_theme.cc
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/core/layout/layout_theme.cc.mee 2024-05-29 18:01:39.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/layout/layout_theme.cc 2024-06-03 16:22:10.555568967 +0200
|
||||
@@ -677,7 +677,7 @@ Color LayoutTheme::SystemColorFromColorP
|
||||
CSSValueID css_value_id,
|
||||
mojom::blink::ColorScheme color_scheme,
|
||||
const ui::ColorProvider* color_provider) const {
|
||||
- CHECK(color_provider->HasMixers());
|
||||
+ CHECK(!color_provider->IsColorMapEmpty());
|
||||
SkColor system_theme_color;
|
||||
switch (css_value_id) {
|
||||
case CSSValueID::kActivetext:
|
||||
diff -up chromium-126.0.6478.26/ui/base/models/image_model_unittest.cc.mee chromium-126.0.6478.26/ui/base/models/image_model_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/base/models/image_model_unittest.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/base/models/image_model_unittest.cc 2024-06-03 16:22:10.555568967 +0200
|
||||
@@ -224,6 +224,7 @@ TEST(ImageModelTest, ShouldRasterizeEmpt
|
||||
|
||||
TEST(ImageModelTest, ShouldRasterizeVectorIcon) {
|
||||
ui::ColorProvider color_provider;
|
||||
+ color_provider.GenerateColorMap();
|
||||
gfx::ImageSkia image_skia =
|
||||
ui::ImageModel::FromVectorIcon(vector_icons::kSyncIcon)
|
||||
.Rasterize(&color_provider);
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider.cc.mee chromium-126.0.6478.26/ui/color/color_provider.cc
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider.cc.mee 2024-06-03 16:03:15.596432761 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider.cc 2024-06-03 16:22:10.555568967 +0200
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#include "ui/color/color_provider.h"
|
||||
|
||||
-#include <forward_list>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <utility>
|
||||
@@ -18,106 +17,6 @@
|
||||
|
||||
namespace ui {
|
||||
|
||||
-////////////////////////////////////////////////////////////////////////////////
|
||||
-// ColorProvider::ColorProviderInternal:
|
||||
-
|
||||
-class ColorProvider::ColorProviderInternal {
|
||||
- public:
|
||||
- using Mixers = std::forward_list<ColorMixer>;
|
||||
-
|
||||
- ColorProviderInternal() = default;
|
||||
- ColorProviderInternal(const ColorProviderInternal&) = delete;
|
||||
- ColorProviderInternal& operator=(const ColorProviderInternal&) = delete;
|
||||
- ~ColorProviderInternal() = default;
|
||||
-
|
||||
- ColorMixer& AddMixer() {
|
||||
- color_map_.clear();
|
||||
- mixers_.emplace_after(
|
||||
- first_postprocessing_mixer_,
|
||||
- base::BindRepeating([](const ColorMixer* mixer) { return mixer; },
|
||||
- GetLastNonPostprocessingMixer()),
|
||||
- base::BindRepeating(&ColorProvider::ColorProviderInternal::
|
||||
- GetLastNonPostprocessingMixer,
|
||||
- base::Unretained(this)));
|
||||
-
|
||||
- return *std::next(first_postprocessing_mixer_, 1);
|
||||
- }
|
||||
-
|
||||
- ColorMixer& AddPostprocessingMixer() {
|
||||
- color_map_.clear();
|
||||
- if (first_postprocessing_mixer_ == mixers_.before_begin()) {
|
||||
- // The first postprocessing mixer points to the last regular mixer.
|
||||
- auto previous_mixer_getter = base::BindRepeating(
|
||||
- &ColorProvider::ColorProviderInternal::GetLastNonPostprocessingMixer,
|
||||
- base::Unretained(this));
|
||||
- mixers_.emplace_front(previous_mixer_getter, previous_mixer_getter);
|
||||
- first_postprocessing_mixer_ = mixers_.begin();
|
||||
- } else {
|
||||
- // Other postprocessing mixers point to the next postprocessing mixer.
|
||||
- auto previous_mixer_getter =
|
||||
- base::BindRepeating([](const ColorMixer* mixer) { return mixer; },
|
||||
- base::Unretained(&mixers_.front()));
|
||||
- mixers_.emplace_front(previous_mixer_getter, previous_mixer_getter);
|
||||
- }
|
||||
- return mixers_.front();
|
||||
- }
|
||||
-
|
||||
- SkColor GetColor(ColorId id) const {
|
||||
- auto i = color_map_.find(id);
|
||||
- if (i == color_map_.end()) {
|
||||
- if (mixers_.empty()) {
|
||||
- DVLOG(2) << "ColorProvider::GetColor: No mixers defined!";
|
||||
- return gfx::kPlaceholderColor;
|
||||
- }
|
||||
- DVLOG(2) << "ColorProvider::GetColor: Computing color for ColorId: "
|
||||
- << ColorIdName(id);
|
||||
- const SkColor color = mixers_.front().GetResultColor(id);
|
||||
- if (color == gfx::kPlaceholderColor) {
|
||||
- return gfx::kPlaceholderColor;
|
||||
- }
|
||||
- i = color_map_.insert({id, color}).first;
|
||||
- }
|
||||
-
|
||||
- DVLOG(2) << "ColorProvider::GetColor: ColorId: " << ColorIdName(id)
|
||||
- << " Value: " << SkColorName(i->second);
|
||||
- return i->second;
|
||||
- }
|
||||
-
|
||||
- const ColorMixer* GetLastNonPostprocessingMixer() const {
|
||||
- const auto it = std::next(first_postprocessing_mixer_, 1);
|
||||
- return (it == mixers_.cend()) ? nullptr : &(*it);
|
||||
- }
|
||||
-
|
||||
- bool HasMixers() const { return !mixers_.empty(); }
|
||||
-
|
||||
- void SetColorForTesting(ColorId id, SkColor color) { color_map_[id] = color; }
|
||||
-
|
||||
- void GenerateColorMapForTesting() {
|
||||
- for (const auto& mixer : mixers_) {
|
||||
- const auto mixer_color_ids = mixer.GetDefinedColorIds();
|
||||
- for (const auto color_id : mixer_color_ids) {
|
||||
- GetColor(color_id);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- const ColorProvider::ColorMap& color_map_for_testing() { return color_map_; }
|
||||
-
|
||||
- private:
|
||||
- // The entire color pipeline, in reverse order (that is, the "last" mixer is
|
||||
- // at the front).
|
||||
- Mixers mixers_;
|
||||
-
|
||||
- // The first mixer in the chain that is a "postprocessing" mixer.
|
||||
- Mixers::iterator first_postprocessing_mixer_ = mixers_.before_begin();
|
||||
-
|
||||
- // A cached map of ColorId => SkColor mappings for this provider.
|
||||
- mutable ColorMap color_map_;
|
||||
-};
|
||||
-
|
||||
-////////////////////////////////////////////////////////////////////////////////
|
||||
-// ColorProvider:
|
||||
-
|
||||
ColorProvider::ColorProvider() = default;
|
||||
|
||||
ColorProvider::ColorProvider(ColorProvider&&) = default;
|
||||
@@ -127,31 +26,96 @@ ColorProvider& ColorProvider::operator=(
|
||||
ColorProvider::~ColorProvider() = default;
|
||||
|
||||
ColorMixer& ColorProvider::AddMixer() {
|
||||
- return internal_->AddMixer();
|
||||
+ DCHECK(!color_map_);
|
||||
+
|
||||
+ mixers_.emplace_after(
|
||||
+ first_postprocessing_mixer_,
|
||||
+ base::BindRepeating([](const ColorMixer* mixer) { return mixer; },
|
||||
+ GetLastNonPostprocessingMixer()),
|
||||
+ base::BindRepeating(&ColorProvider::GetLastNonPostprocessingMixer,
|
||||
+ base::Unretained(this)));
|
||||
+
|
||||
+ return *std::next(first_postprocessing_mixer_, 1);
|
||||
}
|
||||
|
||||
ColorMixer& ColorProvider::AddPostprocessingMixer() {
|
||||
- return internal_->AddPostprocessingMixer();
|
||||
+ DCHECK(!color_map_);
|
||||
+
|
||||
+ if (first_postprocessing_mixer_ == mixers_.before_begin()) {
|
||||
+ // The first postprocessing mixer points to the last regular mixer.
|
||||
+ auto previous_mixer_getter = base::BindRepeating(
|
||||
+ &ColorProvider::GetLastNonPostprocessingMixer, base::Unretained(this));
|
||||
+ mixers_.emplace_front(previous_mixer_getter, previous_mixer_getter);
|
||||
+ first_postprocessing_mixer_ = mixers_.begin();
|
||||
+ } else {
|
||||
+ // Other postprocessing mixers point to the next postprocessing mixer.
|
||||
+ auto previous_mixer_getter =
|
||||
+ base::BindRepeating([](const ColorMixer* mixer) { return mixer; },
|
||||
+ base::Unretained(&mixers_.front()));
|
||||
+ mixers_.emplace_front(previous_mixer_getter, previous_mixer_getter);
|
||||
+ }
|
||||
+ return mixers_.front();
|
||||
}
|
||||
|
||||
SkColor ColorProvider::GetColor(ColorId id) const {
|
||||
- return internal_->GetColor(id);
|
||||
-}
|
||||
+ CHECK(color_map_);
|
||||
+ auto i = color_map_->find(id);
|
||||
+ return i == color_map_->end() ? gfx::kPlaceholderColor : i->second;
|
||||
+}
|
||||
+
|
||||
+void ColorProvider::GenerateColorMap() {
|
||||
+ // This should only be called to generate the `color_map_` once.
|
||||
+ DCHECK(!color_map_);
|
||||
+
|
||||
+ if (mixers_.empty())
|
||||
+ DVLOG(2) << "ColorProvider::GenerateColorMap: No mixers defined!";
|
||||
+
|
||||
+ // Iterate over associated mixers and extract the ColorIds defined for this
|
||||
+ // provider.
|
||||
+ std::set<ColorId> color_ids;
|
||||
+ for (const auto& mixer : mixers_) {
|
||||
+ const auto mixer_color_ids = mixer.GetDefinedColorIds();
|
||||
+ color_ids.insert(mixer_color_ids.begin(), mixer_color_ids.end());
|
||||
+ }
|
||||
+
|
||||
+ // Iterate through all defined ColorIds and seed the `color_map` with the
|
||||
+ // computed values. Use a std::map rather than a base::flat_map since it has
|
||||
+ // frequent inserts and could grow very large.
|
||||
+ std::map<ColorId, SkColor> color_map;
|
||||
+ for (const auto& color_id : color_ids) {
|
||||
+ SkColor resulting_color = mixers_.front().GetResultColor(color_id);
|
||||
+ DVLOG(2) << "GenerateColorMap:"
|
||||
+ << " Color Id: " << ColorIdName(color_id)
|
||||
+ << " Resulting Color: " << SkColorName(resulting_color);
|
||||
+ color_map.insert({color_id, resulting_color});
|
||||
+ }
|
||||
+
|
||||
+ // Construct the color_map_.
|
||||
+ color_map_ = ColorMap(color_map.begin(), color_map.end());
|
||||
|
||||
-bool ColorProvider::HasMixers() const {
|
||||
- return internal_->HasMixers();
|
||||
+ // Clear away all associated mixers as these are no longer needed.
|
||||
+ mixers_.clear();
|
||||
+ first_postprocessing_mixer_ = mixers_.before_begin();
|
||||
}
|
||||
|
||||
-void ColorProvider::SetColorForTesting(ColorId id, SkColor color) {
|
||||
- internal_->SetColorForTesting(id, color); // IN-TEST
|
||||
+bool ColorProvider::IsColorMapEmpty() const {
|
||||
+ DCHECK(color_map_);
|
||||
+ return color_map_->empty();
|
||||
}
|
||||
|
||||
-void ColorProvider::GenerateColorMapForTesting() {
|
||||
- internal_->GenerateColorMapForTesting(); // IN-TEST
|
||||
+void ColorProvider::SetColorForTesting(ColorId id, SkColor color) {
|
||||
+ if (color_map_) {
|
||||
+ (*color_map_)[id] = color;
|
||||
+ } else {
|
||||
+ if (mixers_.empty())
|
||||
+ AddMixer();
|
||||
+ (*std::next(first_postprocessing_mixer_, 1))[id] = {color};
|
||||
+ }
|
||||
}
|
||||
|
||||
-const ColorProvider::ColorMap& ColorProvider::color_map_for_testing() {
|
||||
- return internal_->color_map_for_testing(); // IN-TEST
|
||||
+const ColorMixer* ColorProvider::GetLastNonPostprocessingMixer() const {
|
||||
+ const auto it = std::next(first_postprocessing_mixer_, 1);
|
||||
+ return (it == mixers_.cend()) ? nullptr : &(*it);
|
||||
}
|
||||
|
||||
} // namespace ui
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider.h.mee chromium-126.0.6478.26/ui/color/color_provider.h
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider.h.mee 2024-06-03 16:13:48.739166275 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider.h 2024-06-03 16:22:10.555568967 +0200
|
||||
@@ -5,11 +5,12 @@
|
||||
#ifndef UI_COLOR_COLOR_PROVIDER_H_
|
||||
#define UI_COLOR_COLOR_PROVIDER_H_
|
||||
|
||||
-#include <map>
|
||||
+#include <forward_list>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
#include "base/component_export.h"
|
||||
+#include "base/containers/flat_map.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/color/color_id.h"
|
||||
#include "ui/color/color_mixer.h"
|
||||
@@ -24,7 +25,7 @@ namespace ui {
|
||||
// TODO(pkasting): Figure out ownership model and lifetime.
|
||||
class COMPONENT_EXPORT(COLOR) ColorProvider {
|
||||
public:
|
||||
- using ColorMap = std::map<ColorId, SkColor>;
|
||||
+ using ColorMap = base::flat_map<ColorId, SkColor>;
|
||||
|
||||
ColorProvider();
|
||||
ColorProvider(const ColorProvider&) = delete;
|
||||
@@ -48,25 +49,39 @@ class COMPONENT_EXPORT(COLOR) ColorProvi
|
||||
// |id|.
|
||||
SkColor GetColor(ColorId id) const;
|
||||
|
||||
- // Returns true if mixers is not empty. It's the case for some browser
|
||||
+ // Generates the `color_map_` used by this provider for all ColorIds defined
|
||||
+ // by attached mixers. After the map is generated attached mixers and their
|
||||
+ // associated objects are discarded. Mixers should not be added to the
|
||||
+ // provider after this has been called.
|
||||
+ void GenerateColorMap();
|
||||
+
|
||||
+ // Returns true if the color_map_ is empty. It's the case for some browser
|
||||
// tests that run in single process mode but access colors that are
|
||||
// initialized on renderer process launch, for example, controls in
|
||||
// NaiveThemeBase and its children classes. Please see more details:
|
||||
// https://crbug.com/1376775.
|
||||
- bool HasMixers() const;
|
||||
+ bool IsColorMapEmpty() const;
|
||||
|
||||
void SetColorForTesting(ColorId id, SkColor color);
|
||||
- void GenerateColorMapForTesting();
|
||||
- const ColorMap& color_map_for_testing();
|
||||
+ const ColorMap& color_map_for_testing() { return *color_map_; }
|
||||
|
||||
private:
|
||||
- // ColorProviderInternal provides the actual implementation of ColorProvider.
|
||||
- // It's non-movable and non-copyable so that ColorMixer's callbacks can safely
|
||||
- // bind to it.
|
||||
- class ColorProviderInternal;
|
||||
+ using Mixers = std::forward_list<ColorMixer>;
|
||||
|
||||
- std::unique_ptr<ColorProviderInternal> internal_ =
|
||||
- std::make_unique<ColorProviderInternal>();
|
||||
+ // Returns the last mixer in the chain that is not a "postprocessing" mixer,
|
||||
+ // or nullptr.
|
||||
+ const ColorMixer* GetLastNonPostprocessingMixer() const;
|
||||
+
|
||||
+ // The entire color pipeline, in reverse order (that is, the "last" mixer is
|
||||
+ // at the front).
|
||||
+ Mixers mixers_;
|
||||
+
|
||||
+ // The first mixer in the chain that is a "postprocessing" mixer.
|
||||
+ Mixers::iterator first_postprocessing_mixer_ = mixers_.before_begin();
|
||||
+
|
||||
+ // A cached map of ColorId => SkColor mappings for this provider. This will be
|
||||
+ // generated in the call to `GenerateColorMap()`.
|
||||
+ std::optional<ColorMap> color_map_;
|
||||
};
|
||||
|
||||
} // namespace ui
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider_manager.cc.mee chromium-126.0.6478.26/ui/color/color_provider_manager.cc
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider_manager.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider_manager.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -109,6 +109,7 @@ ColorProvider* ColorProviderManager::Get
|
||||
if (!initializer_list_->empty())
|
||||
initializer_list_->Notify(provider.get(), key);
|
||||
|
||||
+ provider->GenerateColorMap();
|
||||
RecordTimeSpentInitializingColorProvider(timer.Elapsed());
|
||||
++num_providers_initialized_;
|
||||
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider_unittest.cc.mee chromium-126.0.6478.26/ui/color/color_provider_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider_unittest.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider_unittest.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -17,6 +17,7 @@ namespace {
|
||||
// Tests that when there are no mixers, GetColor() returns a placeholder value.
|
||||
TEST(ColorProviderTest, GetColorNoMixers) {
|
||||
ColorProvider provider;
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(gfx::kPlaceholderColor, provider.GetColor(kColorTest0));
|
||||
}
|
||||
|
||||
@@ -25,6 +26,7 @@ TEST(ColorProviderTest, GetColorNoMixers
|
||||
TEST(ColorProviderTest, SingleMixer) {
|
||||
ColorProvider provider;
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorGREEN};
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorGREEN, provider.GetColor(kColorTest0));
|
||||
EXPECT_EQ(gfx::kPlaceholderColor, provider.GetColor(kColorTest1));
|
||||
}
|
||||
@@ -35,6 +37,7 @@ TEST(ColorProviderTest, NonOverlappingMi
|
||||
ColorProvider provider;
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorGREEN};
|
||||
provider.AddMixer()[kColorTest1] = {SK_ColorRED};
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorGREEN, provider.GetColor(kColorTest0));
|
||||
EXPECT_EQ(SK_ColorRED, provider.GetColor(kColorTest1));
|
||||
}
|
||||
@@ -45,6 +48,7 @@ TEST(ColorProviderTest, OverlappingMixer
|
||||
ColorProvider provider;
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorGREEN};
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorRED};
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorRED, provider.GetColor(kColorTest0));
|
||||
}
|
||||
|
||||
@@ -55,6 +59,7 @@ TEST(ColorProviderTest, WithProcessing)
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorBLACK};
|
||||
provider.AddPostprocessingMixer()[kColorTest0] =
|
||||
GetColorWithMaxContrast(FromTransformInput());
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorWHITE, provider.GetColor(kColorTest0));
|
||||
}
|
||||
|
||||
@@ -65,6 +70,7 @@ TEST(ColorProviderTest, WithProcessingAd
|
||||
provider.AddPostprocessingMixer()[kColorTest0] =
|
||||
GetColorWithMaxContrast(FromTransformInput());
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorBLACK};
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorWHITE, provider.GetColor(kColorTest0));
|
||||
}
|
||||
|
||||
@@ -76,6 +82,7 @@ TEST(ColorProviderTest, Redefinition) {
|
||||
mixer0[kColorTest0] = {SK_ColorBLACK};
|
||||
mixer0[kColorTest1] = AlphaBlend(SK_ColorRED, kColorTest0, 0x01);
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorWHITE};
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorWHITE, provider.GetColor(kColorTest0));
|
||||
EXPECT_FALSE(color_utils::IsDark(provider.GetColor(kColorTest1)));
|
||||
}
|
||||
@@ -90,6 +97,7 @@ TEST(ColorProviderTest, RedefinitionWith
|
||||
provider.AddMixer()[kColorTest0] = {SK_ColorWHITE};
|
||||
provider.AddPostprocessingMixer()[kColorTest0] =
|
||||
GetColorWithMaxContrast(FromTransformInput());
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_NE(SK_ColorWHITE, provider.GetColor(kColorTest0));
|
||||
EXPECT_FALSE(color_utils::IsDark(provider.GetColor(kColorTest1)));
|
||||
}
|
||||
@@ -97,6 +105,7 @@ TEST(ColorProviderTest, RedefinitionWith
|
||||
TEST(ColorProviderTest, SetColorForTesting) {
|
||||
ColorProvider provider;
|
||||
provider.SetColorForTesting(kColorTest0, SK_ColorGREEN);
|
||||
+ provider.GenerateColorMap();
|
||||
EXPECT_EQ(SK_ColorGREEN, provider.GetColor(kColorTest0));
|
||||
EXPECT_EQ(gfx::kPlaceholderColor, provider.GetColor(kColorTest1));
|
||||
provider.SetColorForTesting(kColorTest1, SK_ColorBLUE);
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider_utils.cc.mee chromium-126.0.6478.26/ui/color/color_provider_utils.cc
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider_utils.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider_utils.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -367,6 +367,7 @@ ColorProvider CreateColorProviderFromRen
|
||||
|
||||
for (const auto& table : kRendererColorIdMap)
|
||||
mixer[table.color_id] = {renderer_color_map.at(table.renderer_color_id)};
|
||||
+ color_provider.GenerateColorMap();
|
||||
|
||||
return color_provider;
|
||||
}
|
||||
@@ -425,6 +426,7 @@ ColorProvider CreateEmulatedForcedColors
|
||||
mixer[kColorSeparator] = {kColorMidground};
|
||||
CompleteDefaultNonWebNativeRendererColorIdsDefinition(mixer);
|
||||
|
||||
+ color_provider.GenerateColorMap();
|
||||
return color_provider;
|
||||
}
|
||||
|
||||
@@ -479,6 +481,7 @@ ColorProvider CreateEmulatedForcedColors
|
||||
mixer[kColorWebNativeControlSliderHovered] = {SK_ColorCYAN};
|
||||
mixer[kColorWebNativeControlSliderPressed] = {SK_ColorCYAN};
|
||||
|
||||
+ color_provider.GenerateColorMap();
|
||||
return color_provider;
|
||||
}
|
||||
|
||||
@@ -652,6 +655,7 @@ ColorProvider COMPONENT_EXPORT(COLOR)
|
||||
SkColorSetRGB(0x37, 0x93, 0xFF)};
|
||||
}
|
||||
|
||||
+ color_provider.GenerateColorMap();
|
||||
return color_provider;
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/ui/color/color_provider_utils_unittest.cc.mee chromium-126.0.6478.26/ui/color/color_provider_utils_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/color/color_provider_utils_unittest.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/color_provider_utils_unittest.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -49,6 +49,7 @@ TEST_F(ColorProviderUtilsTest, RendererC
|
||||
ui::ColorMixer& mixer = color_provider.AddMixer();
|
||||
for (int i = ui::kUiColorsStart + 1; i < ui::kUiColorsEnd; ++i)
|
||||
mixer[i] = {static_cast<SkColor>(i)};
|
||||
+ color_provider.GenerateColorMap();
|
||||
|
||||
// The size of the RendererColorMap should match number of defined
|
||||
// RendererColorIds.
|
||||
@@ -60,7 +61,6 @@ TEST_F(ColorProviderUtilsTest, RendererC
|
||||
// also match the number of defined RendererColorIds.
|
||||
auto new_color_provider =
|
||||
ui::CreateColorProviderFromRendererColorMap(renderer_color_map);
|
||||
- new_color_provider.GenerateColorMapForTesting();
|
||||
EXPECT_EQ(kTotaltRendererColorIds,
|
||||
new_color_provider.color_map_for_testing().size());
|
||||
}
|
||||
@@ -73,6 +73,7 @@ TEST_F(ColorProviderUtilsTest, ColorProv
|
||||
for (int i = ui::kUiColorsStart + 1; i < ui::kUiColorsEnd; ++i) {
|
||||
mixer[i] = {static_cast<SkColor>(i)};
|
||||
}
|
||||
+ color_provider.GenerateColorMap();
|
||||
|
||||
// A renderer color map generated from its source provider should have
|
||||
// equivalent mappings.
|
||||
@@ -84,6 +85,7 @@ TEST_F(ColorProviderUtilsTest, ColorProv
|
||||
// Providers with different renderer color mappings should not be flagged as
|
||||
// equivalent.
|
||||
ui::ColorProvider new_color_provider;
|
||||
+ new_color_provider.GenerateColorMap();
|
||||
EXPECT_FALSE(IsRendererColorMappingEquivalent(&new_color_provider,
|
||||
renderer_color_map));
|
||||
}
|
||||
@@ -119,6 +121,7 @@ TEST_F(ColorProviderUtilsTest, DefaultBl
|
||||
ui::ColorProvider random_color_provider;
|
||||
ui::ColorMixer& mixer = random_color_provider.AddMixer();
|
||||
mixer[ui::kColorPrimaryBackground] = {SK_ColorWHITE};
|
||||
+ random_color_provider.GenerateColorMap();
|
||||
ui::RendererColorMap random_color_map =
|
||||
ui::CreateRendererColorMap(random_color_provider);
|
||||
|
||||
diff -up chromium-126.0.6478.26/ui/color/sys_color_mixer_unittest.cc.mee chromium-126.0.6478.26/ui/color/sys_color_mixer_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/color/sys_color_mixer_unittest.cc.mee 2024-05-29 18:02:31.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/color/sys_color_mixer_unittest.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -36,6 +36,7 @@ class SysColorMixerTest
|
||||
|
||||
AddRefColorMixer(&color_provider_, key);
|
||||
AddSysColorMixer(&color_provider_, key);
|
||||
+ color_provider_.GenerateColorMap();
|
||||
}
|
||||
|
||||
protected:
|
||||
diff -up chromium-126.0.6478.26/ui/native_theme/native_theme_base.cc.mee chromium-126.0.6478.26/ui/native_theme/native_theme_base.cc
|
||||
--- chromium-126.0.6478.26/ui/native_theme/native_theme_base.cc.mee 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/native_theme/native_theme_base.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -1763,9 +1763,8 @@ bool NativeThemeBase::IsColorPipelineSup
|
||||
ControlColorId color_id) const {
|
||||
// Color providers are not yet supported on Android so we need to check that
|
||||
// the color_provider is not null here.
|
||||
- if (!color_provider || !color_provider->HasMixers()) {
|
||||
+ if (!color_provider || color_provider->IsColorMapEmpty())
|
||||
return false;
|
||||
- }
|
||||
|
||||
static constexpr auto kControlColorIdsSet =
|
||||
base::MakeFixedFlatSet<ControlColorId>({kBorder,
|
||||
diff -up chromium-126.0.6478.26/ui/native_theme/native_theme_fluent_unittest.cc.mee chromium-126.0.6478.26/ui/native_theme/native_theme_fluent_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/native_theme/native_theme_fluent_unittest.cc.mee 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/native_theme/native_theme_fluent_unittest.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -134,6 +134,7 @@ TEST_P(NativeThemeFluentTest, VerifyArro
|
||||
TEST_F(NativeThemeFluentTest, PaintThumbRoundedCorners) {
|
||||
cc::RecordPaintCanvas canvas;
|
||||
ColorProvider color_provider;
|
||||
+ color_provider.GenerateColorMap();
|
||||
constexpr gfx::Rect kRect(15, 100);
|
||||
// `is_web_test` is `false` by default.
|
||||
const NativeTheme::ScrollbarThumbExtraParams extra_params;
|
||||
diff -up chromium-126.0.6478.26/ui/wm/core/shadow_controller_unittest.cc.mee chromium-126.0.6478.26/ui/wm/core/shadow_controller_unittest.cc
|
||||
--- chromium-126.0.6478.26/ui/wm/core/shadow_controller_unittest.cc.mee 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/wm/core/shadow_controller_unittest.cc 2024-06-03 16:22:10.556568986 +0200
|
||||
@@ -285,6 +285,7 @@ TEST_F(ShadowControllerTest, SetColorsMa
|
||||
mixer[ui::kColorShadowValueAmbientShadowElevationTwelve] = {SK_ColorRED};
|
||||
mixer[ui::kColorShadowValueKeyShadowElevationTwentyFour] = {SK_ColorGREEN};
|
||||
mixer[ui::kColorShadowValueAmbientShadowElevationTwentyFour] = {SK_ColorBLUE};
|
||||
+ color_provider.GenerateColorMap();
|
||||
|
||||
shadow->SetElevationToColorsMap(
|
||||
ShadowController::GenerateShadowColorsMap(&color_provider));
|
||||
@ -0,0 +1,248 @@
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/lens/lens_untrusted_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/lens/lens_untrusted_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/lens/lens_untrusted_ui.h.constexpr 2024-05-29 18:00:58.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/lens/lens_untrusted_ui.h 2024-06-02 23:51:25.539916606 +0200
|
||||
@@ -47,7 +47,7 @@ class LensUntrustedUI : public Untrusted
|
||||
mojo::PendingReceiver<color_change_listener::mojom::PageHandler>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "LensUntrusted"; }
|
||||
+ static const std::string GetWebUIName() { return "LensUntrusted"; }
|
||||
|
||||
private:
|
||||
// lens::mojom::LensPageHandlerFactory:
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/lens/search_bubble_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/lens/search_bubble_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/lens/search_bubble_ui.h.constexpr 2024-05-29 18:00:58.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/lens/search_bubble_ui.h 2024-06-02 23:51:25.539916606 +0200
|
||||
@@ -25,7 +25,7 @@ class SearchBubbleUI : public TopChromeW
|
||||
mojo::PendingReceiver<lens::mojom::SearchBubblePageHandlerFactory>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "LensSearchBubble"; }
|
||||
+ static const std::string GetWebUIName() { return "LensSearchBubble"; }
|
||||
|
||||
private:
|
||||
// lens::mojom::SearchBubblePageHandlerFactory
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h.constexpr 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/commerce/shopping_insights_side_panel_ui.h 2024-06-02 23:51:25.539916606 +0200
|
||||
@@ -55,7 +55,7 @@ class ShoppingInsightsSidePanelUI
|
||||
mojo::PendingReceiver<
|
||||
shopping_service::mojom::ShoppingServiceHandlerFactory> receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "ShoppingInsightsSidePanel";
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/compose/compose_untrusted_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/compose/compose_untrusted_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/compose/compose_untrusted_ui.h.constexpr 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/compose/compose_untrusted_ui.h 2024-06-02 23:51:25.540916630 +0200
|
||||
@@ -58,7 +58,7 @@ class ComposeUntrustedUI
|
||||
triggering_web_contents_ = web_contents->GetWeakPtr();
|
||||
}
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "Compose"; }
|
||||
+ static const std::string GetWebUIName() { return "Compose"; }
|
||||
|
||||
private:
|
||||
void CreateComposeSessionUntrustedPageHandler(
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h.constexpr 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.h 2024-06-02 23:51:25.540916630 +0200
|
||||
@@ -75,7 +75,7 @@ class BookmarksSidePanelUI
|
||||
commerce::ShoppingListContextMenuController*
|
||||
GetShoppingListContextMenuController();
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "BookmarksSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "BookmarksSidePanel"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::BookmarksPageHandlerFactory:
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h.constexpr 2024-06-03 18:20:28.504604071 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.h 2024-06-03 18:20:44.559016497 +0200
|
||||
@@ -34,7 +34,7 @@ class CompanionSidePanelUntrustedUI
|
||||
// Gets a weak pointer to this object.
|
||||
base::WeakPtr<CompanionSidePanelUntrustedUI> GetWeakPtr();
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "CompanionSidePanelUntrusted";
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h.constexpr 2024-06-03 18:13:52.741282949 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_ui.h 2024-06-03 18:14:34.718442888 +0200
|
||||
@@ -111,7 +111,7 @@ class CustomizeChromeUI
|
||||
side_panel::customize_chrome::mojom::CustomizeToolbarHandlerFactory>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "CustomizeChrome"; }
|
||||
+ static const std::string GetWebUIName() { return "CustomizeChrome"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::CustomizeChromePageHandlerFactory
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h.constexpr 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/history_clusters/history_clusters_side_panel_ui.h 2024-06-02 23:51:25.540916630 +0200
|
||||
@@ -70,7 +70,7 @@ class HistoryClustersSidePanelUI : publi
|
||||
void DidFinishNavigation(
|
||||
content::NavigationHandle* navigation_handle) override;
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "HistoryClustersSidePanel";
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h.constexpr 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/performance_controls/performance_side_panel_ui.h 2024-06-02 23:51:25.540916630 +0200
|
||||
@@ -41,7 +41,7 @@ class PerformanceSidePanelUI
|
||||
mojo::PendingReceiver<color_change_listener::mojom::PageHandler>
|
||||
pending_receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "PerformanceSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "PerformanceSidePanel"; }
|
||||
|
||||
private:
|
||||
// side_panel::mojom::PerformancePageHandlerFactory:
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h.constexpr 2024-05-29 18:01:00.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.h 2024-06-02 23:51:25.541916654 +0200
|
||||
@@ -55,7 +55,7 @@ class ReadAnythingUntrustedUI
|
||||
mojo::PendingReceiver<read_anything::mojom::UntrustedPageHandlerFactory>
|
||||
receiver);
|
||||
|
||||
- static constexpr std::string GetWebUIName() {
|
||||
+ static const std::string GetWebUIName() {
|
||||
return "ReadAnythingUntrusted";
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h.constexpr 2024-05-29 18:01:00.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.h 2024-06-02 23:51:25.541916654 +0200
|
||||
@@ -58,7 +58,7 @@ class ReadingListUI : public TopChromeWe
|
||||
|
||||
void SetActiveTabURL(const GURL& url);
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "ReadingList"; }
|
||||
+ static const std::string GetWebUIName() { return "ReadingList"; }
|
||||
|
||||
private:
|
||||
// reading_list::mojom::PageHandlerFactory:
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h.constexpr 2024-05-29 18:01:00.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.h 2024-06-02 23:51:25.541916654 +0200
|
||||
@@ -35,7 +35,7 @@ class UserNotesSidePanelUI
|
||||
|
||||
void set_browser(Browser* browser) { browser_ = browser; }
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "UserNotesSidePanel"; }
|
||||
+ static const std::string GetWebUIName() { return "UserNotesSidePanel"; }
|
||||
|
||||
private:
|
||||
// user_notes::mojom::UserNotesPageHandlerFactory
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/webui/tab_search/tab_search_ui.h.constexpr chromium-126.0.6478.26/chrome/browser/ui/webui/tab_search/tab_search_ui.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/webui/tab_search/tab_search_ui.h.constexpr 2024-05-29 18:01:00.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/webui/tab_search/tab_search_ui.h 2024-06-02 23:51:25.542916677 +0200
|
||||
@@ -58,7 +58,7 @@ class TabSearchUI : public TopChromeWebU
|
||||
return page_handler_.get();
|
||||
}
|
||||
|
||||
- static constexpr std::string GetWebUIName() { return "TabSearch"; }
|
||||
+ static const std::string GetWebUIName() { return "TabSearch"; }
|
||||
|
||||
private:
|
||||
// tab_search::mojom::PageHandlerFactory
|
||||
diff -up chromium-126.0.6478.26/components/autofill/core/browser/data_model/autofill_i18n_api.h.constexpr chromium-126.0.6478.26/components/autofill/core/browser/data_model/autofill_i18n_api.h
|
||||
--- chromium-126.0.6478.26/components/autofill/core/browser/data_model/autofill_i18n_api.h.constexpr 2024-05-29 18:01:05.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/autofill/core/browser/data_model/autofill_i18n_api.h 2024-06-02 23:51:25.542916677 +0200
|
||||
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definitio
|
||||
// Country code that represents autofill's legacy address hierarchy model as
|
||||
// stored `kAutofillModelRules`. As a workaround for GCC we declare the
|
||||
// std::string constexpr first.
|
||||
-constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||||
-constexpr AddressCountryCode kLegacyHierarchyCountryCode =
|
||||
+const inline std::string kLegacyHierarchyCountryCodeString{"XX"};
|
||||
+const AddressCountryCode kLegacyHierarchyCountryCode =
|
||||
AddressCountryCode(kLegacyHierarchyCountryCodeString);
|
||||
|
||||
// Creates an instance of the address hierarchy model corresponding to the
|
||||
diff -up chromium-126.0.6478.26/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py.constexpr chromium-126.0.6478.26/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py
|
||||
--- chromium-126.0.6478.26/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py.constexpr 2024-05-29 18:01:05.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/autofill/core/browser/form_parsing/transpile_regex_patterns.py 2024-06-02 23:51:36.322172739 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/opt/rh/rh-python38/root/usr/bin/python
|
||||
|
||||
# Copyright 2020 The Chromium Authors
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
@@ -54,7 +54,7 @@ def generate_matching_pattern_equals(nam
|
||||
yield '// Checks if all the matching patterns for the given PatternSources'
|
||||
yield '// and language are the same - meaning that computing predictions for'
|
||||
yield '// both is unnecessary, since it will yield the same result.'
|
||||
- yield 'constexpr bool AreMatchingPatternsEqualImpl(PatternSource a,'
|
||||
+ yield 'const bool AreMatchingPatternsEqualImpl(PatternSource a,'
|
||||
yield ' PatternSource b,'
|
||||
yield ' LanguageCode lang_code) {'
|
||||
yield ' if (a == b) {'
|
||||
diff -up chromium-126.0.6478.26/components/autofill/core/browser/metrics/log_event.h.constexpr chromium-126.0.6478.26/components/autofill/core/browser/metrics/log_event.h
|
||||
--- chromium-126.0.6478.26/components/autofill/core/browser/metrics/log_event.h.constexpr 2024-05-29 18:01:05.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/autofill/core/browser/metrics/log_event.h 2024-06-02 23:51:25.542916677 +0200
|
||||
@@ -57,7 +57,7 @@ struct IsRequired {
|
||||
// This function is not defined and consteval. Therefore, any evaluation will
|
||||
// fail and fail at compile time.
|
||||
template <typename T>
|
||||
- consteval operator T(); // NOLINT
|
||||
+ operator T(); // NOLINT
|
||||
};
|
||||
|
||||
} // namespace internal
|
||||
diff -up chromium-126.0.6478.26/components/history/core/browser/history_types.h.constexpr chromium-126.0.6478.26/components/history/core/browser/history_types.h
|
||||
--- chromium-126.0.6478.26/components/history/core/browser/history_types.h.constexpr 2024-05-29 18:01:06.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/history/core/browser/history_types.h 2024-06-02 23:51:25.542916677 +0200
|
||||
@@ -70,7 +70,7 @@ constexpr VisitedLinkID kInvalidVisitedL
|
||||
typedef std::map<VisitID, VisitSource> VisitSourceMap;
|
||||
|
||||
// Constant used to represent that no app_id is used for matching.
|
||||
-inline constexpr std::optional<std::string> kNoAppIdFilter = std::nullopt;
|
||||
+inline const std::optional<std::string> kNoAppIdFilter = std::nullopt;
|
||||
|
||||
// VisitRow -------------------------------------------------------------------
|
||||
|
||||
diff -up chromium-126.0.6478.26/components/omnibox/browser/on_device_tail_model_service.cc.constexpr chromium-126.0.6478.26/components/omnibox/browser/on_device_tail_model_service.cc
|
||||
--- chromium-126.0.6478.26/components/omnibox/browser/on_device_tail_model_service.cc.constexpr 2024-05-29 18:01:07.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/omnibox/browser/on_device_tail_model_service.cc 2024-06-02 23:51:25.543916702 +0200
|
||||
@@ -30,7 +30,7 @@ namespace {
|
||||
// The maximum idle time before the model executor is unloaded from memory.
|
||||
constexpr base::TimeDelta kMaxExecutorIdleSeconds = base::Seconds(60);
|
||||
// Constants for TFlite model validation.
|
||||
-constexpr std::string kTestPrefix = "face";
|
||||
+const std::string kTestPrefix = "face";
|
||||
constexpr std::string_view kModelValidationSwitchName =
|
||||
"omnibox-on-device-tail-model-validation";
|
||||
|
||||
diff -up chromium-126.0.6478.26/services/network/shared_dictionary/simple_url_pattern_matcher.cc.constexpr chromium-126.0.6478.26/services/network/shared_dictionary/simple_url_pattern_matcher.cc
|
||||
--- chromium-126.0.6478.26/services/network/shared_dictionary/simple_url_pattern_matcher.cc.constexpr 2024-05-29 18:01:36.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/services/network/shared_dictionary/simple_url_pattern_matcher.cc 2024-06-02 23:51:25.543916702 +0200
|
||||
@@ -28,17 +28,17 @@ namespace network {
|
||||
namespace {
|
||||
|
||||
// https://urlpattern.spec.whatwg.org/#default-options
|
||||
-constexpr liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||||
+const liburlpattern::Options kDefaultOptions = {.delimiter_list = "",
|
||||
.prefix_list = "",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
// https://urlpattern.spec.whatwg.org/#hostname-options
|
||||
-constexpr liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||||
+const liburlpattern::Options kHostnameOptions = {.delimiter_list = ".",
|
||||
.prefix_list = "",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
// https://urlpattern.spec.whatwg.org/#pathname-options
|
||||
-constexpr liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||||
+const liburlpattern::Options kPathnameOptions = {.delimiter_list = "/",
|
||||
.prefix_list = "/",
|
||||
.sensitive = true,
|
||||
.strict = true};
|
||||
@ -0,0 +1,47 @@
|
||||
diff -up chromium-126.0.6478.26/third_party/wayland/src/cursor/os-compatibility.c.el7-memfd-fcntl-include chromium-126.0.6478.26/third_party/wayland/src/cursor/os-compatibility.c
|
||||
--- chromium-126.0.6478.26/third_party/wayland/src/cursor/os-compatibility.c.el7-memfd-fcntl-include 2024-05-29 18:03:08.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/wayland/src/cursor/os-compatibility.c 2024-06-02 15:13:21.636638066 +0200
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h> // for F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
diff -up chromium-126.0.6478.26/third_party/wayland/src/src/wayland-shm.c.el7-memfd-fcntl-include chromium-126.0.6478.26/third_party/wayland/src/src/wayland-shm.c
|
||||
--- chromium-126.0.6478.26/third_party/wayland/src/src/wayland-shm.c.el7-memfd-fcntl-include 2024-05-29 18:03:08.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/wayland/src/src/wayland-shm.c 2024-06-02 15:13:21.635638045 +0200
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <signal.h>
|
||||
#include <pthread.h>
|
||||
#include <errno.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h>
|
||||
|
||||
#include "wayland-os.h"
|
||||
#include "wayland-util.h"
|
||||
diff -up chromium-126.0.6478.26/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.el7-memfd-fcntl-include chromium-126.0.6478.26/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
|
||||
--- chromium-126.0.6478.26/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.el7-memfd-fcntl-include 2024-06-02 15:13:21.636638066 +0200
|
||||
+++ chromium-126.0.6478.26/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc 2024-06-02 15:16:18.202679909 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.h"
|
||||
|
||||
#include <sys/mman.h>
|
||||
+#include <linux/memfd.h>
|
||||
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
diff -up chromium-126.0.6478.26/v8/src/base/platform/platform-posix.cc.el7-memfd-fcntl-include chromium-126.0.6478.26/v8/src/base/platform/platform-posix.cc
|
||||
--- chromium-126.0.6478.26/v8/src/base/platform/platform-posix.cc.el7-memfd-fcntl-include 2024-05-29 18:03:35.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/v8/src/base/platform/platform-posix.cc 2024-06-02 15:13:21.635638045 +0200
|
||||
@@ -60,6 +60,7 @@
|
||||
|
||||
#if V8_OS_LINUX
|
||||
#include <sys/prctl.h> // for prctl
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#endif
|
||||
|
||||
#if defined(V8_OS_FUCHSIA)
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-126.0.6478.26/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h.me chromium-126.0.6478.26/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h
|
||||
--- chromium-126.0.6478.26/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h.me 2024-06-03 15:01:54.724207324 +0200
|
||||
+++ chromium-126.0.6478.26/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h 2024-06-03 14:58:16.244189794 +0200
|
||||
@@ -144,7 +144,7 @@ class QUICHE_NO_EXPORT QuicIntervalDeque
|
||||
// for efficient std::lower_bound() calls.
|
||||
class QUICHE_NO_EXPORT Iterator {
|
||||
public:
|
||||
- using iterator_category = std::random_access_iterator_tag;
|
||||
+ using iterator_category = std::forward_iterator_tag;
|
||||
using value_type = T;
|
||||
using difference_type = std::ptrdiff_t;
|
||||
using pointer = T*;
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,96 @@
|
||||
diff -up chromium-126.0.6478.26/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc.std_variant chromium-126.0.6478.26/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc
|
||||
--- chromium-126.0.6478.26/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc.std_variant 2024-06-04 12:31:10.602282813 +0200
|
||||
+++ chromium-126.0.6478.26/components/visited_url_ranking/internal/visited_url_ranking_service_impl.cc 2024-06-04 13:21:50.121345183 +0200
|
||||
@@ -7,7 +7,6 @@
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
-#include <variant>
|
||||
#include <vector>
|
||||
|
||||
#include "base/barrier_callback.h"
|
||||
@@ -41,20 +40,16 @@ std::vector<URLVisitAggregate> ComputeUR
|
||||
for (std::pair<const URLMergeKey, URLVisitAggregate::URLVisitVariant>&
|
||||
url_data : result.data) {
|
||||
URLVisitAggregate& aggregate = url_visit_map[url_data.first];
|
||||
- std::visit(
|
||||
- URLVisitVariantHelper{
|
||||
- [&aggregate](URLVisitAggregate::TabData& tab_data) {
|
||||
- aggregate.fetcher_data_map.emplace(
|
||||
- tab_data.last_active_tab.session_name.has_value()
|
||||
- ? Fetcher::kSession
|
||||
- : Fetcher::kTabModel,
|
||||
- std::move(tab_data));
|
||||
- },
|
||||
- [&aggregate](URLVisitAggregate::HistoryData& history_data) {
|
||||
- aggregate.fetcher_data_map.emplace(Fetcher::kHistory,
|
||||
- std::move(history_data));
|
||||
- }},
|
||||
- url_data.second);
|
||||
+ if (std::holds_alternative<URLVisitAggregate::TabData>(url_data.second)) {
|
||||
+ auto& tab_data = std::get<URLVisitAggregate::TabData>(url_data.second);
|
||||
+ aggregate.fetcher_data_map.emplace(
|
||||
+ tab_data.last_active_tab.session_name.has_value()
|
||||
+ ? Fetcher::kSession
|
||||
+ : Fetcher::kTabModel,
|
||||
+ std::move(tab_data));
|
||||
+ }
|
||||
+ // TODO(crbug.com/330580109): Add support for history fetcher and
|
||||
+ // associated aggregate data type.
|
||||
}
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.cc.std_variant chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.cc
|
||||
--- chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.cc.std_variant 2024-06-04 12:29:20.593240495 +0200
|
||||
+++ chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.cc 2024-06-04 12:29:57.253921979 +0200
|
||||
@@ -37,14 +37,12 @@ URLVisitAggregate& URLVisitAggregate::op
|
||||
std::set<const GURL*> URLVisitAggregate::GetAssociatedURLs() const {
|
||||
std::set<const GURL*> urls = {};
|
||||
for (const auto& fetcher_entry : fetcher_data_map) {
|
||||
- std::visit(URLVisitVariantHelper{
|
||||
- [&urls](const URLVisitAggregate::TabData& tab_data) {
|
||||
- urls.insert(&tab_data.last_active_tab.visit.url);
|
||||
- },
|
||||
- [&urls](const URLVisitAggregate::HistoryData& history_data) {
|
||||
- urls.insert(&history_data.last_visited.url_row.url());
|
||||
- }},
|
||||
- fetcher_entry.second);
|
||||
+ if (std::holds_alternative<URLVisitAggregate::TabData>(
|
||||
+ fetcher_entry.second)) {
|
||||
+ const auto& tab_data =
|
||||
+ std::get<URLVisitAggregate::TabData>(fetcher_entry.second);
|
||||
+ urls.insert(&tab_data.last_active_tab.visit.url);
|
||||
+ }
|
||||
}
|
||||
return urls;
|
||||
}
|
||||
diff -up chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.h.std_variant chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.h
|
||||
--- chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.h.std_variant 2024-06-04 11:05:39.505847241 +0200
|
||||
+++ chromium-126.0.6478.26/components/visited_url_ranking/public/url_visit.h 2024-06-04 13:22:26.518007748 +0200
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <set>
|
||||
+#include <variant>
|
||||
#include <vector>
|
||||
|
||||
#include "base/functional/callback.h"
|
||||
@@ -140,18 +141,6 @@ struct URLVisitAggregate {
|
||||
bool bookmarked = false;
|
||||
};
|
||||
|
||||
-// Helper to visit each variant of URLVisitVariant.
|
||||
-// Usage:
|
||||
-// std::visit(URLVisitVariantHelper{
|
||||
-// [](Variant1& variant1) {},
|
||||
-// [](Variant2& variant1) {},
|
||||
-// [](Variant3& variant1) {},
|
||||
-// variant_data);
|
||||
-template <class... Ts>
|
||||
-struct URLVisitVariantHelper : Ts... {
|
||||
- using Ts::operator()...;
|
||||
-};
|
||||
-
|
||||
} // namespace visited_url_ranking
|
||||
|
||||
#endif // COMPONENTS_VISITED_URL_RANKING_PUBLIC_URL_VISIT_H_
|
||||
@ -0,0 +1,21 @@
|
||||
diff -up chromium-126.0.6478.26/chrome/renderer/accessibility/read_anything_app_model.cc.stdformat chromium-126.0.6478.26/chrome/renderer/accessibility/read_anything_app_model.cc
|
||||
--- chromium-126.0.6478.26/chrome/renderer/accessibility/read_anything_app_model.cc.stdformat 2024-06-03 22:52:18.596936767 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/renderer/accessibility/read_anything_app_model.cc 2024-06-03 23:26:46.024734453 +0200
|
||||
@@ -1059,7 +1059,7 @@ std::string ReadAnythingAppModel::GetHtm
|
||||
int32_t hierarchical_level =
|
||||
ax_node->GetIntAttribute(ax::mojom::IntAttribute::kHierarchicalLevel);
|
||||
if (hierarchical_level) {
|
||||
- return std::format("h{}", hierarchical_level);
|
||||
+ return std::string("h" + std::to_string(hierarchical_level));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1159,7 +1159,7 @@ std::string ReadAnythingAppModel::GetHea
|
||||
int32_t hierarchical_level =
|
||||
ax_node->GetIntAttribute(ax::mojom::IntAttribute::kHierarchicalLevel);
|
||||
if (hierarchical_level) {
|
||||
- return std::format("h{}", hierarchical_level);
|
||||
+ return std::string("h" + std::to_string(hierarchical_level));
|
||||
}
|
||||
return html_tag;
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me chromium-126.0.6478.26/build/config/compiler/BUILD.gn
|
||||
--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me 2024-06-02 14:02:52.516602574 +0200
|
||||
+++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 14:17:24.527503540 +0200
|
||||
@@ -575,24 +575,6 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
||||
- # other problems.
|
||||
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
||||
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
||||
- !llvm_android_mainline) {
|
||||
- cflags += [
|
||||
- "-mllvm",
|
||||
- "-split-threshold-for-reg-with-hint=0",
|
||||
- ]
|
||||
- if (use_thin_lto && is_a_target_toolchain) {
|
||||
- if (is_win) {
|
||||
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
||||
- } else {
|
||||
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
|
||||
if (is_win) {
|
||||
cflags += [ "/clang:-ffp-contract=off" ]
|
||||
@ -0,0 +1,667 @@
|
||||
diff -up chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h
|
||||
--- chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h.system-libstdc++ 2024-05-29 18:00:45.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/base/allocator/partition_allocator/src/partition_alloc/starscan/stats_collector.h 2024-06-02 23:51:25.562917154 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
-#include "partition_alloc/internal_allocator_forward.h"
|
||||
+#include "partition_alloc/internal_allocator.h"
|
||||
#include "partition_alloc/partition_alloc_base/threading/platform_thread.h"
|
||||
#include "partition_alloc/partition_alloc_base/time/time.h"
|
||||
#include "partition_alloc/partition_alloc_check.h"
|
||||
diff -up chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h
|
||||
--- chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h.system-libstdc++ 2024-05-29 18:00:59.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/chrome/browser/ui/tabs/tab_strip_model.h 2024-06-02 23:51:25.563917178 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
+#include <variant>
|
||||
#include <vector>
|
||||
|
||||
#include "base/containers/span.h"
|
||||
diff -up chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc.system-libstdc++ chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc
|
||||
--- chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc.system-libstdc++ 2024-05-29 18:01:12.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/components/viz/service/display/surface_aggregator.cc 2024-06-02 23:51:25.563917178 +0200
|
||||
@@ -2296,7 +2296,7 @@ AggregatedFrame SurfaceAggregator::Aggre
|
||||
root_surface_id_ = surface_id;
|
||||
|
||||
// Start recording new stats for this aggregation.
|
||||
- stats_.emplace();
|
||||
+ stats_ = AggregateStatistics{};
|
||||
|
||||
base::ElapsedTimer prewalk_timer;
|
||||
ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
|
||||
diff -up chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc
|
||||
--- chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc.system-libstdc++ 2024-05-29 18:01:12.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/content/browser/first_party_sets/first_party_sets_handler_database_helper.cc 2024-06-02 23:51:25.563917178 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <optional>
|
||||
#include "content/browser/first_party_sets/first_party_sets_handler_database_helper.h"
|
||||
|
||||
#include "base/containers/contains.h"
|
||||
diff -up chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h.system-libstdc++ chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h
|
||||
--- chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h.system-libstdc++ 2024-06-04 13:52:43.689553459 +0200
|
||||
+++ chromium-126.0.6478.26/content/services/auction_worklet/real_time_reporting_bindings.h 2024-06-04 13:52:01.117778943 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "content/common/content_export.h"
|
||||
#include "content/services/auction_worklet/auction_v8_helper.h"
|
||||
#include "content/services/auction_worklet/context_recycler.h"
|
||||
-#include "content/services/auction_worklet/public/mojom/real_time_reporting.mojom-forward.h"
|
||||
+#include "content/services/auction_worklet/public/mojom/real_time_reporting.mojom.h"
|
||||
#include "v8/include/v8-forward.h"
|
||||
|
||||
namespace auction_worklet {
|
||||
diff -up chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h
|
||||
--- chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h.system-libstdc++ 2024-05-29 18:01:26.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/gpu/command_buffer/service/shared_image/shared_image_backing.h 2024-06-02 23:51:25.564917202 +0200
|
||||
@@ -111,6 +111,25 @@ using VideoDecodeDevice = Microsoft::WRL
|
||||
using VideoDecodeDevice = void*;
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
+class ScopedWriteUMA {
|
||||
+ public:
|
||||
+ ScopedWriteUMA() = default;
|
||||
+
|
||||
+ ScopedWriteUMA(const ScopedWriteUMA&) = delete;
|
||||
+ ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
|
||||
+
|
||||
+ ~ScopedWriteUMA() {
|
||||
+ UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
|
||||
+ content_consumed_);
|
||||
+ }
|
||||
+
|
||||
+ bool content_consumed() const { return content_consumed_; }
|
||||
+ void SetConsumed() { content_consumed_ = true; }
|
||||
+
|
||||
+ private:
|
||||
+ bool content_consumed_ = false;
|
||||
+};
|
||||
+
|
||||
// Represents the actual storage (GL texture, VkImage, GMB) for a SharedImage.
|
||||
// Should not be accessed directly, instead is accessed through a
|
||||
// SharedImageRepresentation.
|
||||
@@ -384,25 +403,6 @@ class GPU_GLES2_EXPORT SharedImageBackin
|
||||
mutable std::optional<base::Lock> lock_;
|
||||
|
||||
private:
|
||||
- class ScopedWriteUMA {
|
||||
- public:
|
||||
- ScopedWriteUMA() = default;
|
||||
-
|
||||
- ScopedWriteUMA(const ScopedWriteUMA&) = delete;
|
||||
- ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
|
||||
-
|
||||
- ~ScopedWriteUMA() {
|
||||
- UMA_HISTOGRAM_BOOLEAN("GPU.SharedImage.ContentConsumed",
|
||||
- content_consumed_);
|
||||
- }
|
||||
-
|
||||
- bool content_consumed() const { return content_consumed_; }
|
||||
- void SetConsumed() { content_consumed_ = true; }
|
||||
-
|
||||
- private:
|
||||
- bool content_consumed_ = false;
|
||||
- };
|
||||
-
|
||||
const Mailbox mailbox_;
|
||||
const viz::SharedImageFormat format_;
|
||||
const gfx::Size size_;
|
||||
diff -up chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
||||
--- chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc.system-libstdc++ 2024-05-29 18:01:33.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/mojo/public/cpp/bindings/lib/multiplex_router.cc 2024-06-02 23:51:25.564917202 +0200
|
||||
@@ -893,7 +893,7 @@ bool MultiplexRouter::ExclusiveSyncWaitF
|
||||
DCHECK(!exclusive_sync_wait_);
|
||||
|
||||
scoped_refptr<MultiplexRouter> keep_alive(this);
|
||||
- exclusive_sync_wait_.emplace();
|
||||
+ exclusive_sync_wait_ = ExclusiveSyncWaitInfo{};
|
||||
exclusive_sync_wait_->interface_id = interface_id;
|
||||
exclusive_sync_wait_->request_id = request_id;
|
||||
while (!exclusive_sync_wait_->finished) {
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc
|
||||
--- chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc.system-libstdc++ 2024-05-29 18:01:37.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/common/interest_group/auction_config_mojom_traits.cc 2024-06-02 23:51:25.565917225 +0200
|
||||
@@ -225,8 +225,6 @@ bool StructTraits<blink::mojom::AuctionA
|
||||
!data.ReadAllBuyersPrioritySignals(&out->all_buyers_priority_signals) ||
|
||||
!data.ReadAuctionReportBuyerKeys(&out->auction_report_buyer_keys) ||
|
||||
!data.ReadAuctionReportBuyers(&out->auction_report_buyers) ||
|
||||
- !data.ReadAuctionReportBuyerDebugModeConfig(
|
||||
- &out->auction_report_buyer_debug_mode_config) ||
|
||||
!data.ReadRequiredSellerCapabilities(
|
||||
&out->required_seller_capabilities) ||
|
||||
!data.ReadRequestedSize(&out->requested_size) ||
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc.system-libstdc++ 2024-05-29 18:01:39.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/loader/history_item.cc 2024-06-02 23:51:25.565917225 +0200
|
||||
@@ -182,26 +182,26 @@ void HistoryItem::SetReferrerPolicy(netw
|
||||
|
||||
void HistoryItem::SetVisualViewportScrollOffset(const ScrollOffset& offset) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->visual_viewport_scroll_offset_ = offset;
|
||||
}
|
||||
|
||||
void HistoryItem::SetScrollOffset(const ScrollOffset& offset) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->scroll_offset_ = offset;
|
||||
}
|
||||
|
||||
void HistoryItem::SetPageScaleFactor(float scale_factor) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->page_scale_factor_ = scale_factor;
|
||||
}
|
||||
|
||||
void HistoryItem::SetScrollAnchorData(
|
||||
const ScrollAnchorData& scroll_anchor_data) {
|
||||
if (!view_state_)
|
||||
- view_state_ = std::make_optional<ViewState>();
|
||||
+ view_state_ = blink::HistoryItem::ViewState{};
|
||||
view_state_->scroll_anchor_data_ = scroll_anchor_data;
|
||||
}
|
||||
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h.system-libstdc++ 2024-06-04 17:01:05.066469613 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/page/page_popup_controller.h 2024-06-04 16:51:41.076869743 +0200
|
||||
@@ -31,6 +31,7 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_PAGE_POPUP_CONTROLLER_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_PAGE_POPUP_CONTROLLER_H_
|
||||
|
||||
+#include <optional>
|
||||
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
|
||||
#include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
|
||||
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h.system-libstdc++ 2024-05-29 18:01:40.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/core/paint/fragment_data_iterator.h 2024-06-02 23:51:25.565917225 +0200
|
||||
@@ -22,7 +22,7 @@ class FragmentDataIteratorBase {
|
||||
|
||||
public:
|
||||
explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {}
|
||||
- explicit FragmentDataIteratorBase(nullptr_t) {}
|
||||
+ explicit FragmentDataIteratorBase(std::nullptr_t) {}
|
||||
|
||||
Data* GetFragmentData() const {
|
||||
return !IsDone() ? &fragment_head_.at(idx_) : nullptr;
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h.system-libstdc++ 2024-06-03 23:14:03.138724802 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/modules/encoding/text_decoder.h 2024-06-03 23:14:41.395654435 +0200
|
||||
@@ -31,6 +31,7 @@
|
||||
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_ENCODING_TEXT_DECODER_H_
|
||||
#define THIRD_PARTY_BLINK_RENDERER_MODULES_ENCODING_TEXT_DECODER_H_
|
||||
|
||||
+#include <optional>
|
||||
#include <memory>
|
||||
|
||||
#include "third_party/blink/renderer/bindings/core/v8/v8_typedefs.h"
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc.system-libstdc++ 2024-05-29 18:01:40.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc 2024-06-02 23:51:25.566917250 +0200
|
||||
@@ -102,7 +102,7 @@ void MediaControlTimelineElement::Update
|
||||
void MediaControlTimelineElement::SetPosition(double current_time,
|
||||
bool suppress_aria) {
|
||||
if (is_live_ && !live_anchor_time_ && current_time != 0) {
|
||||
- live_anchor_time_.emplace();
|
||||
+ live_anchor_time_ = LiveAnchorTime{};
|
||||
live_anchor_time_->clock_time_ = base::TimeTicks::Now();
|
||||
live_anchor_time_->media_time_ = MediaElement().currentTime();
|
||||
}
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h.system-libstdc++ 2024-06-04 16:52:15.268516255 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/platform/fonts/shaping/run_segmenter.h 2024-06-04 16:56:23.906705337 +0200
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <unicode/uscript.h>
|
||||
#include <memory>
|
||||
+#include <optional>
|
||||
#include "third_party/blink/renderer/platform/fonts/font_orientation.h"
|
||||
#include "third_party/blink/renderer/platform/fonts/orientation_iterator.h"
|
||||
#include "third_party/blink/renderer/platform/fonts/script_run_iterator.h"
|
||||
diff -up chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
|
||||
--- chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc.system-libstdc++ 2024-05-29 18:01:41.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc 2024-06-02 23:51:25.566917250 +0200
|
||||
@@ -70,7 +70,7 @@ void GeometryMapperTransformCache::Updat
|
||||
to_2d_translation_root_ += translation;
|
||||
|
||||
if (parent.plane_root_transform_) {
|
||||
- plane_root_transform_.emplace();
|
||||
+ plane_root_transform_ = PlaneRootTransform{};
|
||||
plane_root_transform_->plane_root = parent.plane_root();
|
||||
plane_root_transform_->to_plane_root = parent.to_plane_root();
|
||||
plane_root_transform_->to_plane_root.Translate(translation.x(),
|
||||
@@ -98,7 +98,7 @@ void GeometryMapperTransformCache::Updat
|
||||
// as the 2d translation root.
|
||||
plane_root_transform_ = std::nullopt;
|
||||
} else {
|
||||
- plane_root_transform_.emplace();
|
||||
+ plane_root_transform_ = PlaneRootTransform{};
|
||||
plane_root_transform_->plane_root = parent.plane_root();
|
||||
plane_root_transform_->to_plane_root.MakeIdentity();
|
||||
parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
|
||||
@@ -140,7 +140,7 @@ void GeometryMapperTransformCache::Updat
|
||||
parent_node->UpdateScreenTransform();
|
||||
const auto& parent = parent_node->GetTransformCache();
|
||||
|
||||
- screen_transform_.emplace();
|
||||
+ screen_transform_ = ScreenTransform{};
|
||||
parent.ApplyToScreen(screen_transform_->to_screen);
|
||||
if (node.FlattensInheritedTransform())
|
||||
screen_transform_->to_screen.Flatten();
|
||||
diff -up chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h
|
||||
--- chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h.system-libstdc++ 2024-05-29 18:03:01.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/ruy/src/ruy/profiler/instrumentation.h 2024-06-02 23:51:25.566917250 +0200
|
||||
@@ -19,6 +19,7 @@ limitations under the License.
|
||||
#ifdef RUY_PROFILER
|
||||
#include <cstdio>
|
||||
#include <mutex>
|
||||
+#include <string>
|
||||
#include <vector>
|
||||
#endif
|
||||
|
||||
diff -up chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
|
||||
--- chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc.system-libstdc++ 2024-05-29 18:03:48.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc 2024-06-02 23:51:25.567917273 +0200
|
||||
@@ -549,7 +549,7 @@ absl::optional<LossBasedBweV2::Config> L
|
||||
if (!enabled.Get()) {
|
||||
return config;
|
||||
}
|
||||
- config.emplace();
|
||||
+ config = Config{};
|
||||
config->bandwidth_rampup_upper_bound_factor =
|
||||
bandwidth_rampup_upper_bound_factor.Get();
|
||||
config->bandwidth_rampup_upper_bound_factor_in_hold =
|
||||
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc
|
||||
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/randr.cc 2024-06-02 23:51:25.568917297 +0200
|
||||
@@ -305,7 +305,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
// data
|
||||
auto data_expr = subCode;
|
||||
if (CaseEq(data_expr, RandR::Notify::CrtcChange)) {
|
||||
- data.cc.emplace();
|
||||
+ data.cc = RandR::NotifyEvent::Cc{};
|
||||
auto& timestamp = (*data.cc).timestamp;
|
||||
auto& window = (*data.cc).window;
|
||||
auto& crtc = (*data.cc).crtc;
|
||||
@@ -349,7 +349,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Read(&height, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::OutputChange)) {
|
||||
- data.oc.emplace();
|
||||
+ data.oc = RandR::NotifyEvent::Oc{};
|
||||
auto& timestamp = (*data.oc).timestamp;
|
||||
auto& config_timestamp = (*data.oc).config_timestamp;
|
||||
auto& window = (*data.oc).window;
|
||||
@@ -394,7 +394,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
subpixel_order = static_cast<Render::SubPixel>(tmp6);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::OutputProperty)) {
|
||||
- data.op.emplace();
|
||||
+ data.op = RandR::NotifyEvent::Op{};
|
||||
auto& window = (*data.op).window;
|
||||
auto& output = (*data.op).output;
|
||||
auto& atom = (*data.op).atom;
|
||||
@@ -422,7 +422,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 11);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ProviderChange)) {
|
||||
- data.pc.emplace();
|
||||
+ data.pc = RandR::NotifyEvent::Pc{};
|
||||
auto& timestamp = (*data.pc).timestamp;
|
||||
auto& window = (*data.pc).window;
|
||||
auto& provider = (*data.pc).provider;
|
||||
@@ -440,7 +440,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 16);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ProviderProperty)) {
|
||||
- data.pp.emplace();
|
||||
+ data.pp = RandR::NotifyEvent::Pp{};
|
||||
auto& window = (*data.pp).window;
|
||||
auto& provider = (*data.pp).provider;
|
||||
auto& atom = (*data.pp).atom;
|
||||
@@ -466,7 +466,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 11);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::ResourceChange)) {
|
||||
- data.rc.emplace();
|
||||
+ data.rc = RandR::NotifyEvent::Rc{};
|
||||
auto& timestamp = (*data.rc).timestamp;
|
||||
auto& window = (*data.rc).window;
|
||||
|
||||
@@ -480,7 +480,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR
|
||||
Pad(&buf, 20);
|
||||
}
|
||||
if (CaseEq(data_expr, RandR::Notify::Lease)) {
|
||||
- data.lc.emplace();
|
||||
+ data.lc = RandR::NotifyEvent::Lc{};
|
||||
auto& timestamp = (*data.lc).timestamp;
|
||||
auto& window = (*data.lc).window;
|
||||
auto& lease = (*data.lc).lease;
|
||||
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc
|
||||
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xinput.cc 2024-06-02 23:51:25.569917321 +0200
|
||||
@@ -560,7 +560,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
// data
|
||||
auto data_expr = type;
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = Input::DeviceClass::Key{};
|
||||
uint16_t num_keys{};
|
||||
auto& keys = (*data.key).keys;
|
||||
|
||||
@@ -575,7 +575,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = Input::DeviceClass::Button{};
|
||||
uint16_t num_buttons{};
|
||||
auto& state = (*data.button).state;
|
||||
auto& labels = (*data.button).labels;
|
||||
@@ -598,7 +598,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = Input::DeviceClass::Valuator{};
|
||||
auto& number = (*data.valuator).number;
|
||||
auto& label = (*data.valuator).label;
|
||||
auto& min = (*data.valuator).min;
|
||||
@@ -661,7 +661,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
|
||||
- data.scroll.emplace();
|
||||
+ data.scroll = Input::DeviceClass::Scroll{};
|
||||
auto& number = (*data.scroll).number;
|
||||
auto& scroll_type = (*data.scroll).scroll_type;
|
||||
auto& flags = (*data.scroll).flags;
|
||||
@@ -696,7 +696,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
|
||||
- data.touch.emplace();
|
||||
+ data.touch = Input::DeviceClass::Touch{};
|
||||
auto& mode = (*data.touch).mode;
|
||||
auto& num_touches = (*data.touch).num_touches;
|
||||
|
||||
@@ -709,7 +709,7 @@ void ReadEvent<Input::DeviceChangedEvent
|
||||
Read(&num_touches, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
|
||||
- data.gesture.emplace();
|
||||
+ data.gesture = Input::DeviceClass::Gesture{};
|
||||
auto& num_touches = (*data.gesture).num_touches;
|
||||
|
||||
// num_touches
|
||||
@@ -2187,7 +2187,7 @@ std::unique_ptr<Input::ListInputDevicesR
|
||||
// info
|
||||
auto info_expr = class_id;
|
||||
if (CaseEq(info_expr, Input::InputClass::Key)) {
|
||||
- info.key.emplace();
|
||||
+ info.key = Input::InputInfo::Key{};
|
||||
auto& min_keycode = (*info.key).min_keycode;
|
||||
auto& max_keycode = (*info.key).max_keycode;
|
||||
auto& num_keys = (*info.key).num_keys;
|
||||
@@ -2205,14 +2205,14 @@ std::unique_ptr<Input::ListInputDevicesR
|
||||
Pad(&buf, 2);
|
||||
}
|
||||
if (CaseEq(info_expr, Input::InputClass::Button)) {
|
||||
- info.button.emplace();
|
||||
+ info.button = Input::InputInfo::Button{};
|
||||
auto& num_buttons = (*info.button).num_buttons;
|
||||
|
||||
// num_buttons
|
||||
Read(&num_buttons, &buf);
|
||||
}
|
||||
if (CaseEq(info_expr, Input::InputClass::Valuator)) {
|
||||
- info.valuator.emplace();
|
||||
+ info.valuator = Input::InputInfo::Valuator{};
|
||||
uint8_t axes_len{};
|
||||
auto& mode = (*info.valuator).mode;
|
||||
auto& motion_size = (*info.valuator).motion_size;
|
||||
@@ -3818,7 +3818,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
// data
|
||||
auto data_expr = class_id;
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Keyboard)) {
|
||||
- data.keyboard.emplace();
|
||||
+ data.keyboard = x11::Input::FeedbackState::Keyboard{};
|
||||
auto& pitch = (*data.keyboard).pitch;
|
||||
auto& duration = (*data.keyboard).duration;
|
||||
auto& led_mask = (*data.keyboard).led_mask;
|
||||
@@ -3859,7 +3859,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Pointer)) {
|
||||
- data.pointer.emplace();
|
||||
+ data.pointer = x11::Input::FeedbackState::Pointer{};
|
||||
auto& accel_num = (*data.pointer).accel_num;
|
||||
auto& accel_denom = (*data.pointer).accel_denom;
|
||||
auto& threshold = (*data.pointer).threshold;
|
||||
@@ -3877,7 +3877,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&threshold, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::String)) {
|
||||
- data.string.emplace();
|
||||
+ data.string = x11::Input::FeedbackState::String{};
|
||||
auto& max_symbols = (*data.string).max_symbols;
|
||||
uint16_t num_keysyms{};
|
||||
auto& keysyms = (*data.string).keysyms;
|
||||
@@ -3896,7 +3896,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Integer)) {
|
||||
- data.integer.emplace();
|
||||
+ data.integer = x11::Input::FeedbackState::Integer{};
|
||||
auto& resolution = (*data.integer).resolution;
|
||||
auto& min_value = (*data.integer).min_value;
|
||||
auto& max_value = (*data.integer).max_value;
|
||||
@@ -3911,7 +3911,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&max_value, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Led)) {
|
||||
- data.led.emplace();
|
||||
+ data.led = x11::Input::FeedbackState::Led{};
|
||||
auto& led_mask = (*data.led).led_mask;
|
||||
auto& led_values = (*data.led).led_values;
|
||||
|
||||
@@ -3922,7 +3922,7 @@ std::unique_ptr<Input::GetFeedbackContro
|
||||
Read(&led_values, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::FeedbackClass::Bell)) {
|
||||
- data.bell.emplace();
|
||||
+ data.bell = x11::Input::FeedbackState::Bell{};
|
||||
auto& percent = (*data.bell).percent;
|
||||
auto& pitch = (*data.bell).pitch;
|
||||
auto& duration = (*data.bell).duration;
|
||||
@@ -4735,7 +4735,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
// data
|
||||
auto data_expr = class_id;
|
||||
if (CaseEq(data_expr, Input::InputClass::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = x11::Input::InputState::Key{};
|
||||
auto& num_keys = (*data.key).num_keys;
|
||||
auto& keys = (*data.key).keys;
|
||||
|
||||
@@ -4752,7 +4752,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::InputClass::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = x11::Input::InputState::Button{};
|
||||
auto& num_buttons = (*data.button).num_buttons;
|
||||
auto& buttons = (*data.button).buttons;
|
||||
|
||||
@@ -4769,7 +4769,7 @@ std::unique_ptr<Input::QueryDeviceStateR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::InputClass::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = x11::Input::InputState::Valuator{};
|
||||
uint8_t num_valuators{};
|
||||
auto& mode = (*data.valuator).mode;
|
||||
auto& valuators = (*data.valuator).valuators;
|
||||
@@ -5039,7 +5039,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
// data
|
||||
auto data_expr = control_id;
|
||||
if (CaseEq(data_expr, Input::DeviceControl::resolution)) {
|
||||
- data.resolution.emplace();
|
||||
+ data.resolution = x11::Input::DeviceState::Resolution{};
|
||||
uint32_t num_valuators{};
|
||||
auto& resolution_values = (*data.resolution).resolution_values;
|
||||
auto& resolution_min = (*data.resolution).resolution_min;
|
||||
@@ -5070,7 +5070,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::abs_calib)) {
|
||||
- data.abs_calib.emplace();
|
||||
+ data.abs_calib = x11::Input::DeviceState::AbsCalib{};
|
||||
auto& min_x = (*data.abs_calib).min_x;
|
||||
auto& max_x = (*data.abs_calib).max_x;
|
||||
auto& min_y = (*data.abs_calib).min_y;
|
||||
@@ -5105,7 +5105,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Read(&button_threshold, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::core)) {
|
||||
- data.core.emplace();
|
||||
+ data.core = x11::Input::DeviceState::Core{};
|
||||
auto& status = (*data.core).status;
|
||||
auto& iscore = (*data.core).iscore;
|
||||
|
||||
@@ -5119,7 +5119,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Pad(&buf, 2);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::enable)) {
|
||||
- data.enable.emplace();
|
||||
+ data.enable = x11::Input::DeviceState::Enable{};
|
||||
auto& enable = (*data.enable).enable;
|
||||
|
||||
// enable
|
||||
@@ -5129,7 +5129,7 @@ std::unique_ptr<Input::GetDeviceControlR
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceControl::abs_area)) {
|
||||
- data.abs_area.emplace();
|
||||
+ data.abs_area = x11::Input::DeviceState::AbsArea{};
|
||||
auto& offset_x = (*data.abs_area).offset_x;
|
||||
auto& offset_y = (*data.abs_area).offset_y;
|
||||
auto& width = (*data.abs_area).width;
|
||||
@@ -6610,7 +6610,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
// data
|
||||
auto data_expr = type;
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
|
||||
- data.key.emplace();
|
||||
+ data.key = Input::DeviceClass::Key{};
|
||||
uint16_t num_keys{};
|
||||
auto& keys = (*data.key).keys;
|
||||
|
||||
@@ -6625,7 +6625,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
|
||||
- data.button.emplace();
|
||||
+ data.button = Input::DeviceClass::Button{};
|
||||
uint16_t num_buttons{};
|
||||
auto& state = (*data.button).state;
|
||||
auto& labels = (*data.button).labels;
|
||||
@@ -6648,7 +6648,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
|
||||
- data.valuator.emplace();
|
||||
+ data.valuator = Input::DeviceClass::Valuator{};
|
||||
auto& number = (*data.valuator).number;
|
||||
auto& label = (*data.valuator).label;
|
||||
auto& min = (*data.valuator).min;
|
||||
@@ -6711,7 +6711,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
Pad(&buf, 3);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
|
||||
- data.scroll.emplace();
|
||||
+ data.scroll = Input::DeviceClass::Scroll{};
|
||||
auto& number = (*data.scroll).number;
|
||||
auto& scroll_type = (*data.scroll).scroll_type;
|
||||
auto& flags = (*data.scroll).flags;
|
||||
@@ -6746,7 +6746,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
}
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
|
||||
- data.touch.emplace();
|
||||
+ data.touch = Input::DeviceClass::Touch{};
|
||||
auto& mode = (*data.touch).mode;
|
||||
auto& num_touches = (*data.touch).num_touches;
|
||||
|
||||
@@ -6759,7 +6759,7 @@ std::unique_ptr<Input::XIQueryDeviceRepl
|
||||
Read(&num_touches, &buf);
|
||||
}
|
||||
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
|
||||
- data.gesture.emplace();
|
||||
+ data.gesture = Input::DeviceClass::Gesture{};
|
||||
auto& num_touches = (*data.gesture).num_touches;
|
||||
|
||||
// num_touches
|
||||
diff -up chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc
|
||||
--- chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc.system-libstdc++ 2024-05-29 18:02:32.000000000 +0200
|
||||
+++ chromium-126.0.6478.26/ui/gfx/x/generated_protos/xkb.cc 2024-06-02 23:51:25.570917345 +0200
|
||||
@@ -2344,7 +2344,7 @@ std::unique_ptr<Xkb::GetMapReply> detail
|
||||
// map
|
||||
auto map_expr = present;
|
||||
if (CaseAnd(map_expr, Xkb::MapPart::KeyTypes)) {
|
||||
- map.types_rtrn.emplace();
|
||||
+ map.types_rtrn = std::vector<Xkb::KeyType>{};
|
||||
auto& types_rtrn = *map.types_rtrn;
|
||||
|
||||
// types_rtrn
|
||||
@@ -5207,7 +5207,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::Types) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::ClientSymbols) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::ServerSymbols)) {
|
||||
- replies.types.emplace();
|
||||
+ replies.types = Xkb::GetKbdByNameReply::Types{};
|
||||
auto& getmap_type = (*replies.types).getmap_type;
|
||||
auto& typeDeviceID = (*replies.types).typeDeviceID;
|
||||
auto& getmap_sequence = (*replies.types).getmap_sequence;
|
||||
@@ -5626,7 +5626,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::CompatMap)) {
|
||||
- replies.compat_map.emplace();
|
||||
+ replies.compat_map = Xkb::GetKbdByNameReply::CompatMap{};
|
||||
auto& compatmap_type = (*replies.compat_map).compatmap_type;
|
||||
auto& compatDeviceID = (*replies.compat_map).compatDeviceID;
|
||||
auto& compatmap_sequence = (*replies.compat_map).compatmap_sequence;
|
||||
@@ -5747,7 +5747,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::IndicatorMaps)) {
|
||||
- replies.indicator_maps.emplace();
|
||||
+ replies.indicator_maps = Xkb::GetKbdByNameReply::IndicatorMaps{};
|
||||
auto& indicatormap_type = (*replies.indicator_maps).indicatormap_type;
|
||||
auto& indicatorDeviceID = (*replies.indicator_maps).indicatorDeviceID;
|
||||
auto& indicatormap_sequence =
|
||||
@@ -5840,7 +5840,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::KeyNames) ||
|
||||
CaseAnd(replies_expr, Xkb::GBNDetail::OtherNames)) {
|
||||
- replies.key_names.emplace();
|
||||
+ replies.key_names = Xkb::GetKbdByNameReply::KeyNames{};
|
||||
auto& keyname_type = (*replies.key_names).keyname_type;
|
||||
auto& keyDeviceID = (*replies.key_names).keyDeviceID;
|
||||
auto& keyname_sequence = (*replies.key_names).keyname_sequence;
|
||||
@@ -6087,7 +6087,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply>
|
||||
}
|
||||
}
|
||||
if (CaseAnd(replies_expr, Xkb::GBNDetail::Geometry)) {
|
||||
- replies.geometry.emplace();
|
||||
+ replies.geometry = Xkb::GetKbdByNameReply::Geometry{};
|
||||
auto& geometry_type = (*replies.geometry).geometry_type;
|
||||
auto& geometryDeviceID = (*replies.geometry).geometryDeviceID;
|
||||
auto& geometry_sequence = (*replies.geometry).geometry_sequence;
|
||||
Loading…
Reference in new issue