chromium/chromium-dev
SHA256
11
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chromium 116 - earlystable

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=1859
This commit is contained in:
Andreas Stieger
2023-08-13 12:12:05 +00:00
committed by Git OBS Bridge
parent 168adfc1a3
commit d971fa82e4
17 changed files with 590 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
chromium-115-add_BoundSessionRefreshCookieFetcher::Result.patch
View File

@@ -1,226 +0,0 @@
commit 73e9d865abd6b636280c4bb45720af2ff2c1e374
Author: Monica Basta <msalama@chromium.org>
Date: Fri Jun 2 13:25:42 2023 +0000
[BSC]: Add BoundSessionRefreshCookieFetcher::Result
Bug: b/273920907
Change-Id: I6508dcb79592420bfa3ebe3aac872c097a303a02
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4574672
Commit-Queue: Monica Basta <msalama@chromium.org>
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1152484}
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl.cc b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl.cc
index 4e7e0b092a568..1c8c0110e3516 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl.cc
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl.cc
@@ -93,7 +93,7 @@ void BoundSessionCookieControllerImpl::MaybeRefreshCookie() {
void BoundSessionCookieControllerImpl::OnCookieRefreshFetched(
BoundSessionRefreshCookieFetcher::Result result) {
refresh_cookie_fetcher_.reset();
- if (result.net_error == net::OK && result.response_code == net::HTTP_OK) {
+ if (result == BoundSessionRefreshCookieFetcher::Result::kSuccess) {
// Requests are resumed once the cookie is set in the cookie jar. The
// cookie is expected to be fresh and `this` is notified with its
// expiration date before `OnCookieRefreshFetched` is called.
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher.h b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher.h
index db62988635a26..f7a8b3693346f 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher.h
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher.h
@@ -14,10 +14,13 @@
// created per request.
class BoundSessionRefreshCookieFetcher {
public:
- struct Result {
- net::Error net_error;
- absl::optional<int> response_code;
+ enum class Result {
+ kSuccess = 0,
+ kConnectionError = 1,
+ kServerTransientError = 2,
+ kServerPersistentError = 3,
};
+
// Reports the result of the fetch request.
using RefreshCookieCompleteCallback = base::OnceCallback<void(Result)>;
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
index 46be6f06b147a..a6f038b158311 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc
@@ -8,6 +8,7 @@
#include "components/signin/public/base/signin_client.h"
#include "google_apis/gaia/gaia_urls.h"
+#include "net/http/http_status_code.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -102,7 +103,36 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoaderComplete(
scoped_refptr<net::HttpResponseHeaders> headers) {
net::Error net_error = static_cast<net::Error>(url_loader_->NetError());
- std::move(callback_).Run(
- Result(net_error, headers ? absl::optional<int>(headers->response_code())
- : absl::nullopt));
+ Result result = GetResultFromNetErrorAndHttpStatusCode(
+ net_error,
+ headers ? absl::optional<int>(headers->response_code()) : absl::nullopt);
+ std::move(callback_).Run(result);
+}
+
+BoundSessionRefreshCookieFetcher::Result
+BoundSessionRefreshCookieFetcherImpl::GetResultFromNetErrorAndHttpStatusCode(
+ net::Error net_error,
+ absl::optional<int> response_code) {
+ if ((net_error != net::OK &&
+ net_error != net::ERR_HTTP_RESPONSE_CODE_FAILURE) ||
+ !response_code) {
+ return BoundSessionRefreshCookieFetcher::Result::kConnectionError;
+ }
+
+ if (response_code == net::HTTP_OK) {
+ return BoundSessionRefreshCookieFetcher::Result::kSuccess;
+ }
+
+ if (response_code >= net::HTTP_INTERNAL_SERVER_ERROR) {
+ // Server error 5xx.
+ return BoundSessionRefreshCookieFetcher::Result::kServerTransientError;
+ }
+
+ if (response_code >= net::HTTP_BAD_REQUEST) {
+ // Server error 4xx.
+ return BoundSessionRefreshCookieFetcher::Result::kServerPersistentError;
+ }
+
+ // Unexpected response code.
+ return BoundSessionRefreshCookieFetcher::Result::kServerPersistentError;
}
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.h b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.h
index 733ffbaae088c..52943f0194c32 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.h
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.h
@@ -31,8 +31,14 @@ class BoundSessionRefreshCookieFetcherImpl
void Start(RefreshCookieCompleteCallback callback) override;
private:
+ FRIEND_TEST_ALL_PREFIXES(BoundSessionRefreshCookieFetcherImplTest,
+ GetResultFromNetErrorAndHttpStatusCode);
+
void StartRefreshRequest();
void OnURLLoaderComplete(scoped_refptr<net::HttpResponseHeaders> headers);
+ Result GetResultFromNetErrorAndHttpStatusCode(
+ net::Error net_error,
+ absl::optional<int> response_code);
const raw_ptr<SigninClient> client_;
const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl_unittest.cc b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl_unittest.cc
index d018592022d55..36ae64f83e4ee 100644
--- a/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl_unittest.cc
+++ b/chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl_unittest.cc
@@ -19,8 +19,6 @@
#include "services/network/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace {
-
class BoundSessionRefreshCookieFetcherImplTest : public ::testing::Test {
public:
BoundSessionRefreshCookieFetcherImplTest() {
@@ -55,8 +53,7 @@ TEST_F(BoundSessionRefreshCookieFetcherImplTest, Success) {
pending_request->request.url.spec(), "");
EXPECT_TRUE(future.Wait());
BoundSessionRefreshCookieFetcher::Result result = future.Get();
- EXPECT_EQ(result.net_error, net::OK);
- EXPECT_EQ(result.response_code, net::HTTP_OK);
+ EXPECT_EQ(result, BoundSessionRefreshCookieFetcher::Result::kSuccess);
}
TEST_F(BoundSessionRefreshCookieFetcherImplTest, FailureNetError) {
@@ -75,8 +72,7 @@ TEST_F(BoundSessionRefreshCookieFetcherImplTest, FailureNetError) {
EXPECT_TRUE(future.Wait());
BoundSessionRefreshCookieFetcher::Result result = future.Get();
- EXPECT_EQ(result.net_error, status.error_code);
- EXPECT_FALSE(result.response_code.has_value());
+ EXPECT_EQ(result, BoundSessionRefreshCookieFetcher::Result::kConnectionError);
}
TEST_F(BoundSessionRefreshCookieFetcherImplTest, FailureHttpError) {
@@ -93,8 +89,38 @@ TEST_F(BoundSessionRefreshCookieFetcherImplTest, FailureHttpError) {
EXPECT_TRUE(future.Wait());
BoundSessionRefreshCookieFetcher::Result result = future.Get();
- EXPECT_EQ(result.net_error, net::ERR_HTTP_RESPONSE_CODE_FAILURE);
- EXPECT_EQ(result.response_code, net::HTTP_UNAUTHORIZED);
+ EXPECT_EQ(result,
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
+}
+
+TEST_F(BoundSessionRefreshCookieFetcherImplTest,
+ GetResultFromNetErrorAndHttpStatusCode) {
+ // Connection error.
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::ERR_CONNECTION_TIMED_OUT, absl::nullopt),
+ BoundSessionRefreshCookieFetcher::Result::kConnectionError);
+ // net::OK.
+ EXPECT_EQ(
+ fetcher_->GetResultFromNetErrorAndHttpStatusCode(net::OK, net::HTTP_OK),
+ BoundSessionRefreshCookieFetcher::Result::kSuccess);
+ // net::ERR_HTTP_RESPONSE_CODE_FAILURE
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::ERR_HTTP_RESPONSE_CODE_FAILURE, net::HTTP_BAD_REQUEST),
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
+ // Persistent error.
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::OK, net::HTTP_BAD_REQUEST),
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::OK, net::HTTP_NOT_FOUND),
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
+ // Transient error.
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::OK, net::HTTP_INTERNAL_SERVER_ERROR),
+ BoundSessionRefreshCookieFetcher::Result::kServerTransientError);
+ EXPECT_EQ(fetcher_->GetResultFromNetErrorAndHttpStatusCode(
+ net::OK, net::HTTP_GATEWAY_TIMEOUT),
+ BoundSessionRefreshCookieFetcher::Result::kServerTransientError);
}
TEST_F(BoundSessionRefreshCookieFetcherImplTest, NetworkDelayed) {
@@ -114,5 +140,3 @@ TEST_F(BoundSessionRefreshCookieFetcherImplTest, NetworkDelayed) {
EXPECT_TRUE(future.Wait());
}
-
-} // namespace
diff --git a/chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc b/chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc
index b4b1a07e687cb..fcfa9305d04e9 100644
--- a/chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc
+++ b/chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc
@@ -51,7 +51,8 @@ void FakeBoundSessionRefreshCookieFetcher::SimulateCompleteRefreshRequest(
// Synchronous since tests use `BoundSessionTestCookieManager`.
OnRefreshCookieCompleted(CreateFakeCookie(cookie_expiration.value()));
} else {
- std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN));
+ std::move(callback_).Run(
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
}
}
@@ -83,9 +84,11 @@ void FakeBoundSessionRefreshCookieFetcher::OnCookieSet(
net::CookieAccessResult access_result) {
bool success = access_result.status.IsInclude();
if (!success) {
- std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN));
+ std::move(callback_).Run(
+ BoundSessionRefreshCookieFetcher::Result::kServerPersistentError);
} else {
- std::move(callback_).Run(Result(net::Error::OK, net::HTTP_OK));
+ std::move(callback_).Run(
+ BoundSessionRefreshCookieFetcher::Result::kSuccess);
}
// |This| may be destroyed
}

65
chromium-115-dont-pass-nullptr-to-construct-re2-StringPiece.patch
View File

@@ -1,65 +0,0 @@
From 3f6cd624418e2aacd7f2802df188585db78044da Mon Sep 17 00:00:00 2001
From: Paul Wankadia <junyer@chromium.org>
Date: Tue, 30 May 2023 19:53:20 +0000
Subject: [PATCH] Don't pass nullptr to construct re2::StringPiece.
This avoids breakage when re2::StringPiece becomes
an alias for absl::string_view/std::string_view.
Also, remove an unused variable that will start
upsetting the compiler for some reason.
Bug: 1447090
Change-Id: I5d2ffdb261391c0f0f3eaac706eb47a3cf108125
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4569968
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Paul Wankadia <junyer@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Owners-Override: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1150783}
---
.../browser_switcher/alternative_browser_driver_posix.cc | 2 +-
components/feedback/redaction_tool/redaction_tool.cc | 2 +-
extensions/browser/api/web_request/form_data_parser.cc | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc b/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc
index b2f7cd8ed0788f..272b933bab9625 100644
--- a/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc
+++ b/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc
@@ -89,7 +89,7 @@ void ExpandEnvironmentVariables(std::string* arg) {
static re2::LazyRE2 re = {
"\\$\\{([a-zA-Z_][a-zA-Z_0-9]*)\\}|\\$([a-zA-Z_][a-zA-Z_0-9]*)"};
std::string out;
- re2::StringPiece submatch[3] = {nullptr};
+ re2::StringPiece submatch[3] = {};
size_t start = 0;
bool matched = false;
while (re->Match(*arg, start, arg->size(), re2::RE2::Anchor::UNANCHORED,
diff --git a/components/feedback/redaction_tool/redaction_tool.cc b/components/feedback/redaction_tool/redaction_tool.cc
index 876e8da509aa74..c81806e0fb029f 100644
--- a/components/feedback/redaction_tool/redaction_tool.cc
+++ b/components/feedback/redaction_tool/redaction_tool.cc
@@ -1081,7 +1081,7 @@ std::string RedactionTool::RedactCustomPatternWithContext(
// Keep consuming, building up a result string as we go.
re2::StringPiece text(input);
re2::StringPiece skipped;
- re2::StringPiece pre_match, pre_matched_id, matched_id, post_matched_id;
+ re2::StringPiece pre_matched_id, matched_id, post_matched_id;
while (FindAndConsumeAndGetSkipped(&text, *re, &skipped, &pre_matched_id,
&matched_id, &post_matched_id)) {
std::string matched_id_as_string(matched_id);
diff --git a/extensions/browser/api/web_request/form_data_parser.cc b/extensions/browser/api/web_request/form_data_parser.cc
index 6d516e86c9f1ed..cf73709add6d68 100644
--- a/extensions/browser/api/web_request/form_data_parser.cc
+++ b/extensions/browser/api/web_request/form_data_parser.cc
@@ -372,8 +372,7 @@ std::unique_ptr<FormDataParser> FormDataParser::CreateFromContentTypeHeader(
FormDataParser::FormDataParser() = default;
FormDataParserUrlEncoded::FormDataParserUrlEncoded()
- : source_(nullptr),
- source_set_(false),
+ : source_set_(false),
source_malformed_(false),
arg_name_(&name_),
arg_value_(&value_),

25
chromium-115-skia-include.patch
View File

@@ -1,25 +0,0 @@
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Wed, 21 Jun 2023 01:16:53 +0200
Subject: [PATCH] fix include for std::pow
Upstream: meh
[ 1587s] ../skia/ext/skcolorspace_trfn.cc:36:16: error: no member named 'pow' in namespace 'std'
[ 1587s] alpha = std::pow(alpha_to_ginv, g);
[ 1587s] ~~~~~^
[ 1587s] ../skia/ext/skcolorspace_trfn.cc:44:30: error: no member named 'pow' in namespace 'std'
[ 1587s] float alpha_to_ginv = std::pow(alpha, 1 / f.g);
[ 1587s] ~~~~~^
[ 1587s] 2 errors generated.
Index: chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc
===================================================================
--- chromium-115.0.5790.32.orig/skia/ext/skcolorspace_trfn.cc
+++ chromium-115.0.5790.32/skia/ext/skcolorspace_trfn.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "skia/ext/skcolorspace_trfn.h"
+#include <cmath>
namespace skia {

12
chromium-115-verify_name_match-include.patch
View File

@@ -1,12 +0,0 @@
Index: chromium-115.0.5790.32/net/cert/pki/verify_name_match.h
===================================================================
--- chromium-115.0.5790.32.orig/net/cert/pki/verify_name_match.h
+++ chromium-115.0.5790.32/net/cert/pki/verify_name_match.h
@@ -6,6 +6,7 @@
#define NET_CERT_PKI_VERIFY_NAME_MATCH_H_
#include <string>
+#include <vector>
#include "net/base/net_export.h"

3
chromium-115.0.5790.170.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0
size 1595419840

39
chromium-116-abseil-limits-include.patch Normal file
View File

@@ -0,0 +1,39 @@
From 94d77fe3604dd86b5198f942110c240f01242439 Mon Sep 17 00:00:00 2001
From: Derek Mauro <dmauro@google.com>
Date: Tue, 20 Jun 2023 12:58:51 -0700
Subject: [PATCH] Add missing #include <limits>
Fixes #1482
PiperOrigin-RevId: 542023050
Change-Id: Iba712083edc9a24732a71f51be22ea970115809c
---
absl/debugging/internal/stacktrace_aarch64-inl.inc | 1 +
1 file changed, 1 insertion(+)
---
https://github.com/abseil/abseil-cpp/issues/1482
https://github.com/abseil/abseil-cpp/commit/94d77fe3604dd86b5198f942110c240f01242439
[ 1725s] In file included from ../third_party/abseil-cpp/absl/debugging/stacktrace.cc:46:
[ 1725s] ../third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc:26:10: error: implicit instantiation of undefined template 'std::numeric_limits<unsigned long>'
[ 1725s] std::numeric_limits<size_t>::max() - sizeof(void *);
[ 1725s] ^
[ 1725s] /usr/bin/../lib64/gcc/aarch64-suse-linux/13/../../../../include/c++/13/bits/max_size_type.h:53:10: note: template is declared here
[ 1725s] struct numeric_limits;
[ 1725s] ^
[ 1725s] 1 error generated.
Index: chromium-116.0.5845.82/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
===================================================================
--- chromium-116.0.5845.82.orig/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
+++ chromium-116.0.5845.82/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
@@ -13,6 +13,7 @@
#include <cassert>
#include <cstdint>
#include <iostream>
+#include <limits>
#include "absl/base/attributes.h"
#include "absl/debugging/internal/address_is_readable.h"

21
chromium-116-blink-variant-include.patch Normal file
View File

@@ -0,0 +1,21 @@
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Wed, 26 Jul 2023 21:53:09 +0200
Subject: object_paint_properties_sparse.h:258:12: error: no template named 'variant' in namespace 'std'
[12507s] In file included from ../third_party/blink/renderer/core/paint/object_paint_properties.cc:8:
[12507s] ../third_party/blink/renderer/core/paint/object_paint_properties_sparse.h:258:12: error: no template named 'variant' in namespace 'std'
[12507s] std::variant<scoped_refptr<TransformPaintPropertyNode>,
[12507s] ~~~~~^
Index: chromium-116.0.5845.42/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
===================================================================
--- chromium-116.0.5845.42.orig/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
+++ chromium-116.0.5845.42/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
@@ -8,6 +8,7 @@
#include <array>
#include <memory>
#include <utility>
+#include <variant>
#include "base/dcheck_is_on.h"
#include "base/memory/ptr_util.h"

13
chromium-116-lp155-host_resolver_cache-default-constructor.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: chromium-116.0.5845.82/net/dns/host_resolver_cache.cc
===================================================================
--- chromium-116.0.5845.82.orig/net/dns/host_resolver_cache.cc
+++ chromium-116.0.5845.82/net/dns/host_resolver_cache.cc
@@ -159,7 +159,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_) {

23
chromium-116-lp155-skia_output_surface_impl_on_gpu-constructor.patch Normal file
View File

@@ -0,0 +1,23 @@
[ 4363s] ../components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc:1499:17: error: no matching constructor for initialization of 'SkISize'
[ 4363s] SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
[ 4363s] ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 4363s] ../third_party/skia/include/core/SkSize.h:15:8: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
[ 4363s] struct SkISize {
[ 4363s] ^
[ 4363s] ../third_party/skia/include/core/SkSize.h:15:8: note: candidate constructor (the implicit move constructor) not viable: requires 1 argument, but 2 were provided
[ 4363s] ../third_party/skia/include/core/SkSize.h:15:8: note: candidate constructor (the implicit default constructor) not viable: requires 0 arguments, but 2 were provided
[ 4363s] 1 error generated.
diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
index 3bace0dab10..0ea54d136ea 100644
--- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
// 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);

12
chromium-116-lp155-url_load_stats-size-t.patch Normal file
View File

@@ -0,0 +1,12 @@
Index: chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h
===================================================================
--- chromium-116.0.5845.50.orig/components/bookmarks/common/url_load_stats.h
+++ chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h
@@ -7,6 +7,7 @@
#include <cstdint>
#include <vector>
+#include <cstddef>
namespace bookmarks {

323
chromium-116-lp155-wayland-color_manager_util-constructor.patch Normal file
View File

@@ -0,0 +1,323 @@
[ 3626s] In file included from ../ui/base/wayland/color_manager_util.cc:5:
[ 3626s] ../ui/base/wayland/color_manager_util.h:55:7: error: no matching constructor for initialization of 'ui::wayland::PrimaryVersion'
[ 3626s] PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
[ 3626s] ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ 3626s] ../ui/base/wayland/color_manager_util.h:33:8: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
[ 3626s] struct PrimaryVersion {
[ 3626s] ^
[ 3626s] ../ui/base/wayland/color_manager_util.h:33:8: note: candidate constructor (the implicit move constructor) not viable: requires 1 argument, but 2 were provided
[ 3626s] ../ui/base/wayland/color_manager_util.h:33:8: note: candidate constructor (the implicit default constructor) not viable: requires 0 arguments, but 2 were provided
diff --git a/ui/base/wayland/color_manager_util.h b/ui/base/wayland/color_manager_util.h
index fa1dd422c0e..52d3702e3e5 100644
--- a/ui/base/wayland/color_manager_util.h
+++ b/ui/base/wayland/color_manager_util.h
@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap<
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::MakeFixedFlatMap<
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::MakeFixedFlatMap<
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,

21
chromium-116-profile-view-utils-vector-include.patch Normal file
View File

@@ -0,0 +1,21 @@
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Wed, 26 Jul 2023 16:08:53 +0000
Subject: chrome/browser/ui/profile_view_utils.h:40:6: error: no template named 'vector' in namespace 'std'
[10288s] In file included from ../chrome/browser/ui/profile_view_utils.cc:5:
[10288s] ../chrome/browser/ui/profile_view_utils.h:40:6: error: no template named 'vector' in namespace 'std'
[10288s] std::vector<ProfileAttributesEntry*> GetAllOtherProfileEntriesForProfileSubMenu(
[10288s] ~~~~~^
Index: chromium-116.0.5845.42/chrome/browser/ui/profile_view_utils.h
===================================================================
--- chromium-116.0.5845.42.orig/chrome/browser/ui/profile_view_utils.h
+++ chromium-116.0.5845.42/chrome/browser/ui/profile_view_utils.h
@@ -7,6 +7,7 @@
#include <string>
#include <utility>
+#include <vector>
class Profile;
class ProfileAttributesEntry;

3
chromium-116.0.5845.82.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6da04e232fcb3ebffdd4354c4ae382df24db0ddd6cf29eaaa4ed905ae84b47d3
size 1599842168

36
chromium-86-fix-vaapi-on-intel.patch
View File

@@ -1,36 +0,0 @@
diff -up chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
--- chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-10-07 12:38:47.000000000 -0400
+++ chromium-86.0.4240.75/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-10-14 16:20:46.938556042 -0400
@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecPro
return VA_RT_FORMAT_YUV420;
}
+#if defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
// Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
// Lake) Cpu platform id's are referenced from the following file in kernel
// source arch/x86/include/asm/intel-family.h
@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() {
cpuid.model() >= kGeminiLakeModelId;
return is_geminilake_or_later;
}
+#endif
} // namespace
@@ -1214,6 +1216,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal;
+#if defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
+ // Move this to chromeOs only as it is causing problem in some intel linux drivers
// On Gemini Lake, Kaby Lake and later we can pass to libva the client's
// PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer
@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3;
return BufferAllocationMode::kNone;
}
+#endif
// For H.264 on older devices, another +1 is experimentally needed for
// high-to-high resolution changes.

28
chromium.changes
View File

@@ -1,3 +1,31 @@
-------------------------------------------------------------------
Sat Aug 12 17:14:02 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
- Chromium 116.0.5845.82
* New CSS features: Motion Path, and "display" and
"content-visibility" animations
* Web APIs: AbortSignal.any(), BYOB support for Fetch, Back/
forward cache NotRestoredReason API, Document Picture-in-
Picture, Expanded Wildcards in Permissions Policy Origins,
FedCM bundle: Login Hint API, User Info API, and RP Context API,
Non-composed Mouse and Pointer enter/leave events,
Remove document.open sandbox inheritance,
Report Critical-CH caused restart in NavigationTiming
- drop patches:
* chromium-115-add_BoundSessionRefreshCookieFetcher::Result.patch
* chromium-115-verify_name_match-include.patch
* chromium-86-fix-vaapi-on-intel.patch
* chromium-115-skia-include.patch
* chromium-115-dont-pass-nullptr-to-construct-re2-StringPiece.patch
- add patches:
* chromium-116-profile-view-utils-vector-include.patch
* chromium-116-blink-variant-include.patch
* chromium-116-lp155-url_load_stats-size-t.patch
* chromium-116-lp155-host_resolver_cache-default-constructor.patch
* chromium-116-abseil-limits-include.patch
* chromium-116-lp155-wayland-color_manager_util-constructor.patch
* chromium-116-lp155-skia_output_surface_impl_on_gpu-constructor.patch
-------------------------------------------------------------------
Wed Aug 9 17:24:31 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

22
chromium.spec
View File

@@ -78,7 +78,7 @@
%define n_suffix %{nil}
%endif
Name: chromium%{n_suffix}
Version: 115.0.5790.170
Version: 116.0.5845.82
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -116,7 +116,6 @@ Patch68: chromium-94-ffmpeg-roll.patch
Patch87: chromium-98-gtk4-build.patch
Patch90: chromium-100-InMilliseconds-constexpr.patch
Patch98: chromium-102-regex_pattern-array.patch
Patch201: chromium-86-fix-vaapi-on-intel.patch
# PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding
Patch202: chromium-prop-codecs.patch
Patch203: chromium-106-ffmpeg-duration.patch
@@ -128,14 +127,17 @@ Patch214: chromium-113-webview-namespace.patch
Patch215: chromium-113-webauth-include-variant.patch
Patch217: chromium-115-workaround_clang_bug-structured_binding.patch
Patch218: chromium-114-lld-argument.patch
Patch219: chromium-115-skia-include.patch
Patch220: chromium-115-verify_name_match-include.patch
Patch221: chromium-115-lp155-typename.patch
Patch222: chromium-115-Qt-moc-version.patch
Patch223: chromium-115-emplace_back_on_vector-c++20.patch
Patch224: chromium-115-compiler-SkColor4f.patch
Patch225: chromium-115-add_BoundSessionRefreshCookieFetcher::Result.patch
Patch226: chromium-115-dont-pass-nullptr-to-construct-re2-StringPiece.patch
Patch227: chromium-116-profile-view-utils-vector-include.patch
Patch228: chromium-116-blink-variant-include.patch
Patch229: chromium-116-lp155-url_load_stats-size-t.patch
Patch230: chromium-116-lp155-host_resolver_cache-default-constructor.patch
Patch231: chromium-116-abseil-limits-include.patch
Patch232: chromium-116-lp155-wayland-color_manager_util-constructor.patch
Patch233: chromium-116-lp155-skia_output_surface_impl_on_gpu-constructor.patch
BuildRequires: SDL-devel
BuildRequires: bison
BuildRequires: cups-devel
@@ -223,7 +225,7 @@ BuildRequires: pkgconfig(opus) >= 1.3.1
BuildRequires: pkgconfig(panel)
BuildRequires: pkgconfig(panelw)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(re2)
BuildRequires: pkgconfig(re2) >= 11
BuildRequires: pkgconfig(schroedinger-1.0)
BuildRequires: pkgconfig(slang)
BuildRequires: pkgconfig(sqlite3)
@@ -346,9 +348,6 @@ BuildRequires: gcc%{gcc_version}
BuildRequires: gcc%{gcc_version}-c++
%endif
%endif
%if 0%{?suse_version} < 1699
BuildRequires: pkgconfig(re2) = 10.0.0
%endif
%description
Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications.
@@ -473,6 +472,7 @@ keeplibs=(
third_party/crashpad/crashpad/third_party/zlib
third_party/crc32c
third_party/cros_system_api
third_party/d3
third_party/dav1d
third_party/dawn
third_party/dawn/third_party
@@ -756,10 +756,10 @@ gn_system_libraries=(
libevent
libjpeg
libpng
libxslt
libusb
libwebp
libxml
libxslt
opus
re2
snappy

216
gcc13-fix.patch
View File

@@ -1,7 +1,7 @@
Index: chromium-115.0.5790.32/base/check_op.h
Index: chromium-116.0.5845.42/base/check_op.h
===================================================================
--- chromium-115.0.5790.32.orig/base/check_op.h
+++ chromium-115.0.5790.32/base/check_op.h
--- chromium-116.0.5845.42.orig/base/check_op.h
+++ chromium-116.0.5845.42/base/check_op.h
@@ -5,6 +5,7 @@
#ifndef BASE_CHECK_OP_H_
#define BASE_CHECK_OP_H_
@@ -10,10 +10,10 @@ Index: chromium-115.0.5790.32/base/check_op.h
#include <cstddef>
#include <string>
#include <type_traits>
Index: chromium-115.0.5790.32/base/debug/profiler.h
Index: chromium-116.0.5845.42/base/debug/profiler.h
===================================================================
--- chromium-115.0.5790.32.orig/base/debug/profiler.h
+++ chromium-115.0.5790.32/base/debug/profiler.h
--- chromium-116.0.5845.42.orig/base/debug/profiler.h
+++ chromium-116.0.5845.42/base/debug/profiler.h
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <stdint.h>
@@ -22,10 +22,10 @@ Index: chromium-115.0.5790.32/base/debug/profiler.h
#include <string>
#include "base/base_export.h"
Index: chromium-115.0.5790.32/components/viz/common/view_transition_element_resource_id.h
Index: chromium-116.0.5845.42/gpu/config/gpu_feature_info.h
===================================================================
--- chromium-115.0.5790.32.orig/components/viz/common/view_transition_element_resource_id.h
+++ chromium-115.0.5790.32/components/viz/common/view_transition_element_resource_id.h
--- chromium-116.0.5845.42.orig/gpu/config/gpu_feature_info.h
+++ chromium-116.0.5845.42/gpu/config/gpu_feature_info.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -34,22 +34,10 @@ Index: chromium-115.0.5790.32/components/viz/common/view_transition_element_reso
#include <string>
#include <vector>
Index: chromium-115.0.5790.32/gpu/config/gpu_feature_info.h
Index: chromium-116.0.5845.42/net/base/net_export.h
===================================================================
--- chromium-115.0.5790.32.orig/gpu/config/gpu_feature_info.h
+++ chromium-115.0.5790.32/gpu/config/gpu_feature_info.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include <cstdint>
#include <string>
#include <vector>
Index: chromium-115.0.5790.32/net/base/net_export.h
===================================================================
--- chromium-115.0.5790.32.orig/net/base/net_export.h
+++ chromium-115.0.5790.32/net/base/net_export.h
--- chromium-116.0.5845.42.orig/net/base/net_export.h
+++ chromium-116.0.5845.42/net/base/net_export.h
@@ -5,6 +5,8 @@
#ifndef NET_BASE_NET_EXPORT_H_
#define NET_BASE_NET_EXPORT_H_
@@ -59,10 +47,10 @@ Index: chromium-115.0.5790.32/net/base/net_export.h
// 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.
Index: chromium-115.0.5790.32/sandbox/linux/syscall_broker/broker_file_permission.h
Index: chromium-116.0.5845.42/sandbox/linux/syscall_broker/broker_file_permission.h
===================================================================
--- chromium-115.0.5790.32.orig/sandbox/linux/syscall_broker/broker_file_permission.h
+++ chromium-115.0.5790.32/sandbox/linux/syscall_broker/broker_file_permission.h
--- chromium-116.0.5845.42.orig/sandbox/linux/syscall_broker/broker_file_permission.h
+++ chromium-116.0.5845.42/sandbox/linux/syscall_broker/broker_file_permission.h
@@ -5,6 +5,7 @@
#ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
#define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
@@ -71,10 +59,10 @@ Index: chromium-115.0.5790.32/sandbox/linux/syscall_broker/broker_file_permissio
#include <bitset>
#include <cstdint>
#include <string>
Index: chromium-115.0.5790.32/third_party/abseil-cpp/absl/strings/string_view.h
Index: chromium-116.0.5845.42/third_party/abseil-cpp/absl/strings/string_view.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/abseil-cpp/absl/strings/string_view.h
+++ chromium-115.0.5790.32/third_party/abseil-cpp/absl/strings/string_view.h
--- chromium-116.0.5845.42.orig/third_party/abseil-cpp/absl/strings/string_view.h
+++ chromium-116.0.5845.42/third_party/abseil-cpp/absl/strings/string_view.h
@@ -27,6 +27,7 @@
#ifndef ABSL_STRINGS_STRING_VIEW_H_
#define ABSL_STRINGS_STRING_VIEW_H_
@@ -83,10 +71,10 @@ Index: chromium-115.0.5790.32/third_party/abseil-cpp/absl/strings/string_view.h
#include <algorithm>
#include <cassert>
#include <cstddef>
Index: chromium-115.0.5790.32/third_party/angle/include/GLSLANG/ShaderVars.h
Index: chromium-116.0.5845.42/third_party/angle/include/GLSLANG/ShaderVars.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/angle/include/GLSLANG/ShaderVars.h
+++ chromium-115.0.5790.32/third_party/angle/include/GLSLANG/ShaderVars.h
--- chromium-116.0.5845.42.orig/third_party/angle/include/GLSLANG/ShaderVars.h
+++ chromium-116.0.5845.42/third_party/angle/include/GLSLANG/ShaderVars.h
@@ -10,6 +10,7 @@
#ifndef GLSLANG_SHADERVARS_H_
#define GLSLANG_SHADERVARS_H_
@@ -95,10 +83,10 @@ Index: chromium-115.0.5790.32/third_party/angle/include/GLSLANG/ShaderVars.h
#include <algorithm>
#include <array>
#include <cstdint>
Index: chromium-115.0.5790.32/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
Index: chromium-116.0.5845.42/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+++ chromium-115.0.5790.32/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
--- chromium-116.0.5845.42.orig/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+++ chromium-116.0.5845.42/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -107,10 +95,10 @@ Index: chromium-115.0.5790.32/third_party/blink/public/common/bluetooth/web_blue
#include <array>
#include <cstdint>
#include <functional>
Index: chromium-115.0.5790.32/third_party/dawn/src/tint/reader/spirv/namer.h
Index: chromium-116.0.5845.42/third_party/dawn/src/tint/reader/spirv/namer.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/dawn/src/tint/reader/spirv/namer.h
+++ chromium-115.0.5790.32/third_party/dawn/src/tint/reader/spirv/namer.h
--- chromium-116.0.5845.42.orig/third_party/dawn/src/tint/reader/spirv/namer.h
+++ chromium-116.0.5845.42/third_party/dawn/src/tint/reader/spirv/namer.h
@@ -15,6 +15,7 @@
#ifndef SRC_TINT_READER_SPIRV_NAMER_H_
#define SRC_TINT_READER_SPIRV_NAMER_H_
@@ -119,10 +107,10 @@ Index: chromium-115.0.5790.32/third_party/dawn/src/tint/reader/spirv/namer.h
#include <string>
#include <unordered_map>
#include <vector>
Index: chromium-115.0.5790.32/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
Index: chromium-116.0.5845.42/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+++ chromium-115.0.5790.32/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
--- chromium-116.0.5845.42.orig/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+++ chromium-116.0.5845.42/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -131,10 +119,10 @@ Index: chromium-115.0.5790.32/third_party/openscreen/src/discovery/dnssd/public/
#include <functional>
#include <map>
#include <set>
Index: chromium-115.0.5790.32/third_party/swiftshader/src/System/LRUCache.hpp
Index: chromium-116.0.5845.42/third_party/swiftshader/src/System/LRUCache.hpp
===================================================================
--- chromium-115.0.5790.32.orig/third_party/swiftshader/src/System/LRUCache.hpp
+++ chromium-115.0.5790.32/third_party/swiftshader/src/System/LRUCache.hpp
--- chromium-116.0.5845.42.orig/third_party/swiftshader/src/System/LRUCache.hpp
+++ chromium-116.0.5845.42/third_party/swiftshader/src/System/LRUCache.hpp
@@ -17,6 +17,7 @@
#include "System/Debug.hpp"
@@ -143,10 +131,10 @@ Index: chromium-115.0.5790.32/third_party/swiftshader/src/System/LRUCache.hpp
#include <cstddef>
#include <cstdint>
#include <functional>
Index: chromium-115.0.5790.32/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
Index: chromium-116.0.5845.42/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+++ chromium-115.0.5790.32/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
--- chromium-116.0.5845.42.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+++ chromium-116.0.5845.42/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
@@ -2388,6 +2388,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV
#ifdef VMA_IMPLEMENTATION
#undef VMA_IMPLEMENTATION
@@ -155,10 +143,10 @@ Index: chromium-115.0.5790.32/third_party/vulkan_memory_allocator/include/vk_mem
#include <cstdint>
#include <cstdlib>
#include <cstring>
Index: chromium-115.0.5790.32/ui/gfx/geometry/linear_gradient.h
Index: chromium-116.0.5845.42/ui/gfx/geometry/linear_gradient.h
===================================================================
--- chromium-115.0.5790.32.orig/ui/gfx/geometry/linear_gradient.h
+++ chromium-115.0.5790.32/ui/gfx/geometry/linear_gradient.h
--- chromium-116.0.5845.42.orig/ui/gfx/geometry/linear_gradient.h
+++ chromium-116.0.5845.42/ui/gfx/geometry/linear_gradient.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -167,10 +155,10 @@ Index: chromium-115.0.5790.32/ui/gfx/geometry/linear_gradient.h
#include <array>
#include <cstddef>
#include <cstdint>
Index: chromium-115.0.5790.32/third_party/ruy/src/ruy/profiler/instrumentation.h
Index: chromium-116.0.5845.42/third_party/ruy/src/ruy/profiler/instrumentation.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/ruy/src/ruy/profiler/instrumentation.h
+++ chromium-115.0.5790.32/third_party/ruy/src/ruy/profiler/instrumentation.h
--- chromium-116.0.5845.42.orig/third_party/ruy/src/ruy/profiler/instrumentation.h
+++ chromium-116.0.5845.42/third_party/ruy/src/ruy/profiler/instrumentation.h
@@ -17,6 +17,7 @@ limitations under the License.
#define RUY_RUY_PROFILER_INSTRUMENTATION_H_
@@ -179,10 +167,10 @@ Index: chromium-115.0.5790.32/third_party/ruy/src/ruy/profiler/instrumentation.h
#include <cstdio>
#include <mutex>
#include <vector>
Index: chromium-115.0.5790.32/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
Index: chromium-116.0.5845.42/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
+++ chromium-115.0.5790.32/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
--- chromium-116.0.5845.42.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
+++ chromium-116.0.5845.42/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
@@ -31,6 +31,7 @@ limitations under the License.
#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
#define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_
@@ -191,10 +179,10 @@ Index: chromium-115.0.5790.32/third_party/tflite/src/tensorflow/lite/kernels/int
#include <complex>
#include <deque>
#include <vector>
Index: chromium-115.0.5790.32/base/containers/flat_map.h
Index: chromium-116.0.5845.42/base/containers/flat_map.h
===================================================================
--- chromium-115.0.5790.32.orig/base/containers/flat_map.h
+++ chromium-115.0.5790.32/base/containers/flat_map.h
--- chromium-116.0.5845.42.orig/base/containers/flat_map.h
+++ chromium-116.0.5845.42/base/containers/flat_map.h
@@ -5,6 +5,7 @@
#ifndef BASE_CONTAINERS_FLAT_MAP_H_
#define BASE_CONTAINERS_FLAT_MAP_H_
@@ -203,10 +191,10 @@ Index: chromium-115.0.5790.32/base/containers/flat_map.h
#include <functional>
#include <tuple>
#include <utility>
Index: chromium-115.0.5790.32/components/crash/core/app/crash_reporter_client.h
Index: chromium-116.0.5845.42/components/crash/core/app/crash_reporter_client.h
===================================================================
--- chromium-115.0.5790.32.orig/components/crash/core/app/crash_reporter_client.h
+++ chromium-115.0.5790.32/components/crash/core/app/crash_reporter_client.h
--- chromium-116.0.5845.42.orig/components/crash/core/app/crash_reporter_client.h
+++ chromium-116.0.5845.42/components/crash/core/app/crash_reporter_client.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -215,10 +203,10 @@ Index: chromium-115.0.5790.32/components/crash/core/app/crash_reporter_client.h
#include <string>
#include "build/build_config.h"
Index: chromium-115.0.5790.32/ui/base/prediction/kalman_filter.h
Index: chromium-116.0.5845.42/ui/base/prediction/kalman_filter.h
===================================================================
--- chromium-115.0.5790.32.orig/ui/base/prediction/kalman_filter.h
+++ chromium-115.0.5790.32/ui/base/prediction/kalman_filter.h
--- chromium-116.0.5845.42.orig/ui/base/prediction/kalman_filter.h
+++ chromium-116.0.5845.42/ui/base/prediction/kalman_filter.h
@@ -7,6 +7,8 @@
#include <stdint.h>
@@ -228,10 +216,10 @@ Index: chromium-115.0.5790.32/ui/base/prediction/kalman_filter.h
#include "base/component_export.h"
#include "ui/gfx/geometry/matrix3_f.h"
Index: chromium-115.0.5790.32/components/password_manager/core/browser/generation/password_generator.h
Index: chromium-116.0.5845.42/components/password_manager/core/browser/generation/password_generator.h
===================================================================
--- chromium-115.0.5790.32.orig/components/password_manager/core/browser/generation/password_generator.h
+++ chromium-115.0.5790.32/components/password_manager/core/browser/generation/password_generator.h
--- chromium-116.0.5845.42.orig/components/password_manager/core/browser/generation/password_generator.h
+++ chromium-116.0.5845.42/components/password_manager/core/browser/generation/password_generator.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -240,10 +228,10 @@ Index: chromium-115.0.5790.32/components/password_manager/core/browser/generatio
#include <string>
Index: chromium-115.0.5790.32/components/feature_engagement/internal/event_storage_validator.h
Index: chromium-116.0.5845.42/components/feature_engagement/internal/event_storage_validator.h
===================================================================
--- chromium-115.0.5790.32.orig/components/feature_engagement/internal/event_storage_validator.h
+++ chromium-115.0.5790.32/components/feature_engagement/internal/event_storage_validator.h
--- chromium-116.0.5845.42.orig/components/feature_engagement/internal/event_storage_validator.h
+++ chromium-116.0.5845.42/components/feature_engagement/internal/event_storage_validator.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -252,10 +240,10 @@ Index: chromium-115.0.5790.32/components/feature_engagement/internal/event_stora
#include <string>
namespace feature_engagement {
Index: chromium-115.0.5790.32/components/feature_engagement/internal/never_event_storage_validator.h
Index: chromium-116.0.5845.42/components/feature_engagement/internal/never_event_storage_validator.h
===================================================================
--- chromium-115.0.5790.32.orig/components/feature_engagement/internal/never_event_storage_validator.h
+++ chromium-115.0.5790.32/components/feature_engagement/internal/never_event_storage_validator.h
--- chromium-116.0.5845.42.orig/components/feature_engagement/internal/never_event_storage_validator.h
+++ chromium-116.0.5845.42/components/feature_engagement/internal/never_event_storage_validator.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
#define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_
@@ -264,10 +252,10 @@ Index: chromium-115.0.5790.32/components/feature_engagement/internal/never_event
#include <string>
#include "components/feature_engagement/internal/event_storage_validator.h"
Index: chromium-115.0.5790.32/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
Index: chromium-116.0.5845.42/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
===================================================================
--- chromium-115.0.5790.32.orig/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
+++ chromium-115.0.5790.32/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
--- chromium-116.0.5845.42.orig/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
+++ chromium-116.0.5845.42/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
@@ -45,6 +45,7 @@
#include "llvm/Support/SaveAndRestore.h"
#include "llvm/Support/raw_ostream.h"
@@ -276,10 +264,10 @@ Index: chromium-115.0.5790.32/third_party/swiftshader/third_party/llvm-10.0/llvm
#include <string>
#include <sysexits.h>
#ifdef HAVE_BACKTRACE
Index: chromium-115.0.5790.32/chrome/browser/privacy_budget/encountered_surface_tracker.h
Index: chromium-116.0.5845.42/chrome/browser/privacy_budget/encountered_surface_tracker.h
===================================================================
--- chromium-115.0.5790.32.orig/chrome/browser/privacy_budget/encountered_surface_tracker.h
+++ chromium-115.0.5790.32/chrome/browser/privacy_budget/encountered_surface_tracker.h
--- chromium-116.0.5845.42.orig/chrome/browser/privacy_budget/encountered_surface_tracker.h
+++ chromium-116.0.5845.42/chrome/browser/privacy_budget/encountered_surface_tracker.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -288,10 +276,10 @@ Index: chromium-115.0.5790.32/chrome/browser/privacy_budget/encountered_surface_
#include <map>
#include "base/containers/flat_set.h"
Index: chromium-115.0.5790.32/components/autofill/core/browser/autofill_ablation_study.h
Index: chromium-116.0.5845.42/components/autofill/core/browser/autofill_ablation_study.h
===================================================================
--- chromium-115.0.5790.32.orig/components/autofill/core/browser/autofill_ablation_study.h
+++ chromium-115.0.5790.32/components/autofill/core/browser/autofill_ablation_study.h
--- chromium-116.0.5845.42.orig/components/autofill/core/browser/autofill_ablation_study.h
+++ chromium-116.0.5845.42/components/autofill/core/browser/autofill_ablation_study.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -300,10 +288,10 @@ Index: chromium-115.0.5790.32/components/autofill/core/browser/autofill_ablation
#include <string>
class GURL;
Index: chromium-115.0.5790.32/components/omnibox/browser/on_device_head_model.h
Index: chromium-116.0.5845.42/components/omnibox/browser/on_device_head_model.h
===================================================================
--- chromium-115.0.5790.32.orig/components/omnibox/browser/on_device_head_model.h
+++ chromium-115.0.5790.32/components/omnibox/browser/on_device_head_model.h
--- chromium-116.0.5845.42.orig/components/omnibox/browser/on_device_head_model.h
+++ chromium-116.0.5845.42/components/omnibox/browser/on_device_head_model.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -312,10 +300,10 @@ Index: chromium-115.0.5790.32/components/omnibox/browser/on_device_head_model.h
#include <string>
#include <utility>
#include <vector>
Index: chromium-115.0.5790.32/components/payments/content/utility/fingerprint_parser.h
Index: chromium-116.0.5845.42/components/payments/content/utility/fingerprint_parser.h
===================================================================
--- chromium-115.0.5790.32.orig/components/payments/content/utility/fingerprint_parser.h
+++ chromium-115.0.5790.32/components/payments/content/utility/fingerprint_parser.h
--- chromium-116.0.5845.42.orig/components/payments/content/utility/fingerprint_parser.h
+++ chromium-116.0.5845.42/components/payments/content/utility/fingerprint_parser.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
#define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
@@ -324,10 +312,10 @@ Index: chromium-115.0.5790.32/components/payments/content/utility/fingerprint_pa
#include <stddef.h>
#include <stdint.h>
Index: chromium-115.0.5790.32/pdf/document_attachment_info.h
Index: chromium-116.0.5845.42/pdf/document_attachment_info.h
===================================================================
--- chromium-115.0.5790.32.orig/pdf/document_attachment_info.h
+++ chromium-115.0.5790.32/pdf/document_attachment_info.h
--- chromium-116.0.5845.42.orig/pdf/document_attachment_info.h
+++ chromium-116.0.5845.42/pdf/document_attachment_info.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -336,10 +324,10 @@ Index: chromium-115.0.5790.32/pdf/document_attachment_info.h
#include <string>
Index: chromium-115.0.5790.32/third_party/pdfium/constants/annotation_flags.h
Index: chromium-116.0.5845.42/third_party/pdfium/constants/annotation_flags.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/pdfium/constants/annotation_flags.h
+++ chromium-115.0.5790.32/third_party/pdfium/constants/annotation_flags.h
--- chromium-116.0.5845.42.orig/third_party/pdfium/constants/annotation_flags.h
+++ chromium-116.0.5845.42/third_party/pdfium/constants/annotation_flags.h
@@ -7,6 +7,8 @@
#include <stdint.h>
@@ -349,22 +337,10 @@ Index: chromium-115.0.5790.32/third_party/pdfium/constants/annotation_flags.h
namespace pdfium {
namespace annotation_flags {
Index: chromium-115.0.5790.32/base/cpu.h
Index: chromium-116.0.5845.42/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
===================================================================
--- chromium-115.0.5790.32.orig/base/cpu.h
+++ chromium-115.0.5790.32/base/cpu.h
@@ -5,6 +5,7 @@
#ifndef BASE_CPU_H_
#define BASE_CPU_H_
+#include <cstdint>
#include <string>
#include "base/base_export.h"
Index: chromium-115.0.5790.32/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
===================================================================
--- chromium-115.0.5790.32.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+++ chromium-115.0.5790.32/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
--- chromium-116.0.5845.42.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+++ chromium-116.0.5845.42/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
@@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N
// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
@@ -373,10 +349,10 @@ Index: chromium-115.0.5790.32/third_party/vulkan-deps/vulkan-validation-layers/s
static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)
{
snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
Index: chromium-115.0.5790.32/chrome/browser/webauthn/authenticator_request_dialog_model.h
Index: chromium-116.0.5845.42/chrome/browser/webauthn/authenticator_request_dialog_model.h
===================================================================
--- chromium-115.0.5790.32.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h
+++ chromium-115.0.5790.32/chrome/browser/webauthn/authenticator_request_dialog_model.h
--- chromium-116.0.5845.42.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h
+++ chromium-116.0.5845.42/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -8,6 +8,7 @@
#include <memory>
#include <string>
@@ -385,10 +361,10 @@ Index: chromium-115.0.5790.32/chrome/browser/webauthn/authenticator_request_dial
#include "base/containers/span.h"
#include "base/functional/callback_forward.h"
Index: chromium-115.0.5790.32/gin/time_clamper.h
Index: chromium-116.0.5845.42/gin/time_clamper.h
===================================================================
--- chromium-115.0.5790.32.orig/gin/time_clamper.h
+++ chromium-115.0.5790.32/gin/time_clamper.h
--- chromium-116.0.5845.42.orig/gin/time_clamper.h
+++ chromium-116.0.5845.42/gin/time_clamper.h
@@ -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
@@ -398,10 +374,10 @@ Index: chromium-115.0.5790.32/gin/time_clamper.h
return now_micros / 1000;
}
return ClampTimeResolution(now_micros) / 1000;
Index: chromium-115.0.5790.32/chrome/test/chromedriver/chrome/web_view_impl.cc
Index: chromium-116.0.5845.42/chrome/test/chromedriver/chrome/web_view_impl.cc
===================================================================
--- chromium-115.0.5790.32.orig/chrome/test/chromedriver/chrome/web_view_impl.cc
+++ chromium-115.0.5790.32/chrome/test/chromedriver/chrome/web_view_impl.cc
--- chromium-116.0.5845.42.orig/chrome/test/chromedriver/chrome/web_view_impl.cc
+++ chromium-116.0.5845.42/chrome/test/chromedriver/chrome/web_view_impl.cc
@@ -11,6 +11,7 @@
#include <queue>
#include <utility>