Update to Chromium version 107.0.5304.36

This commit is contained in:
Marshall Greenblatt
2022-10-18 17:12:46 -04:00
parent 0bd2c19a20
commit 792694178c
9 changed files with 18 additions and 18 deletions

View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/107.0.5304.29',
'chromium_checkout': 'refs/tags/107.0.5304.36',
'depot_tools_checkout': 'e3ed6a8e01'
}

View File

@@ -75,7 +75,7 @@ class ResolveHostHelper : public network::ResolveHostClientBase {
host_resolver_->ResolveHost(
network::mojom::HostResolverHost::NewHostPortPair(
net::HostPortPair::FromURL(GURL(origin.ToString()))),
net::NetworkIsolationKey::CreateTransient(), nullptr,
net::NetworkAnonymizationKey::CreateTransient(), nullptr,
receiver_.BindNewPipeAndPassRemote());
}

View File

@@ -20,10 +20,10 @@ index 18c138c21a853..554e22458da45 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index fe59047aca94b..a2b6583dba0b5 100644
index cb4c320c7f020..dedfabddad297 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -6542,6 +6542,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
@@ -6554,6 +6554,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
origin_and_debug_info.second += ", error";
}
@@ -38,7 +38,7 @@ index fe59047aca94b..a2b6583dba0b5 100644
if (use_opaque_origin) {
origin_and_debug_info =
std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(),
@@ -6569,6 +6577,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
@@ -6581,6 +6589,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo(
SandboxFlagsToCommit());

View File

@@ -13,7 +13,7 @@ index af62c19be9db6..d58f033cffecc 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 0f07ad9591c2a..9e8a3365ceb31 100644
index 14d4783802ca6..4f9edb0b96d98 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@@ -43,7 +43,7 @@ index 0f07ad9591c2a..9e8a3365ceb31 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5673,6 +5679,7 @@ static_library("ui") {
@@ -5674,6 +5680,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index bfee1b2e1b139..4dce02bde8165 100644
index f4d0d93510f26..e1ccee6851a04 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -310,6 +310,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -42,7 +42,7 @@ index bfee1b2e1b139..4dce02bde8165 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1160,6 +1179,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1165,6 +1184,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
@@ -55,7 +55,7 @@ index bfee1b2e1b139..4dce02bde8165 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3015,6 +3040,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3020,6 +3045,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}

View File

@@ -465,7 +465,7 @@ index 57d5e9f7b4e3c..da7b2d14bae49 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 2ec4ad4c16cdf..6306a8de48d42 100644
index afe27a1bdcc26..530238e430e29 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -170,12 +170,13 @@ auto& GetViewCommandMap() {

View File

@@ -12,7 +12,7 @@ index 286e99d804cd0..2f431dcab0283 100644
GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index cbadbda605709..048c88486ce06 100644
index aee570cfc179d..fb5ee4ce008f1 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -716,6 +716,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(

View File

@@ -10,7 +10,7 @@ index 38062cfb9329e..14429ff0ee7eb 100644
+// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index 696d21520e076..874954e24bc8c 100644
index 0878808a8dc72..59efcead3b145 100644
--- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc
@@ -1734,7 +1734,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index a41ab3c6e50f0..1dd98219869cf 100644
index 9b4f43c0c9c13..a68ecf3bd933d 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@@ -123,10 +123,10 @@ index 955126eed8968..cda1d55350d1e 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index f9acfee6133ec..dc978c3ff7156 100644
index ef9b375140df2..e8ca983e93fc1 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2386,17 +2386,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2388,17 +2388,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -157,10 +157,10 @@ index f9acfee6133ec..dc978c3ff7156 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index ecb6f95f694c0..7a567de87c2b1 100644
index cf3f2d65c15aa..d49ca60c9bd87 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -341,6 +341,9 @@ struct NetworkContextParams {
@@ -342,6 +342,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;