diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 5986ca4ab..1390ab05e 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/99.0.4844.27', + 'chromium_checkout': 'refs/tags/99.0.4844.45', 'depot_tools_checkout': '289dedd36b' } diff --git a/libcef/browser/alloy/alloy_content_browser_client.cc b/libcef/browser/alloy/alloy_content_browser_client.cc index dec3fe7a5..2be2e93f8 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.cc +++ b/libcef/browser/alloy/alloy_content_browser_client.cc @@ -766,14 +766,6 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches( if (extensions::ExtensionsEnabled()) { content::RenderProcessHost* process = content::RenderProcessHost::FromID(child_process_id); -#if !BUILDFLAG(IS_WIN) - // kPdfRenderer will be set for Windows in - // RenderProcessHostImpl::AppendRendererCommandLine. - if (process && process->IsPdf()) { - command_line->AppendSwitch(switches::kPdfRenderer); - } -#endif // !BUILDFLAG(IS_WIN) - auto browser_context = process->GetBrowserContext(); CefBrowserContext* cef_browser_context = process ? CefBrowserContext::FromBrowserContext(browser_context) diff --git a/libcef/browser/chrome/chrome_content_browser_client_cef.cc b/libcef/browser/chrome/chrome_content_browser_client_cef.cc index fda807da8..ea0070d41 100644 --- a/libcef/browser/chrome/chrome_content_browser_client_cef.cc +++ b/libcef/browser/chrome/chrome_content_browser_client_cef.cc @@ -127,16 +127,6 @@ void ChromeContentBrowserClientCef::AppendExtraCommandLineSwitches( }; command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames, base::size(kSwitchNames)); - -#if !BUILDFLAG(IS_WIN) - // kPdfRenderer will be set for Windows in - // RenderProcessHostImpl::AppendRendererCommandLine. - content::RenderProcessHost* process = - content::RenderProcessHost::FromID(child_process_id); - if (process && process->IsPdf()) { - command_line->AppendSwitch(switches::kPdfRenderer); - } -#endif // !BUILDFLAG(IS_WIN) } CefRefPtr app = CefAppManager::Get()->GetApplication(); diff --git a/libcef/common/cef_switches.cc b/libcef/common/cef_switches.cc index e1b112cb5..337dedfb8 100644 --- a/libcef/common/cef_switches.cc +++ b/libcef/common/cef_switches.cc @@ -137,10 +137,4 @@ const char kFrameworkDirPath[] = "framework-dir-path"; const char kMainBundlePath[] = "main-bundle-path"; #endif -#if !BUILDFLAG(IS_WIN) -// Renderer process that runs the non-PPAPI PDF plugin. -// This is defined in content/public/common/content_switches.h for Windows. -const char kPdfRenderer[] = "pdf-renderer"; -#endif - } // namespace switches diff --git a/libcef/common/cef_switches.h b/libcef/common/cef_switches.h index ae450ab98..2f0a2eb2d 100644 --- a/libcef/common/cef_switches.h +++ b/libcef/common/cef_switches.h @@ -62,10 +62,6 @@ extern const char kFrameworkDirPath[]; extern const char kMainBundlePath[]; #endif -#if !BUILDFLAG(IS_WIN) -extern const char kPdfRenderer[]; -#endif - } // namespace switches #endif // CEF_LIBCEF_COMMON_CEF_SWITCHES_H_ diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 2d688b933..8f2329647 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 09b5c00891717..cfa169e00b104 100644 +index 4e7f448dda7d0..f87c49b796bd9 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 3fdf8fe21..d585f639f 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -125,7 +125,7 @@ index 8b72897491669..546919dd70afc 100644 // that the X-Frame-Options protection mechanism is set to either DENY or // SAMEORIGIN. diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index 9e2e8d1892366..262659f9e3204 100644 +index 034a223e5803f..98e7c82671f5c 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc @@ -940,6 +940,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 554356b83..b792eae0b 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -132,7 +132,7 @@ index 4e9969d9c5b0b..e599b114f021d 100644 GetMainRunLoopInstance()->QuitWhenIdleClosure()); } diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm -index dbd8f7ebe071d..b0f8d3d7bcff9 100644 +index 831d7173873d1..594aee58331a7 100644 --- chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm @@ -16,6 +16,7 @@ @@ -143,7 +143,7 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644 #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/browser_process.h" -@@ -110,6 +111,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { } } @@ -151,15 +151,15 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644 // Create the app delegate. This object is intentionally leaked as a global // singleton. It is accessed through -[NSApp delegate]. AppController* app_controller = [[AppController alloc] init]; -@@ -118,6 +120,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { chrome::BuildMainMenu(NSApp, app_controller, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false); [app_controller mainMenuCreated]; +#endif // BUILDFLAG(ENABLE_CEF) - PrefService* local_state = g_browser_process->local_state(); - DCHECK(local_state); -@@ -177,7 +180,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, + chrome::DeveloperIDCertificateReauthorizeInApp(); + +@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, } void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 8f6737aca..85b866013 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -66,10 +66,10 @@ index 982fbe8d3f0d0..e757be4688f10 100644 + "studio path") } diff --git chrome/app/framework.order chrome/app/framework.order -index 839144aa1e9bd..29c8ab32398a7 100644 +index f8f71ef369c08..7a2ed5da7bda3 100644 --- chrome/app/framework.order +++ chrome/app/framework.order -@@ -28,3 +28,8 @@ _ChromeMain +@@ -31,3 +31,8 @@ _ChromeMain _lprofDirMode ___llvm_profile_filename ___llvm_profile_raw_version