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

Update to Chromium version 101.0.4951.26

This commit is contained in:
Marshall Greenblatt 2022-04-07 14:51:46 +00:00 committed by Marshall Greenblatt
parent 54dd34e19b
commit 68a0a11815
8 changed files with 32 additions and 32 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/101.0.4951.15',
'chromium_checkout': 'refs/tags/101.0.4951.26',
'depot_tools_checkout': '7f02c0d981'
}

6
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 29f74fb8bedaa..2608ea2a70aca 100644
index 6e93d84600ea6..28811f8b7664f 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -37,6 +37,7 @@ import("//build/nocompile.gni")
@ -10,7 +10,7 @@ index 29f74fb8bedaa..2608ea2a70aca 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1896,7 +1897,11 @@ mixed_component("base") {
@@ -1895,7 +1896,11 @@ mixed_component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@ -23,7 +23,7 @@ index 29f74fb8bedaa..2608ea2a70aca 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -2150,6 +2155,12 @@ mixed_component("base") {
@@ -2149,6 +2154,12 @@ mixed_component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

6
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 9f43f67ddb16b..36f37256c29a4 100644
index 3e75521cfba38..318b58d0c069d 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index 9f43f67ddb16b..36f37256c29a4 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1921,6 +1922,7 @@ static_library("browser") {
@@ -1923,6 +1924,7 @@ static_library("browser") {
"//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@ -18,7 +18,7 @@ index 9f43f67ddb16b..36f37256c29a4 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2577,6 +2579,10 @@ static_library("browser") {
@@ -2580,6 +2582,10 @@ static_library("browser") {
deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
}

4
patch/patches/chrome_browser_net_export.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 8b45cdafec81d..2bf3e9957623d 100644
index 3078935563b84..57fbdc93ae5ad 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni")
@ -29,7 +29,7 @@ index 8b45cdafec81d..2bf3e9957623d 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5298,6 +5304,7 @@ static_library("ui") {
@@ -5299,6 +5305,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

22
patch/patches/chrome_runtime.patch
View File

@ -170,7 +170,7 @@ index 8bf722c61c059..ac755279227f2 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 8f28441f6639b..b23d0e2a11e87 100644
index 6ec5a66dcba33..be011c0719138 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@ -181,7 +181,7 @@ index 8f28441f6639b..b23d0e2a11e87 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"
@@ -1272,6 +1273,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
@@ -1275,6 +1276,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
} // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -190,7 +190,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif
@@ -1297,6 +1300,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1300,6 +1303,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear();
}
@ -202,7 +202,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3740,9 +3748,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3743,9 +3751,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -214,7 +214,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5369,7 +5379,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5372,7 +5382,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service);
}
@ -223,7 +223,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -5387,6 +5397,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -5390,6 +5400,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -232,7 +232,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
}
std::vector<base::FilePath>
@@ -6227,10 +6239,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -6271,10 +6283,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -245,7 +245,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6249,7 +6261,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -6293,7 +6305,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -255,7 +255,7 @@ index 8f28441f6639b..b23d0e2a11e87 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -6357,7 +6370,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -6401,7 +6414,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -265,7 +265,7 @@ index 8f28441f6639b..b23d0e2a11e87 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 4aa99834bd6c7..cd932dd3cacf4 100644
index e87e967efce09..5948dbc959683 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -120,6 +120,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -286,7 +286,7 @@ index 4aa99834bd6c7..cd932dd3cacf4 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -913,7 +915,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -917,7 +919,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,7 +34,7 @@ index 3f06e6b8cd335..257d3f20f92d7 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 2ba5cc555c691..a092c6ba09112 100644
index bf827fb6d8c2c..4a94f92d8b39e 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -11,7 +11,7 @@
@ -46,7 +46,7 @@ index 2ba5cc555c691..a092c6ba09112 100644
#include <utility>
@@ -892,7 +892,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -893,7 +893,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@ -55,7 +55,7 @@ index 2ba5cc555c691..a092c6ba09112 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -901,6 +901,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -902,6 +902,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@ -64,7 +64,7 @@ index 2ba5cc555c691..a092c6ba09112 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 5c757ff4b622d..1286b9c26f427 100644
index de15701d1e8f3..446333c87152f 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -34,6 +34,7 @@
@ -75,7 +75,7 @@ index 5c757ff4b622d..1286b9c26f427 100644
#include "content/public/browser/web_ui_browser_interface_broker_registry.h"
#include "content/public/common/alternative_error_page_override_info.mojom.h"
#include "content/public/common/main_function_params.h"
@@ -1668,7 +1669,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1669,7 +1670,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.
@ -84,7 +84,7 @@ index 5c757ff4b622d..1286b9c26f427 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1875,6 +1876,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1876,6 +1877,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -104,7 +104,7 @@ index 5c757ff4b622d..1286b9c26f427 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.
@@ -1936,6 +1950,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1937,6 +1951,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();

2
patch/patches/gn_config.patch
View File

@ -12,7 +12,7 @@ index 5356717746edd..6345b837a6ea6 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 7dd89e07a401a..a47e59d1e769a 100644
index be7d8478860ce..5c3281f22fc4f 100644
--- BUILD.gn
+++ BUILD.gn
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")

8
patch/patches/viz_osr_2575.patch
View File

@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
+ Draw(gfx.mojom.Rect damage_rect) => ();
};
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index b30b9460889b9..19d7967f4ef96 100644
index 2696c864d5e32..e4e7a01d24534 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -30,7 +30,9 @@
@ -227,7 +227,7 @@ index b30b9460889b9..19d7967f4ef96 100644
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom-forward.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -137,6 +139,14 @@ class COMPOSITOR_EXPORT ContextFactory {
@@ -138,6 +140,14 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0;
};
@ -242,7 +242,7 @@ index b30b9460889b9..19d7967f4ef96 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -178,6 +188,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
@@ -179,6 +189,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@ -252,7 +252,7 @@ index b30b9460889b9..19d7967f4ef96 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -466,6 +479,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
@@ -469,6 +482,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;