Update to Chromium version 116.0.5845.82

This commit is contained in:
Marshall Greenblatt
2023-08-11 01:41:53 +00:00
committed by Marshall Greenblatt
parent 5e0d8ce439
commit 31fb97aeb7
5 changed files with 15 additions and 15 deletions

View File

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

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 93184ddac6974..68208adced2d5 100644 index 01194da83fe3f..dd65ddd171c54 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@@ -18,7 +18,7 @@ index 93184ddac6974..68208adced2d5 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2560,6 +2562,10 @@ static_library("browser") { @@ -2564,6 +2566,10 @@ static_library("browser") {
] ]
} }

View File

@@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false; return false;
} }
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 411220bd115d1..4ffc1ff40a6e6 100644 index d7bb16c28835b..e5931106d9e05 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@@ -43,7 +43,7 @@ index 411220bd115d1..4ffc1ff40a6e6 100644
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app:chrome_dll_resources", "//chrome/app:chrome_dll_resources",
@@ -2726,6 +2732,8 @@ static_library("ui") { @@ -2727,6 +2733,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h", "views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc", "views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h", "views/apps/app_dialog/app_pause_dialog_view.h",
@@ -52,7 +52,7 @@ index 411220bd115d1..4ffc1ff40a6e6 100644
"views/apps/app_info_dialog/arc_app_info_links_panel.cc", "views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h", "views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc", "views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4528,8 +4536,6 @@ static_library("ui") { @@ -4529,8 +4537,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h", "views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc", "views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h", "views/apps/app_dialog/app_dialog_view.h",
@@ -61,7 +61,7 @@ index 411220bd115d1..4ffc1ff40a6e6 100644
"views/apps/app_info_dialog/app_info_dialog_container.cc", "views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h", "views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc", "views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -6140,6 +6146,7 @@ static_library("ui") { @@ -6141,6 +6147,7 @@ static_library("ui") {
if (enable_printing) { if (enable_printing) {
deps += [ deps += [
"//components/printing/browser", "//components/printing/browser",

View File

@@ -178,10 +178,10 @@ index ad55d136252ad..8efd01a68afd2 100644
void CookieManager::SetForceKeepSessionState() { void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc diff --git services/network/network_context.cc services/network/network_context.cc
index d553d31e90ca7..c27dc5a747aca 100644 index 4156311dfec3f..857ba9d46296d 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -2349,16 +2349,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2360,16 +2360,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator()); network_service_->network_quality_estimator());
} }

View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 4efa2e72fdc34..1319dfa2c2b2f 100644 index c9b13be94c531..36cf5d46c137d 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -3242,6 +3242,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3248,6 +3248,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy, params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create()); base::UnguessableToken::Create());
@@ -15,7 +15,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
std::unique_ptr<WebContentsViewDelegate> delegate = std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3252,6 +3258,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3258,6 +3264,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate), view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }
@@ -23,7 +23,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3441,6 +3448,9 @@ void WebContentsImpl::RenderWidgetCreated( @@ -3447,6 +3454,9 @@ void WebContentsImpl::RenderWidgetCreated(
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
"render_widget_host", render_widget_host); "render_widget_host", render_widget_host);
created_widgets_.insert(render_widget_host); created_widgets_.insert(render_widget_host);
@@ -33,7 +33,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
} }
void WebContentsImpl::RenderWidgetDeleted( void WebContentsImpl::RenderWidgetDeleted(
@@ -4170,6 +4180,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4176,6 +4186,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.picture_in_picture_options = *(params.pip_options); create_params.picture_in_picture_options = *(params.pip_options);
} }
@@ -49,7 +49,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
// Check whether there is an available prerendered page for this navigation if // Check whether there is an available prerendered page for this navigation if
// this is not for guest. If it exists, take WebContents pre-created for // this is not for guest. If it exists, take WebContents pre-created for
// hosting the prerendered page instead of creating new WebContents. // hosting the prerendered page instead of creating new WebContents.
@@ -8117,6 +8136,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -8123,6 +8142,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames). // frames).
SetFocusedFrameTree(&node->frame_tree()); SetFocusedFrameTree(&node->frame_tree());
} }