bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-03-12 01:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 104.0.5112.57

Browse Source
This commit is contained in:
Marshall Greenblatt 2022-07-21 13:33:42 +00:00 committed by Marshall Greenblatt
parent 43181176cf
commit 269879747d
7 changed files with 20 additions and 20 deletions
Show Stats 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
{
'chromium_checkout': 'refs/tags/104.0.5112.48',
'chromium_checkout': 'refs/tags/104.0.5112.57',
'depot_tools_checkout': '350d210871'
}

2
patch/patches/chrome_browser_permission_prompt.patch
View File

@ -62,7 +62,7 @@ index c2836d15eba30..0c03c2b4666a6 100644
std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt(
content::WebContents* web_contents,
diff --git chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
index acbfad1053e0b..d4e85938bfc46 100644
index cdbcb419fa22d..0c23d03e19798 100644
--- chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
+++ chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
@@ -100,11 +100,28 @@ bool ShouldBubbleStartOpen(permissions::PermissionPrompt::Delegate* delegate) {

22
patch/patches/chrome_runtime.patch
View File

@ -172,7 +172,7 @@ index 341458a637857..441708d4a301f 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 53f79904e486b..bbfc8f1267ea5 100644
index dd93c3e2f18f1..ac299c56f2cc3 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -30,6 +30,7 @@
@ -183,7 +183,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1288,6 +1289,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
@@ -1290,6 +1291,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
} // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -192,7 +192,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif
@@ -1313,6 +1316,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1315,6 +1318,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear();
}
@ -204,7 +204,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3800,9 +3808,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3802,9 +3810,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -216,7 +216,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5460,7 +5470,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5462,7 +5472,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service);
}
@ -225,7 +225,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -5478,6 +5488,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -5480,6 +5490,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -234,7 +234,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
}
std::vector<base::FilePath>
@@ -6352,10 +6364,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -6354,10 +6366,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -247,7 +247,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6374,7 +6386,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -6376,7 +6388,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -257,7 +257,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -6493,7 +6506,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -6495,7 +6508,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -267,7 +267,7 @@ index 53f79904e486b..bbfc8f1267ea5 100644
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
weak_factory_.GetWeakPtr(),
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index b619ac0c32215..d8b5452113b9e 100644
index 3a877063edf21..23e92c97a457a 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -288,7 +288,7 @@ index b619ac0c32215..d8b5452113b9e 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -909,7 +911,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -913,7 +915,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;

4
patch/patches/content_2015.patch
View File

@ -34,7 +34,7 @@ index 2bf604ee300d9..ded4a09961381 100644
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 69bcd725d0f86..a8456b3e8a941 100644
index c1beba6701e68..30e6edec72207 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@ -64,7 +64,7 @@ index 69bcd725d0f86..a8456b3e8a941 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index d0b7aed3162b8..c494e9618d9dc 100644
index a49794184baa9..449feae81a54d 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -33,6 +33,7 @@

2
patch/patches/embedder_product_override.patch
View File

@ -1,5 +1,5 @@
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index 5ceb4b3232d3e..6fc007e5a5589 100644
index 2b7545b767a7c..f0585a5bdcbb5 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@

2
patch/patches/print_preview_123.patch
View File

@ -46,7 +46,7 @@ index 01df55a728098..0c11458c9a5bb 100644
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/task_manager/web_contents_tags.h"
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index e665eb42fad5f..6aefc4f3f4ca6 100644
index 4bd871e5cadc6..835656ea87729 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -610,13 +610,14 @@ void PrintViewManagerBase::UpdatePrintSettings(

6
patch/patches/web_contents_1257_1565.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 33f6efe4df4ee..e07f9e28c0760 100644
index 141f6e137f2d7..e5505661da0e0 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -3036,6 +3036,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@ -33,7 +33,7 @@ index 33f6efe4df4ee..e07f9e28c0760 100644
}
void WebContentsImpl::RenderWidgetDeleted(
@@ -3937,6 +3947,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3943,6 +3953,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@ -49,7 +49,7 @@ index 33f6efe4df4ee..e07f9e28c0760 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7798,6 +7817,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7804,6 +7823,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames).
SetFocusedFrameTree(node->frame_tree());
}