bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 106.0.5249.12

This commit is contained in:
Marshall Greenblatt 2022-08-29 12:10:37 -04:00
parent 27d4f1fc97
commit 2301d8d345
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/106.0.5249.0'
'chromium_checkout': 'refs/tags/106.0.5249.12',
'depot_tools_checkout': 'b7ec673ccc'
}

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index 16119afeb8d57..dcfde693b8327 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 034915c79223e..1a6160b109583 100644
index 37434a26db44e..2e56f1b48f9e9 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -6518,6 +6518,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
@@ -6522,6 +6522,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
origin_and_debug_info.second += ", error";
}
@ -38,7 +38,7 @@ index 034915c79223e..1a6160b109583 100644
if (use_opaque_origin) {
origin_and_debug_info =
std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(),
@@ -6545,6 +6553,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
@@ -6549,6 +6557,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo(
SandboxFlagsToCommit());

4
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 3285e422f76c1..5f35b91897b75 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index c74b111116687..e71d33a11ebdc 100644
index 17c1f3e28c73a..c1f6e9395e68a 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 c74b111116687..e71d33a11ebdc 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5590,6 +5596,7 @@ static_library("ui") {
@@ -5592,6 +5598,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

20
patch/patches/chrome_runtime.patch
View File

@ -174,7 +174,7 @@ index 7ef669d52b306..8edc1aaeaff6a 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 0307113b4b0c0..260b5d6f3e645 100644
index 8ef1248e59485..d08d2be6be6e1 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -31,6 +31,7 @@
@ -206,7 +206,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3914,9 +3922,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3927,9 +3935,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -218,7 +218,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5605,7 +5615,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5618,7 +5628,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service);
}
@ -227,7 +227,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -5623,6 +5633,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -5636,6 +5646,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -236,7 +236,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
}
std::vector<base::FilePath>
@@ -6477,10 +6489,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -6490,10 +6502,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -249,7 +249,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6499,7 +6511,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -6512,7 +6524,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -259,7 +259,7 @@ index 0307113b4b0c0..260b5d6f3e645 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -6628,7 +6641,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -6641,7 +6654,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -269,7 +269,7 @@ index 0307113b4b0c0..260b5d6f3e645 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 d04de56a29cdd..bf16e1a41f7af 100644
index 32e6ff58ca147..d1e8f6a107924 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -281,7 +281,7 @@ index d04de56a29cdd..bf16e1a41f7af 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out
// to chrome/ to get values or notify about events, but both of these
// functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -582,7 +584,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -586,7 +588,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -290,7 +290,7 @@ index d04de56a29cdd..bf16e1a41f7af 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -924,7 +926,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -928,7 +930,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;

14
patch/patches/content_2015.patch
View File

@ -34,10 +34,10 @@ index 4f8967e57bbc3..281af1ce0c1cd 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 1958ddbba66ae..d5ffabfedbdd9 100644
index a9c96d4b46392..49fe19ded9ac2 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -939,7 +939,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -946,7 +946,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@ -46,7 +46,7 @@ index 1958ddbba66ae..d5ffabfedbdd9 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -948,6 +948,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -955,6 +955,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@ -55,7 +55,7 @@ index 1958ddbba66ae..d5ffabfedbdd9 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index cfb8d9af38d92..5be3ad23793f8 100644
index bac29d867e465..6d4636decae15 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -34,6 +34,7 @@
@ -66,7 +66,7 @@ index cfb8d9af38d92..5be3ad23793f8 100644
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
@@ -1727,7 +1728,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1734,7 +1735,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
@ -75,7 +75,7 @@ index cfb8d9af38d92..5be3ad23793f8 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1933,6 +1934,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1940,6 +1941,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -95,7 +95,7 @@ index cfb8d9af38d92..5be3ad23793f8 100644
// Creates an OverlayWindow to be used for video or document
// Picture-in-Picture respectively. This window will house the content shown
// when in Picture-in-Picture mode. This will return a new OverlayWindow.
@@ -1988,6 +2002,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1995,6 +2009,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();