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

Update to Chromium version 98.0.4758.9

This commit is contained in:
Marshall Greenblatt 2021-12-18 20:30:37 -05:00
parent 2f5e1b621e
commit 5a865afa07
7 changed files with 20 additions and 19 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/98.0.4758.0'
'chromium_checkout': 'refs/tags/98.0.4758.9',
'depot_tools_checkout': 'db41eed6b7'
}

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index 2cf191150882d..81e7d98700fed 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 702428def0788..7056ce4e1c670 100644
index 733677a6e7b58..8f6a488dc23af 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -5906,6 +5906,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
@@ -5922,6 +5922,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
network::mojom::WebSandboxFlags sandbox_flags) {
// Calculate an approximation of the origin. The sandbox/csp are ignored.
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@ -36,7 +36,7 @@ index 702428def0788..7056ce4e1c670 100644
// Apply sandbox flags.
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
@@ -5939,6 +5945,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
@@ -5955,6 +5961,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin();

2
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 9a8b9fe835e74..9663c04f79f2e 100644
index 9702367345081..d43e8a4f1de43 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni")

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 cb8ecf2f81cb2..d3bdde2216222 100644
index 0cde2e77cdb18..94d4e8b6d234f 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -29,7 +29,7 @@ index cb8ecf2f81cb2..d3bdde2216222 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5181,6 +5187,7 @@ static_library("ui") {
@@ -5182,6 +5188,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

16
patch/patches/chrome_runtime.patch
View File

@ -78,7 +78,7 @@ index cd9b3030c6f3a..1dfa03db19ca8 100644
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index a0e5e4fd7d01d..dc1fc12234d59 100644
index 9c6b1148c3139..1b5a21a67ecff 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@ -89,7 +89,7 @@ index a0e5e4fd7d01d..dc1fc12234d59 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1700,11 +1701,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1699,11 +1700,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|.
@ -105,7 +105,7 @@ index a0e5e4fd7d01d..dc1fc12234d59 100644
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -1739,8 +1743,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1731,8 +1735,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@ -156,7 +156,7 @@ index 97afd5b1ba753..40672e7c4fdf3 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index d0eaa02d9f955..ce5d9aaaf4509 100644
index 968b63908b38e..3cbeacd8418e2 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@ -167,7 +167,7 @@ index d0eaa02d9f955..ce5d9aaaf4509 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"
@@ -3695,9 +3696,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3696,9 +3697,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // defined(OS_ANDROID)
@ -179,7 +179,7 @@ index d0eaa02d9f955..ce5d9aaaf4509 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5312,7 +5315,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5313,7 +5316,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service);
}
@ -188,7 +188,7 @@ index d0eaa02d9f955..ce5d9aaaf4509 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -5330,6 +5333,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -5331,6 +5334,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -198,7 +198,7 @@ index d0eaa02d9f955..ce5d9aaaf4509 100644
std::vector<base::FilePath>
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index ba04ad2b43f10..8a557d83b4339 100644
index 6a143a675b35e..cd76d6060d75e 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

4
patch/patches/content_2015.patch
View File

@ -30,7 +30,7 @@ index 6ed02d4244d45..68dff171001c7 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 b8b933d0160db..d450ef6ff5cc2 100644
index 491c969c55e64..b518a5daefb8c 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@ -60,7 +60,7 @@ index b8b933d0160db..d450ef6ff5cc2 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 4a3bbba844366..f5795c3ae1ce4 100644
index 2591d560ddbec..fea1e2058fba2 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -33,6 +33,7 @@

4
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 1876f324468dc..f22b44017b38a 100644
index 01051f333b15a..ede45b6c871d9 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@
@ -10,7 +10,7 @@ index 1876f324468dc..f22b44017b38a 100644
#include "components/embedder_support/switches.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -234,6 +235,12 @@ const blink::UserAgentBrandList& GetBrandFullVersionList(
@@ -256,6 +257,12 @@ const blink::UserAgentBrandList& GetBrandFullVersionList(
}
std::string GetProduct(const bool allow_version_override) {