bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 105.0.5195.52

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-08-25 14:40:47 +00:00
committed by Marshall Greenblatt
parent 8d8b9345f7
commit c1dce0217d
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/105.0.5195.37', 'chromium_checkout': 'refs/tags/105.0.5195.52',
'depot_tools_checkout': '882f1e2a9a' 'depot_tools_checkout': '882f1e2a9a'
} }

18
patch/patches/chrome_runtime.patch
View File

@@ -174,7 +174,7 @@ index 7ef669d52b306..8edc1aaeaff6a 100644
+#endif +#endif
} }
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index e53e21fb50f51..38bb4189b21c6 100644 index e1abc72e4e6bb..d045601fb154d 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@@ -185,7 +185,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/after_startup_task_utils.h"
@@ -1349,6 +1350,8 @@ bool DoesGaiaOriginRequireDedicatedProcess() { @@ -1350,6 +1351,8 @@ bool DoesGaiaOriginRequireDedicatedProcess() {
} // namespace } // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() { ChromeContentBrowserClient::ChromeContentBrowserClient() {
@@ -194,7 +194,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif #endif
@@ -1374,6 +1377,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { @@ -1375,6 +1378,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear(); extra_parts_.clear();
} }
@@ -206,7 +206,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
// static // static
void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) { PrefRegistrySimple* registry) {
@@ -3908,9 +3916,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( @@ -3909,9 +3917,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite); &search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@@ -218,7 +218,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
} }
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5582,7 +5592,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( @@ -5583,7 +5593,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service); network_service);
} }
@@ -227,7 +227,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -5600,6 +5610,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( @@ -5601,6 +5611,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale(); network_context_params->accept_language = GetApplicationLocale();
} }
@@ -236,7 +236,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
} }
std::vector<base::FilePath> std::vector<base::FilePath>
@@ -6452,10 +6464,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( @@ -6458,10 +6470,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context); const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -249,7 +249,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
FROM_HERE, keepalive_deadline_ - now, FROM_HERE, keepalive_deadline_ - now,
base::BindOnce( base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired, &ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6474,7 +6486,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { @@ -6480,7 +6492,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_; --num_keepalive_requests_;
if (num_keepalive_requests_ == 0) { if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer"; DVLOG(1) << "Stopping the keepalive timer";
@@ -259,7 +259,7 @@ index e53e21fb50f51..38bb4189b21c6 100644
// This deletes the keep alive handle attached to the timer function and // This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence. // unblock the shutdown sequence.
} }
@@ -6599,7 +6612,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( @@ -6605,7 +6618,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_; const auto then = keepalive_deadline_;
if (now < then) { if (now < then) {

8
patch/patches/chrome_runtime_views.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 20fcf6172c577..d34843570fa35 100644 index dffc146633fd5..38547c5aff831 100644
--- chrome/browser/ui/browser_command_controller.cc --- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc
@@ -412,8 +412,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -380,8 +380,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// CommandUpdaterDelegate and CommandUpdater declare this function so we // CommandUpdaterDelegate and CommandUpdater declare this function so we
// choose to not implement CommandUpdaterDelegate inside this class and // choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set). // therefore command_updater_ doesn't have the delegate set).
@@ -14,7 +14,7 @@ index 20fcf6172c577..d34843570fa35 100644
// No commands are enabled if there is not yet any selected tab. // No commands are enabled if there is not yet any selected tab.
// TODO(pkasting): It seems like we should not need this, because either // TODO(pkasting): It seems like we should not need this, because either
@@ -428,6 +430,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -396,6 +398,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id)) DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id; << "Invalid/disabled command " << id;
@@ -28,7 +28,7 @@ index 20fcf6172c577..d34843570fa35 100644
// The order of commands in this switch statement must match the function // The order of commands in this switch statement must match the function
// declaration order in browser.h! // declaration order in browser.h!
switch (id) { switch (id) {
@@ -1073,11 +1082,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( @@ -1038,11 +1047,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private: // BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() { bool BrowserCommandController::IsShowingMainUI() {

4
patch/patches/print_preview_123.patch
View File

@@ -118,7 +118,7 @@ index 7a3fbc44629e6..578422e85320a 100644
} }
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 8e55c46cdf29a..40957f570aba5 100644 index 2a9cc4d97e4f1..ab37659bcb720 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@@ -130,7 +130,7 @@ index 8e55c46cdf29a..40957f570aba5 100644
#include "chrome/browser/pdf/pdf_extension_util.h" #include "chrome/browser/pdf/pdf_extension_util.h"
#include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/background_printing_manager.h"
@@ -96,6 +97,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029"; @@ -96,6 +97,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Alt+P)"; const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
#endif #endif
+const char16_t* GetBasicPrintShortcut() { +const char16_t* GetBasicPrintShortcut() {

12
patch/patches/web_contents_1257_1565.patch
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 32817ef0eab0b..73f6dee57c0a1 100644 index 83710bb7c6123..01143dfa4c253 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
@@ -3079,6 +3079,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3091,6 +3091,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation, site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOpener(), primary_main_frame_policy); params.main_frame_name, GetOpener(), primary_main_frame_policy);
@@ -15,7 +15,7 @@ index 32817ef0eab0b..73f6dee57c0a1 100644
std::unique_ptr<WebContentsViewDelegate> delegate = std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3089,6 +3095,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3101,6 +3107,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 32817ef0eab0b..73f6dee57c0a1 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3267,6 +3274,9 @@ void WebContentsImpl::RenderWidgetCreated( @@ -3279,6 +3286,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 32817ef0eab0b..73f6dee57c0a1 100644
} }
void WebContentsImpl::RenderWidgetDeleted( void WebContentsImpl::RenderWidgetDeleted(
@@ -3993,6 +4003,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4005,6 +4015,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
params.pip_options->lock_aspect_ratio; params.pip_options->lock_aspect_ratio;
} }
@@ -49,7 +49,7 @@ index 32817ef0eab0b..73f6dee57c0a1 100644
std::unique_ptr<WebContentsImpl> new_contents; std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -7880,6 +7899,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -7892,6 +7911,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames). // frames).
SetFocusedFrameTree(node->frame_tree()); SetFocusedFrameTree(node->frame_tree());
} }