bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 20:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 99.0.4844.0 (#961656)

Browse Source
This commit is contained in:
Marshall Greenblatt 2022-01-25 15:26:51 -05:00
parent c32f366dfa
commit 1e1133ec66
83 changed files with 664 additions and 717 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BUILD.gn
View File

@ -525,8 +525,6 @@ static_library("libcef_static") {
"libcef/browser/extensions/extension_web_contents_observer.h",
"libcef/browser/extensions/mime_handler_view_guest_delegate.cc",
"libcef/browser/extensions/mime_handler_view_guest_delegate.h",
"libcef/browser/extensions/pdf_web_contents_helper_client.cc",
"libcef/browser/extensions/pdf_web_contents_helper_client.h",
"libcef/browser/extensions/value_store/cef_value_store.cc",
"libcef/browser/extensions/value_store/cef_value_store.h",
"libcef/browser/extensions/value_store/cef_value_store_factory.cc",
@ -945,10 +943,6 @@ static_library("libcef_static") {
"libcef/browser/native/native_menu_win.h",
"libcef/browser/osr/browser_platform_delegate_osr_win.cc",
"libcef/browser/osr/browser_platform_delegate_osr_win.h",
# Part of //chrome/utility.
"//chrome/utility/printing_handler.cc",
"//chrome/utility/printing_handler.h",
]
deps += [
@ -1448,6 +1442,7 @@ make_pack_header("strings") {
"$root_gen_dir/components/strings/grit/components_strings.h",
"$root_gen_dir/extensions/strings/grit/extensions_strings.h",
"$root_gen_dir/services/strings/grit/services_strings.h",
"$root_gen_dir/third_party/blink/public/strings/grit/blink_accessibility_strings.h",
"$root_gen_dir/third_party/blink/public/strings/grit/blink_strings.h",
"$root_gen_dir/ui/strings/grit/ui_strings.h",
]
@ -1465,6 +1460,7 @@ make_pack_header("strings") {
"//extensions/strings",
"//services/strings",
"//third_party/blink/public/strings",
"//third_party/blink/public/strings:accessibility_strings",
"//ui/strings:app_locale_settings",
"//ui/strings:ui_strings",
]

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/98.0.4758.0'
'chromium_checkout': 'refs/tags/99.0.4844.0'
}

38
libcef/browser/alloy/alloy_browser_main.cc
View File

@ -57,7 +57,6 @@
#if BUILDFLAG(IS_WIN)
#include "chrome/browser/chrome_browser_main_win.h"
#include "chrome/browser/win/parental_controls.h"
#include "components/os_crypt/os_crypt.h"
#endif
#endif // defined(USE_AURA)
@ -74,10 +73,19 @@
#include "ui/base/ime/init/input_method_initializer.h"
#endif
#if BUILDFLAG(IS_LINUX)
#include "libcef/browser/printing/print_dialog_linux.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
#include "components/os_crypt/os_crypt.h"
#endif
#if BUILDFLAG(IS_LINUX)
#include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/grit/chromium_strings.h"
#include "components/os_crypt/key_storage_config_linux.h"
#include "libcef/browser/printing/print_dialog_linux.h"
#include "ui/base/l10n/l10n_util.h"
#endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM)
#include "chrome/browser/component_updater/media_foundation_widevine_cdm_component_installer.h"
#endif
@ -150,7 +158,29 @@ void AlloyBrowserMainParts::PostCreateMainMessageLoop() {
&CefPrintDialogLinux::CreatePrintDialog);
printing::PrintingContextLinux::SetPdfPaperSizeFunction(
&CefPrintDialogLinux::GetPdfPaperSize);
#endif
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
// network service for encrypted cookie storage.
// Based on ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop.
std::unique_ptr<os_crypt::Config> config =
std::make_unique<os_crypt::Config>();
// Forward to os_crypt the flag to use a specific password store.
config->store = command_line->GetSwitchValueASCII(switches::kPasswordStore);
// Forward the product name (defaults to "Chromium").
config->product_name = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
// OSCrypt may target keyring, which requires calls from the main thread.
config->main_thread_runner = content::GetUIThreadTaskRunner({});
// OSCrypt can be disabled in a special settings file.
config->should_use_preference =
command_line->HasSwitch(switches::kEnableEncryptionSelection);
base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
DCHECK(!config->user_data_path.empty());
OSCrypt::SetConfig(std::move(config));
#endif // BUILDFLAG(IS_LINUX)
}
int AlloyBrowserMainParts::PreCreateThreads() {

75
libcef/browser/alloy/alloy_content_browser_client.cc
View File

@ -108,6 +108,7 @@
#include "content/public/common/storage_quota_params.h"
#include "content/public/common/url_constants.h"
#include "content/public/common/user_agent.h"
#include "crypto/crypto_buildflags.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_message_filter.h"
#include "extensions/browser/extension_protocols.h"
@ -160,7 +161,7 @@
#include "sandbox/win/src/sandbox_policy.h"
#endif
#if defined(USE_NSS_CERTS)
#if BUILDFLAG(USE_NSS_CERTS)
#include "net/ssl/client_cert_store_nss.h"
#endif
@ -576,18 +577,6 @@ bool AlloyContentBrowserClient::DoesSiteRequireDedicatedProcess(
browser_context, effective_site_url);
}
bool AlloyContentBrowserClient::ShouldLockProcessToSite(
content::BrowserContext* browser_context,
const GURL& effective_site_url) {
if (extensions::ExtensionsEnabled()) {
return extensions::ChromeContentBrowserClientExtensionsPart::
ShouldLockProcessToSite(browser_context, effective_site_url);
}
return content::ContentBrowserClient::ShouldLockProcessToSite(
browser_context, effective_site_url);
}
bool AlloyContentBrowserClient::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
base::StringPiece scheme,
bool is_embedded_origin_secure) {
@ -1055,33 +1044,35 @@ AlloyContentBrowserClient::CreateDevToolsManagerDelegate() {
return std::make_unique<CefDevToolsManagerDelegate>();
}
bool AlloyContentBrowserClient::BindAssociatedReceiverFromFrame(
content::RenderFrameHost* render_frame_host,
const std::string& interface_name,
mojo::ScopedInterfaceEndpointHandle* handle) {
if (interface_name == extensions::mojom::LocalFrameHost::Name_) {
extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>(
std::move(*handle)),
render_frame_host);
return true;
}
if (interface_name == printing::mojom::PrintManagerHost::Name_) {
printing::CefPrintViewManager::BindPrintManagerHost(
mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost>(
std::move(*handle)),
render_frame_host);
return true;
}
if (interface_name == pdf::mojom::PdfService::Name_) {
pdf::PDFWebContentsHelper::BindPdfService(
mojo::PendingAssociatedReceiver<pdf::mojom::PdfService>(
std::move(*handle)),
render_frame_host);
return true;
}
void AlloyContentBrowserClient::
RegisterAssociatedInterfaceBindersForRenderFrameHost(
content::RenderFrameHost& render_frame_host,
blink::AssociatedInterfaceRegistry& associated_registry) {
associated_registry.AddInterface(base::BindRepeating(
[](content::RenderFrameHost* render_frame_host,
mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>
receiver) {
extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
std::move(receiver), render_frame_host);
},
&render_frame_host));
return false;
associated_registry.AddInterface(base::BindRepeating(
[](content::RenderFrameHost* render_frame_host,
mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost>
receiver) {
printing::CefPrintViewManager::BindPrintManagerHost(std::move(receiver),
render_frame_host);
},
&render_frame_host));
associated_registry.AddInterface(base::BindRepeating(
[](content::RenderFrameHost* render_frame_host,
mojo::PendingAssociatedReceiver<pdf::mojom::PdfService> receiver) {
pdf::PDFWebContentsHelper::BindPdfService(std::move(receiver),
render_frame_host);
},
&render_frame_host));
}
std::vector<std::unique_ptr<content::NavigationThrottle>>
@ -1183,7 +1174,7 @@ std::unique_ptr<net::ClientCertStore>
AlloyContentBrowserClient::CreateClientCertStore(
content::BrowserContext* browser_context) {
// Match the logic in ProfileNetworkContextService::CreateClientCertStore.
#if defined(USE_NSS_CERTS)
#if BUILDFLAG(USE_NSS_CERTS)
// TODO: Add support for client implementation of crypto password dialog.
return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
net::ClientCertStoreNSS::PasswordDelegateFactory()));
@ -1230,6 +1221,7 @@ void AlloyContentBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
void AlloyContentBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
int render_process_id,
int render_frame_id,
const absl::optional<url::Origin>& request_initiator_origin,
NonNetworkURLLoaderFactoryMap* factories) {
if (!extensions::ExtensionsEnabled())
return;
@ -1385,6 +1377,7 @@ bool AlloyContentBrowserClient::HandleExternalProtocol(
ui::PageTransition page_transition,
bool has_user_gesture,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
// Call the other HandleExternalProtocol variant.
return false;
@ -1396,6 +1389,8 @@ bool AlloyContentBrowserClient::HandleExternalProtocol(
content::NavigationUIData* navigation_data,
network::mojom::WebSandboxFlags sandbox_flags,
const network::ResourceRequest& resource_request,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =
out_factory->InitWithNewPipeAndPassReceiver();

13
libcef/browser/alloy/alloy_content_browser_client.h
View File

@ -43,8 +43,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
const GURL& site_url) override;
bool DoesSiteRequireDedicatedProcess(content::BrowserContext* browser_context,
const GURL& effective_site_url) override;
bool ShouldLockProcessToSite(content::BrowserContext* browser_context,
const GURL& effective_site_url) override;
bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
base::StringPiece scheme,
bool is_embedded_origin_secure) override;
@ -119,10 +117,9 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
std::unique_ptr<content::DevToolsManagerDelegate>
CreateDevToolsManagerDelegate() override;
bool BindAssociatedReceiverFromFrame(
content::RenderFrameHost* render_frame_host,
const std::string& interface_name,
mojo::ScopedInterfaceEndpointHandle* handle) override;
void RegisterAssociatedInterfaceBindersForRenderFrameHost(
content::RenderFrameHost& render_frame_host,
blink::AssociatedInterfaceRegistry& associated_registry) override;
std::vector<std::unique_ptr<content::NavigationThrottle>>
CreateThrottlesForNavigation(
content::NavigationHandle* navigation_handle) override;
@ -169,6 +166,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
void RegisterNonNetworkSubresourceURLLoaderFactories(
int render_process_id,
int render_frame_id,
const absl::optional<url::Origin>& request_initiator_origin,
NonNetworkURLLoaderFactoryMap* factories) override;
bool WillCreateURLLoaderFactory(
content::BrowserContext* browser_context,
@ -205,6 +203,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
ui::PageTransition page_transition,
bool has_user_gesture,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
override;
bool HandleExternalProtocol(
@ -213,6 +212,8 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
content::NavigationUIData* navigation_data,
network::mojom::WebSandboxFlags sandbox_flags,
const network::ResourceRequest& request,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
override;
std::unique_ptr<content::OverlayWindow> CreateWindowForPictureInPicture(

4
libcef/browser/chrome/chrome_browser_context.cc
View File

@ -8,9 +8,9 @@
#include "base/threading/thread_restrictions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
#include "chrome/browser/profiles/off_the_record_profile_impl.h"
#include "chrome/browser/profiles/profile_keep_alive_types.h"
#include "chrome/browser/profiles/scoped_profile_keep_alive.h"
ChromeBrowserContext::ChromeBrowserContext(
const CefRequestContextSettings& settings)

6
libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc
View File

@ -15,7 +15,11 @@ ChromeBrowserMainExtraPartsCef::ChromeBrowserMainExtraPartsCef() = default;
ChromeBrowserMainExtraPartsCef::~ChromeBrowserMainExtraPartsCef() = default;
void ChromeBrowserMainExtraPartsCef::PostProfileInit() {
void ChromeBrowserMainExtraPartsCef::PostProfileInit(Profile* profile,
bool is_initial_profile) {
if (!is_initial_profile)
return;
CefRequestContextSettings settings;
CefContext::Get()->PopulateGlobalRequestContextSettings(&settings);

2
libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h
View File

@ -41,7 +41,7 @@ class ChromeBrowserMainExtraPartsCef : public ChromeBrowserMainExtraParts {
private:
// ChromeBrowserMainExtraParts overrides.
void PostProfileInit() override;
void PostProfileInit(Profile* profile, bool is_initial_profile) override;
void PreMainMessageLoopRun() override;
CefRefPtr<CefRequestContextImpl> global_request_context_;

26
libcef/browser/chrome/chrome_content_browser_client_cef.cc
View File

@ -36,6 +36,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/weak_document_ptr.h"
#include "content/public/common/content_switches.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
@ -48,7 +49,15 @@ void HandleExternalProtocolHelper(
int frame_tree_node_id,
content::NavigationUIData* navigation_data,
network::mojom::WebSandboxFlags sandbox_flags,
const network::ResourceRequest& resource_request) {
const network::ResourceRequest& resource_request,
const absl::optional<url::Origin>& initiating_origin,
content::WeakDocumentPtr initiator_document) {
// May return nullptr if frame has been deleted or a cross-document navigation
// has committed in the same RenderFrameHost.
auto initiator_rfh = initiator_document.AsRenderFrameHostIfValid();
if (!initiator_rfh)
return;
// Match the logic of the original call in
// NavigationURLLoaderImpl::PrepareForNonInterceptedRequest.
self->HandleExternalProtocol(
@ -59,7 +68,7 @@ void HandleExternalProtocolHelper(
static_cast<int>(blink::mojom::ResourceType::kMainFrame),
sandbox_flags,
static_cast<ui::PageTransition>(resource_request.transition_type),
resource_request.has_user_gesture, resource_request.request_initiator,
resource_request.has_user_gesture, initiating_origin, initiator_rfh,
nullptr);
}
@ -257,6 +266,7 @@ bool ChromeContentBrowserClientCef::HandleExternalProtocol(
ui::PageTransition page_transition,
bool has_user_gesture,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
// |out_factory| will be non-nullptr when this method is initially called
// from NavigationURLLoaderImpl::PrepareForNonInterceptedRequest.
@ -271,7 +281,7 @@ bool ChromeContentBrowserClientCef::HandleExternalProtocol(
return ChromeContentBrowserClient::HandleExternalProtocol(
url, web_contents_getter, child_id, frame_tree_node_id, navigation_data,
is_main_frame, sandbox_flags, page_transition, has_user_gesture,
initiating_origin, nullptr);
initiating_origin, initiator_document, nullptr);
}
bool ChromeContentBrowserClientCef::HandleExternalProtocol(
@ -280,16 +290,24 @@ bool ChromeContentBrowserClientCef::HandleExternalProtocol(
content::NavigationUIData* navigation_data,
network::mojom::WebSandboxFlags sandbox_flags,
const network::ResourceRequest& resource_request,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =
out_factory->InitWithNewPipeAndPassReceiver();
auto weak_initiator_document = initiator_document
? initiator_document->GetWeakDocumentPtr()
: content::WeakDocumentPtr();
// HandleExternalProtocolHelper may be called if nothing handles the request.
auto request_handler = net_service::CreateInterceptedRequestHandler(
web_contents_getter, frame_tree_node_id, resource_request,
base::BindRepeating(HandleExternalProtocolHelper, base::Unretained(this),
web_contents_getter, frame_tree_node_id,
navigation_data, sandbox_flags, resource_request));
navigation_data, sandbox_flags, resource_request,
initiating_origin,
std::move(weak_initiator_document)));
net_service::ProxyURLLoaderFactory::CreateProxy(
web_contents_getter, std::move(receiver), std::move(request_handler));

3
libcef/browser/chrome/chrome_content_browser_client_cef.h
View File

@ -71,6 +71,7 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
ui::PageTransition page_transition,
bool has_user_gesture,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
override;
bool HandleExternalProtocol(
@ -79,6 +80,8 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
content::NavigationUIData* navigation_data,
network::mojom::WebSandboxFlags sandbox_flags,
const network::ResourceRequest& request,
const absl::optional<url::Origin>& initiating_origin,
content::RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
override;
std::vector<std::unique_ptr<content::NavigationThrottle>>

6
libcef/browser/devtools/devtools_file_manager.cc
View File

@ -77,8 +77,8 @@ void CefDevToolsFileManager::Save(const std::string& url,
return;
}
const base::DictionaryValue* file_map =
prefs_->GetDictionary(prefs::kDevToolsEditedFiles);
const base::DictionaryValue* file_map = &base::Value::AsDictionaryValue(
*prefs_->GetDictionary(prefs::kDevToolsEditedFiles));
base::FilePath initial_path;
const base::Value* path_value;
@ -144,7 +144,7 @@ void CefDevToolsFileManager::SaveAsFileSelected(const std::string& url,
saved_files_[url] = path;
DictionaryPrefUpdate update(prefs_, prefs::kDevToolsEditedFiles);
base::DictionaryValue* files_map = update.Get();
base::Value* files_map = update.Get();
files_map->SetKey(base::MD5String(url), base::FilePathToValue(path));
std::string file_system_path = path.AsUTF8Unsafe();
std::move(callback).Run(file_system_path);

2
libcef/browser/extensions/extension_web_contents_observer.cc
View File

@ -16,6 +16,8 @@ namespace extensions {
CefExtensionWebContentsObserver::CefExtensionWebContentsObserver(
content::WebContents* web_contents)
: ExtensionWebContentsObserver(web_contents),
content::WebContentsUserData<CefExtensionWebContentsObserver>(
*web_contents),
script_executor_(new ScriptExecutor(web_contents)) {}
CefExtensionWebContentsObserver::~CefExtensionWebContentsObserver() {}

4
libcef/browser/extensions/extensions_api_client.cc
View File

@ -10,10 +10,10 @@
#include "libcef/browser/extensions/api/storage/sync_value_store_cache.h"
#include "libcef/browser/extensions/extension_web_contents_observer.h"
#include "libcef/browser/extensions/mime_handler_view_guest_delegate.h"
#include "libcef/browser/extensions/pdf_web_contents_helper_client.h"
#include "libcef/browser/printing/print_view_manager.h"
#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
#include "components/zoom/zoom_controller.h"
@ -57,7 +57,7 @@ void CefExtensionsAPIClient::AttachWebContentsHelpers(
// Used by the PDF extension.
pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
web_contents, std::unique_ptr<pdf::PDFWebContentsHelperClient>(
new CefPDFWebContentsHelperClient()));
new ChromePDFWebContentsHelperClient()));
// Used by the tabs extension API.
zoom::ZoomController::CreateForWebContents(web_contents);

33
libcef/browser/extensions/pdf_web_contents_helper_client.cc
View File

@ -1,33 +0,0 @@
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "libcef/browser/extensions/pdf_web_contents_helper_client.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
namespace extensions {
CefPDFWebContentsHelperClient::CefPDFWebContentsHelperClient() {}
CefPDFWebContentsHelperClient::~CefPDFWebContentsHelperClient() {}
void CefPDFWebContentsHelperClient::UpdateContentRestrictions(
content::WebContents* contents,
int content_restrictions) {}
void CefPDFWebContentsHelperClient::OnPDFHasUnsupportedFeature(
content::WebContents* contents) {}
void CefPDFWebContentsHelperClient::OnSaveURL(content::WebContents* contents) {}
void CefPDFWebContentsHelperClient::SetPluginCanSave(
content::WebContents* contents,
bool can_save) {
auto* guest_view =
extensions::MimeHandlerViewGuest::FromWebContents(contents);
if (guest_view)
guest_view->SetPluginCanSave(can_save);
}
} // namespace extensions

33
libcef/browser/extensions/pdf_web_contents_helper_client.h
View File

@ -1,33 +0,0 @@
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_PDF_WEB_CONTENTS_HELPER_CLIENT_H_
#define CEF_LIBCEF_BROWSER_EXTENSIONS_PDF_WEB_CONTENTS_HELPER_CLIENT_H_
#include "components/pdf/browser/pdf_web_contents_helper_client.h"
namespace extensions {
class CefPDFWebContentsHelperClient : public pdf::PDFWebContentsHelperClient {
public:
CefPDFWebContentsHelperClient();
CefPDFWebContentsHelperClient(const CefPDFWebContentsHelperClient&) = delete;
CefPDFWebContentsHelperClient& operator=(
const CefPDFWebContentsHelperClient&) = delete;
~CefPDFWebContentsHelperClient() override;
private:
// pdf::PDFWebContentsHelperClient:
void UpdateContentRestrictions(content::WebContents* contents,
int content_restrictions) override;
void OnPDFHasUnsupportedFeature(content::WebContents* contents) override;
void OnSaveURL(content::WebContents* contents) override;
void SetPluginCanSave(content::WebContents* contents, bool can_save) override;
};
} // namespace extensions
#endif // CEF_LIBCEF_BROWSER_EXTENSIONS_PDF_WEB_CONTENTS_HELPER_CLIENT_H_

5
libcef/browser/media_router/media_router_manager.cc
View File

@ -28,9 +28,8 @@ class CefMediaRoutesObserver : public media_router::MediaRoutesObserver {
CefMediaRoutesObserver(const CefMediaRoutesObserver&) = delete;
CefMediaRoutesObserver& operator=(const CefMediaRoutesObserver&) = delete;
void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
const std::vector<media_router::MediaRoute::Id>&
joinable_route_ids) override {
void OnRoutesUpdated(
const std::vector<media_router::MediaRoute>& routes) override {
manager_->routes_ = routes;
manager_->NotifyCurrentRoutes();
}

1
libcef/browser/media_router/media_sink_impl.cc
View File

@ -8,6 +8,7 @@
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h"
#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h"
#include "chrome/browser/media/router/providers/cast/dual_media_sink_service.h"
#include "components/media_router/common/discovery/media_sink_internal.h"
#include "components/media_router/common/discovery/media_sink_service_base.h"

33
libcef/browser/native/native_menu_win.cc
View File

@ -299,27 +299,9 @@ class CefNativeMenuWin::MenuHostWindow {
ui::NativeTheme* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
// Logic from Widget::GetColorProviderKey() prior to
// https://crrev.com/e24ffe177b.
// TODO(cef): Use |native_theme->GetColorProviderKey(nullptr)| after M97
// Chromium update.
const auto color_scheme = native_theme->GetDefaultSystemColorScheme();
ui::ColorProviderManager::Key color_provider_key(
(color_scheme == ui::NativeTheme::ColorScheme::kDark)
? ui::ColorProviderManager::ColorMode::kDark
: ui::ColorProviderManager::ColorMode::kLight,
(color_scheme ==
ui::NativeTheme::ColorScheme::kPlatformHighContrast)
? ui::ColorProviderManager::ContrastMode::kHigh
: ui::ColorProviderManager::ContrastMode::kNormal,
native_theme->is_custom_system_theme()
? ui::ColorProviderManager::SystemTheme::kCustom
: ui::ColorProviderManager::SystemTheme::kDefault,
/*custom_theme=*/nullptr);
auto* color_provider =
ui::ColorProviderManager::Get().GetColorProviderFor(
color_provider_key);
native_theme->GetColorProviderKey(nullptr));
// We currently don't support items with both icons and checkboxes.
const gfx::ImageSkia skia_icon =
@ -363,10 +345,15 @@ class CefNativeMenuWin::MenuHostWindow {
// Draw the background and the check.
ui::NativeTheme* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
native_theme->Paint(&paint_canvas, NativeTheme::kMenuCheckBackground,
state, bounds, extra);
native_theme->Paint(&paint_canvas, NativeTheme::kMenuCheck, state,
bounds, extra);
auto* color_provider =
ui::ColorProviderManager::Get().GetColorProviderFor(
native_theme->GetColorProviderKey(nullptr));
native_theme->Paint(&paint_canvas, color_provider,
NativeTheme::kMenuCheckBackground, state, bounds,
extra);
native_theme->Paint(&paint_canvas, color_provider,
NativeTheme::kMenuCheck, state, bounds, extra);
// Draw checkbox to menu.
DrawToNativeContext(

2
libcef/browser/printing/print_view_manager.cc
View File

@ -206,7 +206,7 @@ bool CefPrintViewManager::PrintToPDF(content::RenderFrameHost* rfh,
return false;
// Don't print crashed tabs.
if (!web_contents() || web_contents()->IsCrashed()) {
if (!web_contents() || web_contents()->IsCrashed() || !rfh->IsRenderFrameLive()) {
return false;
}

28
libcef/browser/request_context_impl.cc
View File

@ -54,32 +54,6 @@ const char* GetTypeString(base::Value::Type type) {
return "UNKNOWN";
}
// Helper for HostResolver::Resolve.
struct ResolveHostHelperOld {
explicit ResolveHostHelperOld(CefRefPtr<CefResolveCallback> callback)
: callback_(callback) {}
void OnResolveCompleted(int result) {
std::vector<CefString> resolved_ips;
absl::optional<net::AddressList> maybe_address_list =
request_->GetAddressResults();
if (maybe_address_list) {
net::AddressList::const_iterator iter = maybe_address_list->begin();
for (; iter != maybe_address_list->end(); ++iter)
resolved_ips.push_back(iter->ToStringWithoutPort());
}
CEF_POST_TASK(
CEF_UIT,
base::BindOnce(&CefResolveCallback::OnResolveCompleted, callback_,
static_cast<cef_errorcode_t>(result), resolved_ips));
delete this;
}
CefRefPtr<CefResolveCallback> callback_;
std::unique_ptr<net::HostResolver::ResolveHostRequest> request_;
};
class ResolveHostHelper : public network::ResolveHostClientBase {
public:
explicit ResolveHostHelper(CefRefPtr<CefResolveCallback> callback)
@ -416,7 +390,7 @@ CefRefPtr<CefValue> CefRequestContextImpl::GetPreference(
const PrefService::Preference* pref = pref_service->FindPreference(name);
if (!pref)
return nullptr;
return new CefValueImpl(pref->GetValue()->DeepCopy());
return new CefValueImpl(pref->GetValue()->CreateDeepCopy().release());
}
CefRefPtr<CefDictionaryValue> CefRequestContextImpl::GetAllPreferences(

4
libcef/common/extensions/extensions_client.cc
View File

@ -88,9 +88,9 @@ const GURL& CefExtensionsClient::GetWebstoreUpdateURL() const {
return webstore_update_url_;
}
bool CefExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
bool CefExtensionsClient::IsBlocklistUpdateURL(const GURL& url) const {
// TODO(rockot): Maybe we want to do something else here. For now we accept
// any URL as a blacklist URL because we don't really care.
// any URL as a blocklist URL because we don't really care.
return true;
}

2
libcef/common/extensions/extensions_client.h
View File

@ -40,7 +40,7 @@ class CefExtensionsClient : public ExtensionsClient {
bool IsScriptableURL(const GURL& url, std::string* error) const override;
const GURL& GetWebstoreBaseURL() const override;
const GURL& GetWebstoreUpdateURL() const override;
bool IsBlacklistUpdateURL(const GURL& url) const override;
bool IsBlocklistUpdateURL(const GURL& url) const override;
private:
const ChromePermissionMessageProvider permission_message_provider_;

41
libcef/common/values_impl.cc
View File

@ -42,7 +42,7 @@ CefRefPtr<CefValue> CefValueImpl::GetOrCreateRefOrCopy(
list_value, parent_value, read_only, controller));
}
return new CefValueImpl(value->DeepCopy());
return new CefValueImpl(value->CreateDeepCopy().release());
}
CefValueImpl::CefValueImpl() {}
@ -86,7 +86,7 @@ base::Value* CefValueImpl::CopyOrDetachValue(
->CopyOrDetachValue(new_controller);
}
return value_->DeepCopy();
return value_->CreateDeepCopy().release();
}
void CefValueImpl::SwapValue(base::Value* new_value,
@ -203,7 +203,7 @@ CefRefPtr<CefValue> CefValueImpl::Copy() {
if (list_value_)
return new CefValueImpl(list_value_->Copy());
if (value_)
return new CefValueImpl(value_->DeepCopy());
return new CefValueImpl(value_->CreateDeepCopy().release());
return new CefValueImpl();
}
@ -460,7 +460,7 @@ CefBinaryValueImpl::CefBinaryValueImpl(char* data, size_t data_size)
base::Value* CefBinaryValueImpl::CopyValue() {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
return const_value().DeepCopy();
return const_value().CreateDeepCopy().release();
}
base::Value* CefBinaryValueImpl::CopyOrDetachValue(
@ -528,8 +528,9 @@ bool CefBinaryValueImpl::IsEqual(CefRefPtr<CefBinaryValue> that) {
CefRefPtr<CefBinaryValue> CefBinaryValueImpl::Copy() {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
return new CefBinaryValueImpl(const_value().DeepCopy(), nullptr,
CefBinaryValueImpl::kOwnerWillDelete, nullptr);
return new CefBinaryValueImpl(const_value().CreateDeepCopy().release(),
nullptr, CefBinaryValueImpl::kOwnerWillDelete,
nullptr);
}
size_t CefBinaryValueImpl::GetSize() {
@ -602,7 +603,7 @@ CefDictionaryValueImpl::CefDictionaryValueImpl(base::DictionaryValue* value,
base::DictionaryValue* CefDictionaryValueImpl::CopyValue() {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
return const_value().DeepCopy();
return const_value().CreateDeepCopy().release();
}
base::DictionaryValue* CefDictionaryValueImpl::CopyOrDetachValue(
@ -682,7 +683,7 @@ CefRefPtr<CefDictionaryValue> CefDictionaryValueImpl::Copy(
.DeepCopyWithoutEmptyChildren()
.release();
} else {
value = const_value().DeepCopy();
value = const_value().CreateDeepCopy().release();
}
return new CefDictionaryValueImpl(
@ -1026,7 +1027,8 @@ CefListValueImpl::CefListValueImpl(base::ListValue* value,
base::ListValue* CefListValueImpl::CopyValue() {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
return static_cast<base::ListValue*>(const_value().DeepCopy());
return static_cast<base::ListValue*>(
const_value().CreateDeepCopy().release());
}
base::ListValue* CefListValueImpl::CopyOrDetachValue(
@ -1100,8 +1102,8 @@ CefRefPtr<CefListValue> CefListValueImpl::Copy() {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
return new CefListValueImpl(
static_cast<base::ListValue*>(const_value().DeepCopy()), nullptr,
CefListValueImpl::kOwnerWillDelete, false, nullptr);
static_cast<base::ListValue*>(const_value().CreateDeepCopy().release()),
nullptr, CefListValueImpl::kOwnerWillDelete, false, nullptr);
}
bool CefListValueImpl::SetSize(size_t size) {
@ -1114,7 +1116,11 @@ bool CefListValueImpl::SetSize(size_t size) {
RemoveInternal(i);
} else if (size > 0) {
// Expand the list size.
mutable_value()->Set(size - 1, std::make_unique<base::Value>());
// TODO: This approach seems inefficient. See https://crbug.com/1187066#c17
// for background.
auto list = mutable_value()->GetList();
while (list.size() < size)
mutable_value()->Append(base::Value());
}
return true;
}
@ -1387,12 +1393,19 @@ bool CefListValueImpl::RemoveInternal(size_t index) {
base::Value* CefListValueImpl::SetInternal(size_t index, base::Value* value) {
DCHECK(value);
auto list = mutable_value()->GetList();
if (RemoveInternal(index)) {
auto list = mutable_value()->GetList();
CHECK_LE(index, list.size());
mutable_value()->Insert(list.begin() + index, std::move(*value));
} else {
mutable_value()->Set(index, base::WrapUnique(value));
if (index >= list.size()) {
// Expand the list size.
// TODO: This approach seems inefficient. See
// https://crbug.com/1187066#c17 for background.
while (list.size() <= index)
mutable_value()->Append(base::Value());
}
list[index] = std::move(*value);
}
// base::Value now uses move semantics which means that Insert()/Set() will

1
libcef/renderer/extensions/extensions_renderer_client.cc
View File

@ -9,7 +9,6 @@
#include "base/stl_util.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/extension_process_policy.h"
#include "chrome/renderer/extensions/resource_request_policy.h"
#include "components/guest_view/renderer/guest_view_container_dispatcher.h"
#include "content/public/common/content_constants.h"

5
patch/patch.cfg
View File

@ -138,11 +138,6 @@ patches = [
# https://codereview.chromium.org/208313009
'name': 'ui_dragdrop_355390',
},
{
# Fix placement of IME window on Windows.
# https://bitbucket.org/chromiumembedded/cef/issue/1610
'name': 'ime_1610',
},
{
# Split content::ContentMain into the separate steps required by CEF.
# https://bugs.chromium.org/p/chromium/issues/detail?id=654986#c17

10
patch/patches/base_command_line_1872.patch
View File

@ -1,16 +1,16 @@
diff --git base/command_line.cc base/command_line.cc
index 23e663d81584f..46972a8c42f03 100644
index 8f26e95cc6c57..141eea233470a 100644
--- base/command_line.cc
+++ base/command_line.cc
@@ -338,11 +338,10 @@ void CommandLine::AppendSwitchPath(StringPiece switch_string,
@@ -337,11 +337,10 @@ void CommandLine::AppendSwitchPath(StringPiece switch_string,
void CommandLine::AppendSwitchNative(StringPiece switch_string,
CommandLine::StringPieceType value) {
-#if defined(OS_WIN)
-#if BUILDFLAG(IS_WIN)
const std::string switch_key = ToLowerASCII(switch_string);
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
StringType combined_switch_string(UTF8ToWide(switch_key));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
- StringPiece switch_key = switch_string;
StringType combined_switch_string(switch_key);
#endif

32
patch/patches/base_sandbox_2743.patch
View File

@ -1,16 +1,16 @@
diff --git base/BUILD.gn base/BUILD.gn
index b534e4f3c02e9..0f162c348e2d9 100644
index dbef16bc35790..4343b1759c757 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -35,6 +35,7 @@ import("//build/config/ui.gni")
import("//build/nocompile.gni")
@@ -36,6 +36,7 @@ import("//build/nocompile.gni")
import("//build/rust/mixed_component.gni")
import("//build/timestamp.gni")
import("//build_overrides/build.gni")
+import("//cef/libcef/features/features.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1823,7 +1824,11 @@ component("base") {
@@ -1867,7 +1868,11 @@ mixed_component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@ -23,7 +23,7 @@ index b534e4f3c02e9..0f162c348e2d9 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -2072,6 +2077,12 @@ component("base") {
@@ -2116,6 +2121,12 @@ mixed_component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}
@ -37,7 +37,7 @@ index b534e4f3c02e9..0f162c348e2d9 100644
"cfgmgr32.lib",
"powrprof.lib",
diff --git base/hash/md5.h base/hash/md5.h
index 8a49f08dcb04d..2f03d7a6d1b34 100644
index ea6bbd31e3fc8..9941050ac0113 100644
--- base/hash/md5.h
+++ base/hash/md5.h
@@ -10,8 +10,9 @@
@ -46,28 +46,28 @@ index 8a49f08dcb04d..2f03d7a6d1b34 100644
#include "build/build_config.h"
+#include "cef/libcef/features/features.h"
-#if defined(OS_NACL)
+#if defined(OS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
-#if BUILDFLAG(IS_NACL)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
#include "base/hash/md5_nacl.h"
#else
#include "base/hash/md5_boringssl.h"
diff --git base/hash/sha1.h base/hash/sha1.h
index 5bb10fe069850..206344d0fd3b1 100644
index c4e656b9a68ef..8eb01343cd5d1 100644
--- base/hash/sha1.h
+++ base/hash/sha1.h
@@ -14,7 +14,9 @@
#include "base/containers/span.h"
#include "base/strings/string_piece.h"
#include "build/build_config.h"
-#if defined(OS_NACL)
-#if BUILDFLAG(IS_NACL)
+#include "cef/libcef/features/features.h"
+
+#if defined(OS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
#include "base/hash/sha1_nacl.h"
#else
#include "base/hash/sha1_boringssl.h"
diff --git base/unguessable_token.cc base/unguessable_token.cc
index d156be5597625..fc753a2ceb88a 100644
index 04ea514c6ce35..4f69b8a7f87f3 100644
--- base/unguessable_token.cc
+++ base/unguessable_token.cc
@@ -9,8 +9,9 @@
@ -76,8 +76,8 @@ index d156be5597625..fc753a2ceb88a 100644
#include "build/build_config.h"
+#include "cef/libcef/features/features.h"
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
#include "third_party/boringssl/src/include/openssl/mem.h"
#endif
@ -85,8 +85,8 @@ index d156be5597625..fc753a2ceb88a 100644
}
bool UnguessableToken::operator==(const UnguessableToken& other) const {
-#if defined(OS_NACL)
+#if defined(OS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
-#if BUILDFLAG(IS_NACL)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
// BoringSSL is unavailable for NaCl builds so it remains timing dependent.
return token_ == other.token_;
#else

4
patch/patches/browser_scheduler.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
index fdb236eb7df33..56e74f94e4494 100644
index b23609c41a5d8..7d5f58d3ae197 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -310,7 +310,7 @@ BrowserTaskExecutor::OnUserInputStart() {
@@ -309,7 +309,7 @@ BrowserTaskExecutor::OnUserInputStart() {
// static
void BrowserTaskExecutor::Shutdown() {

10
patch/patches/browser_security_policy_1081397.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index 2cf191150882d..81e7d98700fed 100644
index 620b3fdc4403a..f20399d453680 100644
--- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc
@@ -1704,6 +1704,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
@@ -1724,6 +1724,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
// DeclarativeApiTest.PersistRules.
if (actual_process_lock.matches_scheme(url::kDataScheme))
return true;
@ -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 8a84c355e4d56..2545e0e828fe5 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -5906,6 +5906,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
@@ -5896,6 +5896,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() {
@@ -5929,6 +5935,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin();

4
patch/patches/build.patch
View File

@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 8048ec5e84c96..c4bfe444dd08a 100644
index af37ee76ac033..dff942745d662 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -1793,8 +1793,6 @@ config("thin_archive") {
@@ -1826,8 +1826,6 @@ config("thin_archive") {
# confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ]

8
patch/patches/chrome_browser.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 9a8b9fe835e74..9663c04f79f2e 100644
index 09b5c00891717..cfa169e00b104 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/python.gni")
import("//build/config/ui.gni")
@ -10,8 +10,8 @@ index 9a8b9fe835e74..9663c04f79f2e 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1934,6 +1935,7 @@ static_library("browser") {
"//build:os_buildflags",
@@ -1925,6 +1926,7 @@ static_library("browser") {
"//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
+ "//cef/libcef/features",

10
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
index 263369df25cae..40998f2de3ecc 100644
index aaf861970f122..1c9648d3cc917 100644
--- chrome/browser/browser_process.h
+++ chrome/browser/browser_process.h
@@ -201,9 +201,9 @@ class BrowserProcess {
@ -14,10 +14,10 @@ index 263369df25cae..40998f2de3ecc 100644
std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index eeb32e6249290..fb4778a2936c8 100644
index cd8c5f9ee5835..bae8231637ab2 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -996,18 +996,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -995,18 +995,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
return download_request_limiter_.get();
}
@ -38,7 +38,7 @@ index eeb32e6249290..fb4778a2936c8 100644
std::unique_ptr<BackgroundModeManager> manager) {
background_mode_manager_ = std::move(manager);
diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
index 9d28c95c4a3de..2c199baa80a1a 100644
index e61312aa24305..bc4333a3b87a8 100644
--- chrome/browser/browser_process_impl.h
+++ chrome/browser/browser_process_impl.h
@@ -183,8 +183,8 @@ class BrowserProcessImpl : public BrowserProcess,
@ -52,7 +52,7 @@ index 9d28c95c4a3de..2c199baa80a1a 100644
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
index fb05f448cb250..e94c28d492e7a 100644
index 7bc92543cf2bd..ae150df4ada12 100644
--- chrome/browser/lifetime/browser_close_manager.cc
+++ chrome/browser/lifetime/browser_close_manager.cc
@@ -151,12 +151,14 @@ void BrowserCloseManager::CloseBrowsers() {

36
patch/patches/chrome_browser_browser.patch
View File

@ -13,10 +13,10 @@ index 9e534ff1683f1..de406f5879be0 100644
return false;
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 8f6301f12fb2b..ff584e38b1874 100644
index a7a64effed043..f2d36a884b278 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,20 @@
@@ -262,6 +262,20 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -37,7 +37,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -500,6 +514,13 @@ Browser::Browser(const CreateParams& params)
@@ -498,6 +512,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@ -51,7 +51,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1322,6 +1343,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1320,6 +1341,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -66,7 +66,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1329,8 +1358,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1327,8 +1356,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -87,7 +87,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1535,6 +1574,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1533,6 +1572,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@ -102,7 +102,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1634,6 +1681,15 @@ void Browser::AddNewContents(WebContents* source,
@@ -1632,6 +1679,15 @@ void Browser::AddNewContents(WebContents* source,
source, disposition);
}
@ -118,7 +118,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect);
}
@@ -1652,6 +1708,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1650,6 +1706,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -127,7 +127,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1679,6 +1737,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1677,6 +1735,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -136,7 +136,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
if (!GetStatusBubble())
return;
@@ -1686,6 +1746,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1684,6 +1744,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -154,7 +154,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1802,6 +1873,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1800,6 +1871,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -165,7 +165,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1846,6 +1921,8 @@ void Browser::RendererResponsive(
@@ -1844,6 +1919,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@ -174,7 +174,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1892,11 +1969,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1890,11 +1967,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -190,7 +190,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2739,6 +2820,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2737,6 +2818,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
}
@ -200,7 +200,7 @@ index 8f6301f12fb2b..ff584e38b1874 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 10e4e2021cb39..7b727fecc3a48 100644
index 1cda451616290..2272fb467e055 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@
@ -219,7 +219,7 @@ index 10e4e2021cb39..7b727fecc3a48 100644
+#include "cef/libcef/browser/chrome/browser_delegate.h"
+#endif
+
#if defined(OS_ANDROID)
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -292,6 +297,11 @@ class Browser : public TabStripModelObserver,
@ -294,10 +294,10 @@ index 10e4e2021cb39..7b727fecc3a48 100644
// The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 7086ea81b8504..6d81f99416b73 100644
index 8b0052125942c..a121e1086eaeb 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -452,6 +452,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -477,6 +477,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);

8
patch/patches/chrome_browser_content_settings.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 22fdc95ba9c3f..2a0e3cc7f65c8 100644
index 242f244a6d3b5..d037f2dfd9987 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -9,6 +9,7 @@
@ -20,7 +20,7 @@ index 22fdc95ba9c3f..2a0e3cc7f65c8 100644
+
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/trace_event/trace_event.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h"
#include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h"
@@ -55,7 +60,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
DependsOn(SupervisedUserSettingsServiceFactory::GetInstance());
#endif
@ -56,10 +56,10 @@ index 22fdc95ba9c3f..2a0e3cc7f65c8 100644
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
SupervisedUserSettingsService* supervised_service =
diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
index f0720efc9e90a..dafbe3e606326 100644
index e11724a73a2f7..ad818bc3ae082 100644
--- components/content_settings/renderer/content_settings_agent_impl.cc
+++ components/content_settings/renderer/content_settings_agent_impl.cc
@@ -167,7 +167,7 @@ ContentSetting GetContentSettingFromRulesImpl(
@@ -166,7 +166,7 @@ ContentSetting GetContentSettingFromRulesImpl(
return rule.GetContentSetting();
}
}

18
patch/patches/chrome_browser_context_menus.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index c1e556eb29076..280e50f8faafe 100644
index 0c42ba3e13fe9..2bb347fe9cd50 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -286,6 +286,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -293,6 +293,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -16,7 +16,7 @@ index c1e556eb29076..280e50f8faafe 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -499,6 +506,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -506,6 +513,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@ -27,7 +27,7 @@ index c1e556eb29076..280e50f8faafe 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -693,6 +704,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -697,6 +708,14 @@ RenderViewContextMenu::RenderViewContextMenu(
system_app_ = GetBrowser() && GetBrowser()->app_controller()
? GetBrowser()->app_controller()->system_app()
: nullptr;
@ -42,7 +42,7 @@ index c1e556eb29076..280e50f8faafe 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1051,6 +1070,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1064,6 +1083,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index c1e556eb29076..280e50f8faafe 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2875,6 +2900,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -2893,6 +2918,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -69,7 +69,7 @@ index c1e556eb29076..280e50f8faafe 100644
RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 7384ceed05f0e..3ded5bd48208f 100644
index a45df3c894cf5..c97a1ecb08579 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -126,6 +126,12 @@ class RenderViewContextMenu
@ -96,7 +96,7 @@ index 7384ceed05f0e..3ded5bd48208f 100644
// "Use enhanced spell check" items.
std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index c3a9924cdb8da..58e66c1ca842a 100644
index 8202df66af332..c412b59df6db9 100644
--- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -137,6 +137,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
@ -110,7 +110,7 @@ index c3a9924cdb8da..58e66c1ca842a 100644
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
switch (command_id) {
diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
index eb360c977683c..57d1d80b4dc83 100644
index 3dfc21fddd982..3f93f06532ed7 100644
--- components/renderer_context_menu/render_view_context_menu_base.cc
+++ components/renderer_context_menu/render_view_context_menu_base.cc
@@ -377,6 +377,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {

2
patch/patches/chrome_browser_extensions.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 501b3500c8554..893665faa6c76 100644
index b13f110636723..e5012dd4208e8 100644
--- chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -14,6 +14,7 @@

10
patch/patches/chrome_browser_net_export.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index cb8ecf2f81cb2..d3bdde2216222 100644
index df174d7d1ec4d..8bb63dcc89f20 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@@ -10,6 +10,7 @@ import("//build/config/features.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
@ -29,7 +29,7 @@ index cb8ecf2f81cb2..d3bdde2216222 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5181,6 +5187,7 @@ static_library("ui") {
@@ -5209,6 +5215,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
@ -38,7 +38,7 @@ index cb8ecf2f81cb2..d3bdde2216222 100644
]
}
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
index ec205a3f05457..2af432bc6908a 100644
index c5e34303668cb..8e376848fc7d5 100644
--- chrome/browser/ui/webui/net_export_ui.cc
+++ chrome/browser/ui/webui/net_export_ui.cc
@@ -22,6 +22,7 @@
@ -57,7 +57,7 @@ index ec205a3f05457..2af432bc6908a 100644
+#include "cef/libcef/browser/alloy/alloy_dialog_util.h"
+#endif
+
#if defined(OS_ANDROID)
#if BUILDFLAG(IS_ANDROID)
#include "components/browser_ui/share/android/intent_helper.h"
#endif
@@ -142,6 +147,13 @@ class NetExportMessageHandler

8
patch/patches/chrome_browser_profile_menu.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
index 58a47365168bb..f8910f44040c4 100644
index 9e15e9ba100cd..d4388c060a18f 100644
--- chrome/browser/profiles/profile_window.cc
+++ chrome/browser/profiles/profile_window.cc
@@ -271,7 +271,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
@@ -280,7 +280,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
*bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
return;
case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
@ -14,7 +14,7 @@ index 58a47365168bb..f8910f44040c4 100644
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
}
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
index aff0b0d4c57d0..7b2c37b6ed9e3 100644
index 98617c979713b..1fac2a76ce097 100644
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
@@ -37,7 +37,9 @@
@ -29,7 +29,7 @@ index aff0b0d4c57d0..7b2c37b6ed9e3 100644
chrome::RecordDialogCreation(
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
index fab7ddd1a2f89..b389929034d1f 100644
index 921bcea63a637..2a7e2f75a313f 100644
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -513,7 +513,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,

24
patch/patches/chrome_browser_profiles.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
index 059eb9b6d118e..86a37ba85a273 100644
index d153cc5837e0e..5154b21d819ed 100644
--- chrome/browser/profiles/off_the_record_profile_impl.cc
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -616,7 +616,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
@ -14,7 +14,7 @@ index 059eb9b6d118e..86a37ba85a273 100644
}
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
index a13f2fda30aac..be31fb170ee6b 100644
index a3fadab7e4e6b..032300a4c4a0b 100644
--- chrome/browser/profiles/profile.cc
+++ chrome/browser/profiles/profile.cc
@@ -84,6 +84,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@ -52,7 +52,7 @@ index a13f2fda30aac..be31fb170ee6b 100644
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
return CreateUnique(kDevToolsOTRProfileIDPrefix);
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
index 641a2444dd08a..be03f030d5ffe 100644
index ca2561e412621..febd52df6c971 100644
--- chrome/browser/profiles/profile.h
+++ chrome/browser/profiles/profile.h
@@ -98,6 +98,10 @@ class Profile : public content::BrowserContext {
@ -85,10 +85,10 @@ index 641a2444dd08a..be03f030d5ffe 100644
virtual bool IsSignedIn() = 0;
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index 98c0522cc5e9b..dcb28df56ef4f 100644
index 1c79ba2998e34..d0518d23944a7 100644
--- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc
@@ -994,7 +994,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -998,7 +998,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile);
@ -100,7 +100,7 @@ index 98c0522cc5e9b..dcb28df56ef4f 100644
return raw_otr_profile;
}
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index feacaf4e4e6d7..116a93b90e2a5 100644
index e443ba3df4107..d3656b3cff757 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -496,7 +496,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@ -110,13 +110,13 @@ index feacaf4e4e6d7..116a93b90e2a5 100644
- if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty())
+ if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled())
profile_shortcut_manager_ = ProfileShortcutManager::Create(this);
}
zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index 35bc427430d76..2c79b8c174fd1 100644
index 0719f998c0097..33e392a076183 100644
--- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h
@@ -126,7 +126,7 @@ class ProfileManager : public Profile::Delegate {
@@ -150,7 +150,7 @@ class ProfileManager : public Profile::Delegate {
// acceptable. Returns null if creation of the new profile fails.
// TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
// make this method private.
@ -125,7 +125,7 @@ index 35bc427430d76..2c79b8c174fd1 100644
// Returns regular or off-the-record profile given its profile key.
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
@@ -158,7 +158,7 @@ class ProfileManager : public Profile::Delegate {
@@ -182,7 +182,7 @@ class ProfileManager : public Profile::Delegate {
// Returns true if the profile pointer is known to point to an existing
// profile.
@ -135,7 +135,7 @@ index 35bc427430d76..2c79b8c174fd1 100644
// Returns the directory where the first created profile is stored,
// relative to the user data directory currently in use.
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
index 92ea233746f67..c4415290613e3 100644
index a2c7b9c45e334..18017a6181a1e 100644
--- chrome/browser/profiles/renderer_updater.cc
+++ chrome/browser/profiles/renderer_updater.cc
@@ -8,6 +8,7 @@
@ -146,7 +146,7 @@ index 92ea233746f67..c4415290613e3 100644
#include "chrome/browser/content_settings/content_settings_manager_delegate.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -64,8 +65,12 @@ void GetGuestViewDefaultContentSettingRules(
@@ -60,8 +61,12 @@ void GetGuestViewDefaultContentSettingRules(
} // namespace
RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile) {

2
patch/patches/chrome_browser_safe_browsing.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index ebf319ae6be67..24a3c73c2d230 100644
index b42acc15af846..d5a739cdb8948 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -26,6 +26,7 @@ static_library("safe_browsing") {

6
patch/patches/chrome_browser_themes.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index 68feae7de79d7..986fc1510b6f5 100644
index 479ccaad2aa8f..fd57948a4af5e 100644
--- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc
@@ -28,6 +28,7 @@
@ -21,7 +21,7 @@ index 68feae7de79d7..986fc1510b6f5 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry_observer.h"
@@ -349,11 +354,19 @@ void ThemeService::Init() {
@@ -355,11 +360,19 @@ void ThemeService::Init() {
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
// constructed in time to observe the corresponding events.
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -42,7 +42,7 @@ index 68feae7de79d7..986fc1510b6f5 100644
theme_syncable_service_ =
std::make_unique<ThemeSyncableService>(profile_, this);
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
index dc2350f0b2443..7f4b9283534f3 100644
index db3162c7ef194..f80a5755876ee 100644
--- chrome/browser/themes/theme_service_factory.cc
+++ chrome/browser/themes/theme_service_factory.cc
@@ -7,6 +7,7 @@

20
patch/patches/chrome_plugins.patch
View File

@ -54,7 +54,7 @@ index 2cf61c44809a9..e6948ab525700 100644
PluginInfoHostImpl::Context::~Context() {}
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
index 7999b960694ab..5c1848a0afadf 100644
index b594c68673c19..b0e3cd149f760 100644
--- chrome/browser/plugins/plugin_utils.cc
+++ chrome/browser/plugins/plugin_utils.cc
@@ -5,6 +5,7 @@
@ -76,7 +76,7 @@ index 7999b960694ab..5c1848a0afadf 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
@@ -69,6 +74,12 @@ base::flat_map<std::string, std::string>
@@ -68,6 +73,12 @@ base::flat_map<std::string, std::string>
PluginUtils::GetMimeTypeToExtensionIdMap(
content::BrowserContext* browser_context) {
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
@ -90,7 +90,7 @@ index 7999b960694ab..5c1848a0afadf 100644
Profile* profile = Profile::FromBrowserContext(browser_context);
const std::vector<std::string>& allowlist =
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
index 8c2547056ec26..2ab3252dca708 100644
index 8b72897491669..546919dd70afc 100644
--- chrome/common/google_url_loader_throttle.cc
+++ chrome/common/google_url_loader_throttle.cc
@@ -7,6 +7,7 @@
@ -125,10 +125,10 @@ index 8c2547056ec26..2ab3252dca708 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 7c601387ea0ec..03b0f494dd7e9 100644
index 9e2e8d1892366..262659f9e3204 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -937,6 +937,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -940,6 +940,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 7c601387ea0ec..03b0f494dd7e9 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1138,7 +1139,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1141,7 +1142,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 7c601387ea0ec..03b0f494dd7e9 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1147,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1150,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -156,7 +156,7 @@ index 7c601387ea0ec..03b0f494dd7e9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1157,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1160,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 7c601387ea0ec..03b0f494dd7e9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1165,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1168,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));
@ -198,7 +198,7 @@ index f2f7e4228f134..e724b36143238 100644
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
index 8b87024388168..86a22f66e1cba 100644
index b58cdd14c9a58..927738fd22b80 100644
--- content/browser/browser_plugin/browser_plugin_guest.h
+++ content/browser/browser_plugin/browser_plugin_guest.h
@@ -116,6 +116,8 @@ class BrowserPluginGuest : public GuestHost, public WebContentsObserver {

6
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index cb4edc603603b..f0b386eca2213 100644
index 93f57d5fd1f4a..428371b7d7ff8 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -10,7 +10,7 @@ index cb4edc603603b..f0b386eca2213 100644
import("//chrome/common/features.gni")
import("//components/nacl/features.gni")
import("//components/offline_pages/buildflags/features.gni")
@@ -141,6 +142,7 @@ static_library("renderer") {
@@ -120,6 +121,7 @@ static_library("renderer") {
deps = [
"//base/allocator:buildflags",
"//build:chromeos_buildflags",
@ -18,7 +18,7 @@ index cb4edc603603b..f0b386eca2213 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -234,6 +236,10 @@ static_library("renderer") {
@@ -211,6 +213,10 @@ static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]

70
patch/patches/chrome_runtime.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index cd9b3030c6f3a..1dfa03db19ca8 100644
index 132735e3a1200..0d392976799a4 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -30,6 +30,7 @@
@@ -31,6 +31,7 @@
#include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -10,50 +10,50 @@ index cd9b3030c6f3a..1dfa03db19ca8 100644
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
#include "chrome/browser/defaults.h"
@@ -389,6 +390,8 @@ struct MainFunction {
@@ -390,6 +391,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) {
+ if (cef::IsChromeRuntimeEnabled())
+ return;
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs.
@@ -720,7 +723,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
@@ -712,7 +715,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
}
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
+ if (!cef::IsChromeRuntimeEnabled()) {
SetUpExtendedCrashReporting(is_browser_process);
+ }
base::sequence_manager::internal::ThreadControllerPowerMonitor::
InitializeOnMainThread();
#endif
@@ -1018,6 +1023,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1010,6 +1015,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
+ if (!cef::IsChromeRuntimeEnabled()) {
crash_reporter::InitializeCrashKeys();
#if defined(OS_POSIX)
@@ -1028,6 +1034,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
#if BUILDFLAG(IS_POSIX)
@@ -1020,6 +1026,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
+ } // !cef::IsChromeRuntimeEnabled()
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1154,6 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1146,6 +1153,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
+ if (!cef::IsChromeRuntimeEnabled()) {
#if defined(OS_POSIX) && !defined(OS_MAC)
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1186,6 +1194,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1178,6 +1186,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -61,7 +61,7 @@ index cd9b3030c6f3a..1dfa03db19ca8 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1284,6 +1293,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1269,6 +1278,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@ -69,19 +69,19 @@ index cd9b3030c6f3a..1dfa03db19ca8 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner.
const base::CommandLine* command_line =
@@ -1300,6 +1310,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1285,6 +1295,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
+ } // !cef::IsChromeRuntimeEnabled()
}
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index a0e5e4fd7d01d..dc1fc12234d59 100644
index 4e9969d9c5b0b..0e734d8661db0 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@@ -52,6 +52,7 @@
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
@ -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() {
@@ -1757,11 +1758,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|.
@ -98,14 +98,14 @@ index a0e5e4fd7d01d..dc1fc12234d59 100644
const bool started =
+ !GetMainRunLoopInstance() ||
!process_command_line ||
browser_creator_->Start(parsed_command_line(), base::FilePath(), profile_,
last_opened_profiles);
browser_creator_->Start(parsed_command_line(), base::FilePath(),
profile_info, last_opened_profiles);
- if (started) {
+ if (started && GetMainRunLoopInstance()) {
// 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() {
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -1789,8 +1793,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@ -118,7 +118,7 @@ index a0e5e4fd7d01d..dc1fc12234d59 100644
GetMainRunLoopInstance()->QuitWhenIdleClosure());
}
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
index 97afd5b1ba753..40672e7c4fdf3 100644
index dbd8f7ebe071d..b0f8d3d7bcff9 100644
--- chrome/browser/chrome_browser_main_mac.mm
+++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@ -145,7 +145,7 @@ index 97afd5b1ba753..40672e7c4fdf3 100644
PrefService* local_state = g_browser_process->local_state();
DCHECK(local_state);
@@ -170,7 +173,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit() {
@@ -177,7 +180,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
}
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@ -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 70df7bef3a7b1..97d130a0a1be6 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@ -167,9 +167,9 @@ 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(
@@ -3682,9 +3683,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // defined(OS_ANDROID)
#endif // BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(ENABLE_CEF)
// chrome: & friends.
@ -179,7 +179,7 @@ index d0eaa02d9f955..ce5d9aaaf4509 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5312,7 +5315,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5333,7 +5336,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(
@@ -5351,6 +5354,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -198,10 +198,10 @@ 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 71dfd396b405e..879210ff7c8fd 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -549,7 +549,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -211,7 +211,7 @@ index ba04ad2b43f10..8a557d83b4339 100644
bool in_memory,
const base::FilePath& relative_partition_path,
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index f2a12d0545a6d..44f49da8fd22e 100644
index 3ae5f0a699de3..d66d193121be5 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@ -222,7 +222,7 @@ index f2a12d0545a6d..44f49da8fd22e 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
@@ -163,6 +164,10 @@
@@ -164,6 +165,10 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
@ -233,7 +233,7 @@ index f2a12d0545a6d..44f49da8fd22e 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1203,6 +1208,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1267,6 +1272,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry);
#endif

42
patch/patches/chrome_runtime_views.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 408fcb87b6bf3..4efc0e48dcb5a 100644
index 92f10fac6b017..cc53da3a0b32e 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -368,8 +368,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@ -31,7 +31,7 @@ index 408fcb87b6bf3..4efc0e48dcb5a 100644
void BrowserCommandController::InitCommandState() {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 28cb0acd5a55d..f22ac22d04245 100644
index 6264562165ced..d20f970ba1254 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -73,15 +73,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@ -129,7 +129,7 @@ index 6a1e9abbc66aa..aa9e3ebe2599c 100644
BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(const BrowserFrame&) = delete;
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 3c6fcbebb84bb..f2eb23d39e5ee 100644
index 8138e50a55072..e01b2274119b8 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -291,11 +291,10 @@ using content::WebContents;
@ -147,7 +147,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -677,11 +676,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
@@ -683,11 +682,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@ -171,7 +171,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
SetShowIcon(::ShouldShowWindowIcon(browser_.get()));
// In forced app mode, all size controls are always disabled. Otherwise, use
@@ -695,7 +705,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -701,7 +711,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@ -179,7 +179,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -741,8 +750,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -749,8 +758,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@ -197,7 +197,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1579,6 +1595,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1587,6 +1603,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@ -206,7 +206,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -2725,7 +2743,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
@@ -2731,7 +2749,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
}
void BrowserView::ReparentTopContainerForEndOfImmersive() {
@ -216,7 +216,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3214,8 +3233,10 @@ void BrowserView::Layout() {
@@ -3220,8 +3239,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -229,7 +229,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3278,6 +3299,11 @@ void BrowserView::AddedToWidget() {
@@ -3284,6 +3305,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -241,7 +241,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3330,13 +3356,9 @@ void BrowserView::AddedToWidget() {
@@ -3336,13 +3362,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -257,7 +257,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -3755,7 +3777,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -3761,7 +3783,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -267,7 +267,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4046,6 +4069,8 @@ Profile* BrowserView::GetProfile() {
@@ -4052,6 +4075,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -276,7 +276,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4068,6 +4093,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4074,6 +4099,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -286,7 +286,7 @@ index 3c6fcbebb84bb..f2eb23d39e5ee 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 6eea8b4b899e2..4dc56c94baa3f 100644
index 02d9793dd5c8d..fe8b0cef88375 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
@ -347,7 +347,7 @@ index 1d22e4b057c6c..d73b547f09e0b 100644
bool toolbar_visible = delegate_->IsToolbarVisible();
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 504c0b746006d..f0952bad35e91 100644
index b5706099ce923..07cebc2f8b65f 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -559,37 +559,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@ -405,10 +405,10 @@ index 504c0b746006d..f0952bad35e91 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index d11554470129d..e854e476c297b 100644
index b5098154b2f7e..4a3121cedf083 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -167,12 +167,13 @@ auto& GetViewCommandMap() {
@@ -168,12 +168,13 @@ auto& GetViewCommandMap() {
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public:
@ -424,7 +424,7 @@ index d11554470129d..e854e476c297b 100644
SetID(VIEW_ID_TOOLBAR);
UpgradeDetector::GetInstance()->AddObserver(this);
@@ -207,7 +208,7 @@ void ToolbarView::Init() {
@@ -208,7 +209,7 @@ void ToolbarView::Init() {
#endif
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
@ -434,10 +434,10 @@ index d11554470129d..e854e476c297b 100644
size_animation_.Reset(1);
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index 8b929587548ec..835a665380277 100644
index 79efc97f711f1..6915479340275 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -92,7 +92,8 @@ class ToolbarView : public views::AccessiblePaneView,
@@ -93,7 +93,8 @@ class ToolbarView : public views::AccessiblePaneView,
// needs to be displayed.
};

4
patch/patches/component_build.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index fdfb95294c3c5..e7d6aab0c673e 100644
index 29416cec2eb48..ff152e4b04a0a 100644
--- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h
@@ -96,7 +96,7 @@ bool ApplyUserAgentMetadataOverrides(
@@ -97,7 +97,7 @@ bool ApplyUserAgentMetadataOverrides(
FrameTreeNode* frame_tree_node,
absl::optional<blink::UserAgentMetadata>* override_out);

45
patch/patches/content_2015.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
index 3c2d16c7135d8..5dc02effff2ca 100644
index ec6be2ff24d23..159ed7776c0aa 100644
--- content/browser/devtools/devtools_http_handler.cc
+++ content/browser/devtools/devtools_http_handler.cc
@@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -576,7 +576,7 @@ void DevToolsHttpHandler::OnJsonRequest(
version.SetString("Protocol-Version",
DevToolsAgentHost::GetProtocolVersion());
version.SetString("WebKit-Version", GetWebKitVersion());
@ -12,28 +12,29 @@ index 3c2d16c7135d8..5dc02effff2ca 100644
GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 6ed02d4244d45..68dff171001c7 100644
index c1235f9658b88..040d9afb0d9ff 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -672,6 +672,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -665,6 +665,14 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture, initiating_origin,
&loader_factory);
initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
+ if (!handled) {
+ handled = GetContentClient()->browser()->HandleExternalProtocol(
+ web_contents_getter_, frame_tree_node_id_,
+ navigation_ui_data_.get(), request_info_->sandbox_flags,
+ *resource_request_, &loader_factory);
+ *resource_request_, initiating_origin,
+ initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
+ }
+
if (loader_factory) {
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 2579cf2ce325d..03b60ce3b17cb 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@@ -11,7 +11,7 @@
// declarations instead of including more headers. If that is infeasible, adjust
// the limit. For more info, see
// https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
@ -42,7 +43,7 @@ index b8b933d0160db..d450ef6ff5cc2 100644
#include <utility>
@@ -876,7 +876,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -877,7 +877,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@ -51,7 +52,7 @@ index b8b933d0160db..d450ef6ff5cc2 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -885,6 +885,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -886,6 +886,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@ -60,7 +61,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 7d3fafd564118..789bfd693888f 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -33,6 +33,7 @@
@ -71,7 +72,7 @@ index 4a3bbba844366..f5795c3ae1ce4 100644
#include "content/public/browser/web_ui_browser_interface_broker_registry.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/page_visibility_state.h"
@@ -1632,7 +1633,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1634,7 +1635,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.
@ -80,8 +81,8 @@ index 4a3bbba844366..f5795c3ae1ce4 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1816,6 +1817,15 @@ class CONTENT_EXPORT ContentBrowserClient {
const absl::optional<url::Origin>& initiating_origin,
@@ -1823,6 +1824,17 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
+ // Same as above, but exposing the whole ResourceRequest object.
@ -91,12 +92,14 @@ index 4a3bbba844366..f5795c3ae1ce4 100644
+ NavigationUIData* navigation_data,
+ network::mojom::WebSandboxFlags sandbox_flags,
+ const network::ResourceRequest& request,
+ const absl::optional<url::Origin>& initiating_origin,
+ RenderFrameHost* initiator_document,
+ mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) { return false; }
+
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
// will house the content shown when in Picture-in-Picture mode. This will
// return a new OverlayWindow.
@@ -1893,6 +1903,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1879,6 +1891,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@ -108,7 +111,7 @@ index 4a3bbba844366..f5795c3ae1ce4 100644
// on blink::features::kUserAgentReduction. Content may cache this value.
virtual std::string GetUserAgent();
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index 4352aada84d7f..94c5ae19f9297 100644
index b914cb91a2b49..2f84201ba4d1e 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -87,6 +87,9 @@ class CONTENT_EXPORT ContentRendererClient {
@ -133,10 +136,10 @@ index 4352aada84d7f..94c5ae19f9297 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index e59425121af67..bf5c890e1c184 100644
index 03f9fac832072..1f45e54e32da9 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -639,6 +639,8 @@ void RenderThreadImpl::Init() {
@@ -640,6 +640,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame);
@ -146,10 +149,10 @@ index e59425121af67..bf5c890e1c184 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index df9f357a597c7..34241332a3614 100644
index b4e37bbdd3a80..1d16b769a6329 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -1083,6 +1083,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -1082,6 +1082,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@ -166,7 +169,7 @@ index df9f357a597c7..34241332a3614 100644
RendererBlinkPlatformImpl::GetCodeCacheHost() {
base::AutoLock lock(code_cache_host_lock_);
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index cba574c571ded..715e59464ade7 100644
index 2191ab72dcacc..d902eb707cc99 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -260,6 +260,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {

36
patch/patches/content_main_654986.patch
View File

@ -1,8 +1,8 @@
diff --git content/app/content_main.cc content/app/content_main.cc
index 5ad6c026e9d05..1277d9c959c31 100644
index bf4cbe990cb4d..e494fff1fa5d5 100644
--- content/app/content_main.cc
+++ content/app/content_main.cc
@@ -224,16 +224,10 @@ ContentMainParams::~ContentMainParams() = default;
@@ -225,16 +225,10 @@ ContentMainParams::~ContentMainParams() = default;
ContentMainParams::ContentMainParams(ContentMainParams&&) = default;
ContentMainParams& ContentMainParams::operator=(ContentMainParams&&) = default;
@ -15,16 +15,16 @@ index 5ad6c026e9d05..1277d9c959c31 100644
+ ContentMainRunner* content_main_runner) {
int exit_code = -1;
base::debug::GlobalActivityTracker* tracker = nullptr;
-#if defined(OS_MAC)
-#if BUILDFLAG(IS_MAC)
- std::unique_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool;
-#endif
// A flag to indicate whether Main() has been called before. On Android, we
// may re-run Main() without restarting the browser process. This flag
@@ -317,12 +311,6 @@ RunContentProcess(ContentMainParams params,
@@ -318,12 +312,6 @@ RunContentProcess(ContentMainParams params,
#endif
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
- // We need this pool for all the objects created before we get to the event
- // loop, but we don't want to leave them hanging around until the app quits.
- // Each "main" needs to flush this pool right before it goes into its main
@ -34,7 +34,7 @@ index 5ad6c026e9d05..1277d9c959c31 100644
InitializeMac();
#endif
@@ -395,8 +383,18 @@ RunContentProcess(ContentMainParams params,
@@ -396,8 +384,18 @@ RunContentProcess(ContentMainParams params,
if (IsSubprocess())
CommonSubprocessInit();
@ -54,18 +54,18 @@ index 5ad6c026e9d05..1277d9c959c31 100644
if (tracker) {
if (exit_code == 0) {
tracker->SetProcessPhaseIfEnabled(
@@ -408,14 +406,41 @@ RunContentProcess(ContentMainParams params,
@@ -409,14 +407,41 @@ RunContentProcess(ContentMainParams params,
}
}
-#if defined(OS_MAC)
-#if BUILDFLAG(IS_MAC)
- autorelease_pool.reset();
-#endif
+ return exit_code;
+}
+void ContentMainShutdown(ContentMainRunner* content_main_runner) {
#if !defined(OS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
content_main_runner->Shutdown();
#endif
+}
@ -75,7 +75,7 @@ index 5ad6c026e9d05..1277d9c959c31 100644
+int NO_STACK_PROTECTOR
+RunContentProcess(ContentMainParams params,
+ ContentMainRunner* content_main_runner) {
+#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
+ // We need this pool for all the objects created before we get to the event
+ // loop, but we don't want to leave them hanging around until the app quits.
+ // Each "main" needs to flush this pool right before it goes into its main
@ -90,7 +90,7 @@ index 5ad6c026e9d05..1277d9c959c31 100644
+ return exit_code;
+ exit_code = ContentMainRun(content_main_runner);
+
+#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
+ params.autorelease_pool = nullptr;
+ autorelease_pool.reset();
+#endif
@ -100,10 +100,10 @@ index 5ad6c026e9d05..1277d9c959c31 100644
}
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 9b3e3ca0cf6c9..b973e494e7fca 100644
index 5a365936031e6..ab4a3f2138e28 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -45,6 +45,7 @@
@@ -44,6 +44,7 @@
#include "base/task/thread_pool/thread_pool_instance.h"
#include "base/threading/hang_watcher.h"
#include "base/threading/platform_thread.h"
@ -111,7 +111,7 @@ index 9b3e3ca0cf6c9..b973e494e7fca 100644
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -1190,6 +1191,11 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1182,6 +1183,11 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}
@ -124,7 +124,7 @@ index 9b3e3ca0cf6c9..b973e494e7fca 100644
std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() {
return ContentMainRunnerImpl::Create();
diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
index 07404dfc2af12..f2ff3f14120e4 100644
index 2cfcb5330af5d..e1966af803dfb 100644
--- content/app/content_main_runner_impl.h
+++ content/app/content_main_runner_impl.h
@@ -31,7 +31,7 @@ namespace content {
@ -146,20 +146,20 @@ index 07404dfc2af12..f2ff3f14120e4 100644
int RunBrowser(MainFunctionParams main_function_params,
bool start_minimal_browser);
diff --git content/common/set_process_title.cc content/common/set_process_title.cc
index 8b829a4887739..a69a088697287 100644
index 06cdab47c8cdf..1f0ea6c7215ca 100644
--- content/common/set_process_title.cc
+++ content/common/set_process_title.cc
@@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
bool have_argv0 = false;
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- DCHECK_EQ(base::PlatformThread::CurrentId(), getpid());
+ // DCHECK_EQ(base::PlatformThread::CurrentId(), getpid());
if (main_argv)
setproctitle_init(main_argv);
diff --git content/public/app/content_main.h content/public/app/content_main.h
index f86051cf640ae..de4fa65c05bdf 100644
index 268b201ab060a..b745f44139a3d 100644
--- content/public/app/content_main.h
+++ content/public/app/content_main.h
@@ -93,6 +93,13 @@ struct CONTENT_EXPORT ContentMainParams {

74
patch/patches/crashpad_1995.patch
View File

@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644
g_crash_helper_enabled = true;
return true;
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
index 68ddd337e4dfa..687e869afd5c7 100644
index f6850e85411ab..4f5500d8fa1ea 100644
--- chrome/common/crash_keys.cc
+++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@
@ -112,7 +112,7 @@ index 68ddd337e4dfa..687e869afd5c7 100644
-} // namespace
-
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
#if defined(OS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS)
HandleEnableDisableFeatures(command_line);
#endif
- SetSwitchesFromCommandLine(command_line, &IsBoringSwitch);
@ -136,17 +136,17 @@ index e2d53ac83dde0..6ac76e407a748 100644
// on the given |command_line|.
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
index ec5b5b9b4da3b..b18daaa090059 100644
index 823e49a234e3d..3f0f95a330bf4 100644
--- components/crash/core/app/breakpad_linux.cc
+++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
@@ -29,6 +29,7 @@
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/debug/leak_annotations.h"
#include "base/files/file_path.h"
#include "base/ignore_result.h"
#include "base/lazy_instance.h"
#include "base/linux_util.h"
@@ -721,7 +722,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
info.process_type_length = 7;
info.distro = base::g_linux_distro;
@ -156,7 +156,7 @@ index ec5b5b9b4da3b..b18daaa090059 100644
info.process_start_time = g_process_start_time;
info.oom_size = base::g_oom_size;
info.pid = g_pid;
@@ -1736,10 +1737,27 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1735,10 +1736,27 @@ void HandleCrashDump(const BreakpadInfo& info) {
GetCrashReporterClient()->GetProductNameAndVersion(&product_name, &version);
writer.AddBoundary();
@ -186,7 +186,7 @@ index ec5b5b9b4da3b..b18daaa090059 100644
if (info.pid > 0) {
char pid_value_buf[kUint64StringSize];
uint64_t pid_value_len = my_uint64_len(info.pid);
@@ -1856,6 +1874,9 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1855,6 +1873,9 @@ void HandleCrashDump(const BreakpadInfo& info) {
crash_reporter::internal::TransitionalCrashKeyStorage;
CrashKeyStorage::Iterator crash_key_iterator(*info.crash_keys);
const CrashKeyStorage::Entry* entry;
@ -196,7 +196,7 @@ index ec5b5b9b4da3b..b18daaa090059 100644
while ((entry = crash_key_iterator.Next())) {
size_t key_size, value_size;
// Check for malformed messages.
@@ -1866,7 +1887,13 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1865,7 +1886,13 @@ void HandleCrashDump(const BreakpadInfo& info) {
? CrashKeyStorage::value_size - 1
: my_strlen(entry->value);
@ -212,7 +212,7 @@ index ec5b5b9b4da3b..b18daaa090059 100644
writer.Flush();
}
diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h
index 9ea80370a842c..3043f7d32f33d 100644
index 2f0d4c555506a..c537846b21568 100644
--- components/crash/core/app/breakpad_linux.h
+++ components/crash/core/app/breakpad_linux.h
@@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type);
@ -222,39 +222,39 @@ index 9ea80370a842c..3043f7d32f33d 100644
+// Set the crash server URL.
+void SetCrashServerURL(const std::string& url);
+
#if defined(OS_ANDROID)
#if BUILDFLAG(IS_ANDROID)
extern void InitCrashKeysForTesting();
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
index 89b4bfccd5d32..7cb0a85470d2f 100644
index 82b7f241e2618..d3cd5524bb253 100644
--- components/crash/core/app/crash_reporter_client.cc
+++ components/crash/core/app/crash_reporter_client.cc
@@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
@@ -89,7 +89,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
}
#endif
-#if defined(OS_POSIX) && !defined(OS_MAC)
+#if defined(OS_POSIX)
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_POSIX)
void CrashReporterClient::GetProductNameAndVersion(const char** product_name,
const char** version) {
}
@@ -96,6 +96,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
@@ -98,6 +98,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
std::string* version,
std::string* channel) {}
+#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
base::FilePath CrashReporterClient::GetReporterLogFilename() {
return base::FilePath();
}
@@ -105,6 +106,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
@@ -107,6 +108,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
return false;
}
#endif
+#endif
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
bool CrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
@@ -139,6 +141,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
@@ -141,6 +143,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
return false;
}
@ -267,30 +267,30 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644
+ std::vector<std::string>* arguments) {
+}
+
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+std::wstring CrashReporterClient::GetCrashExternalHandler(
+ const std::wstring& exe_dir) {
+ return exe_dir + L"\\crashpad_handler.exe";
+}
+#endif
+
+#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
+bool CrashReporterClient::EnableBrowserCrashForwarding() {
+ return true;
+}
+#endif
+
#if defined(OS_ANDROID)
#if BUILDFLAG(IS_ANDROID)
unsigned int CrashReporterClient::GetCrashDumpPercentage() {
return 100;
@@ -201,9 +225,11 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
@@ -203,9 +227,11 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
return false;
}
-bool CrashReporterClient::EnableBreakpadForProcess(
- const std::string& process_type) {
- return false;
+#if defined(OS_POSIX) && !defined(OS_MAC)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+CrashReporterClient::ParameterMap
+CrashReporterClient::FilterParameters(const ParameterMap& parameters) {
+ return parameters;
@ -299,7 +299,7 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644
} // namespace crash_reporter
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
index 39557cce47443..236806090021a 100644
index 24e53fa62c2c4..68011566b5723 100644
--- components/crash/core/app/crash_reporter_client.h
+++ components/crash/core/app/crash_reporter_client.h
@@ -5,7 +5,9 @@
@ -312,24 +312,24 @@ index 39557cce47443..236806090021a 100644
#include "build/build_config.h"
@@ -87,7 +89,7 @@ class CrashReporterClient {
virtual int GetResultCodeRespawnFailed();
@@ -89,7 +91,7 @@ class CrashReporterClient {
virtual bool GetShouldDumpLargerDumps();
#endif
-#if defined(OS_POSIX) && !defined(OS_MAC)
+#if defined(OS_POSIX)
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_POSIX)
// Returns a textual description of the product type and version to include
// in the crash report. Neither out parameter should be set to NULL.
// TODO(jperaza): Remove the 2-parameter overload of this method once all
@@ -98,6 +100,7 @@ class CrashReporterClient {
@@ -100,6 +102,7 @@ class CrashReporterClient {
std::string* version,
std::string* channel);
+#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
virtual base::FilePath GetReporterLogFilename();
// Custom crash minidump handler after the minidump is generated.
@@ -107,6 +110,7 @@ class CrashReporterClient {
@@ -109,6 +112,7 @@ class CrashReporterClient {
// libc nor allocate memory normally.
virtual bool HandleCrashDump(const char* crashdump_filename,
uint64_t crash_pid);
@ -337,7 +337,7 @@ index 39557cce47443..236806090021a 100644
#endif
// The location where minidump files should be written. Returns true if
@@ -204,6 +208,27 @@ class CrashReporterClient {
@@ -206,6 +210,27 @@ class CrashReporterClient {
// Returns true if breakpad should run in the given process type.
virtual bool EnableBreakpadForProcess(const std::string& process_type);
@ -345,18 +345,18 @@ index 39557cce47443..236806090021a 100644
+ // Populate |arguments| with additional optional arguments.
+ virtual void GetCrashOptionalArguments(std::vector<std::string>* arguments);
+
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+ // Returns the absolute path to the external crash handler exe.
+ virtual std::wstring GetCrashExternalHandler(const std::wstring& exe_dir);
+#endif
+
+#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
+ // Returns true if forwarding of crashes to the system crash reporter is
+ // enabled for the browser process.
+ virtual bool EnableBrowserCrashForwarding();
+#endif
+
+#if defined(OS_POSIX) && !defined(OS_MAC)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+ // Provides an oportunity to modify the parameters that will be sent with a
+ // crash upload.
+ using ParameterMap = std::map<std::string, std::string>;
@ -366,7 +366,7 @@ index 39557cce47443..236806090021a 100644
} // namespace crash_reporter
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index ea9ec2be09943..0c7ba2af97c0f 100644
index 6da6be46cee4a..5e3067c081867 100644
--- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc
@@ -154,7 +154,8 @@ bool InitializeCrashpadImpl(bool initial_client,

48
patch/patches/crashpad_tp_1995.patch
View File

@ -40,10 +40,10 @@ index b80cf7a59103b..6318dd05e6eef 100644
virtual ~PruneCondition() {}
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
index 3855b9b6a4b20..263f985043716 100644
index 966481d6284e4..e0fa8394cb045 100644
--- third_party/crashpad/crashpad/client/settings.cc
+++ third_party/crashpad/crashpad/client/settings.cc
@@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
@@ -87,7 +87,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
struct Settings::Data {
static constexpr uint32_t kSettingsMagic = 'CPds';
@ -52,7 +52,7 @@ index 3855b9b6a4b20..263f985043716 100644
enum Options : uint32_t {
kUploadsEnabled = 1 << 0,
@@ -97,6 +97,9 @@ struct Settings::Data {
@@ -98,6 +98,9 @@ struct Settings::Data {
options(0),
padding_0(0),
last_upload_attempt_time(0),
@ -62,7 +62,7 @@ index 3855b9b6a4b20..263f985043716 100644
client_id() {}
uint32_t magic;
@@ -104,6 +107,9 @@ struct Settings::Data {
@@ -105,6 +108,9 @@ struct Settings::Data {
uint32_t options;
uint32_t padding_0;
int64_t last_upload_attempt_time; // time_t
@ -72,7 +72,7 @@ index 3855b9b6a4b20..263f985043716 100644
UUID client_id;
};
@@ -187,6 +193,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
@@ -188,6 +194,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
return WriteSettings(handle.get(), settings);
}
@ -130,10 +130,10 @@ index 3855b9b6a4b20..263f985043716 100644
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
FileHandle file,
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
index d17f357ed458c..4740bb776125d 100644
index e476c60c3ba6b..ce8256c9f6d25 100644
--- third_party/crashpad/crashpad/client/settings.h
+++ third_party/crashpad/crashpad/client/settings.h
@@ -118,6 +118,11 @@ class Settings {
@@ -116,6 +116,11 @@ class Settings {
//! error logged.
bool SetLastUploadAttemptTime(time_t time);
@ -184,7 +184,7 @@ index 0fe4760db7fe2..042af7247712c 100644
if (crashpad_is_win) {
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
index 3872e1142f002..16a58f5af6a5a 100644
index c691361494b16..c2a2a9059c5ca 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -261,6 +261,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
@ -197,7 +197,7 @@ index 3872e1142f002..16a58f5af6a5a 100644
if (!reader->SeekSet(start_offset)) {
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
index 7649ae0db45d8..4b2d2f9667b5e 100644
index 70f1628354455..cd043a821e96d 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -15,6 +15,7 @@
@ -208,7 +208,7 @@ index 7649ae0db45d8..4b2d2f9667b5e 100644
#include <memory>
#include <string>
#include <unordered_map>
@@ -107,7 +108,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -108,7 +109,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! It is expected to only be called from the same thread that called Start().
void Stop() override;
@ -217,7 +217,7 @@ index 7649ae0db45d8..4b2d2f9667b5e 100644
//! \brief The result code from UploadReport().
enum class UploadResult {
//! \brief The crash report was uploaded successfully.
@@ -135,7 +136,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -136,7 +137,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! object was constructed with \a watch_pending_reports, it will also scan
//! the crash report database for other pending reports, and process those as
//! well.
@ -226,7 +226,7 @@ index 7649ae0db45d8..4b2d2f9667b5e 100644
//! \brief Processes a single pending report from the database.
//!
@@ -149,7 +150,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -150,7 +151,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! remain in the “pending” state. If the upload fails and no more retries are
//! desired, or report upload is disabled, it will be marked as “completed” in
//! the database without ever having been uploaded.
@ -235,7 +235,7 @@ index 7649ae0db45d8..4b2d2f9667b5e 100644
//! \brief Attempts to upload a crash report.
//!
@@ -166,6 +167,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -167,6 +168,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
UploadResult UploadReport(const CrashReportDatabase::UploadReport* report,
std::string* response_body);
@ -248,10 +248,10 @@ index 7649ae0db45d8..4b2d2f9667b5e 100644
//! \brief Calls ProcessPendingReports() in response to ReportPending() having
//! been called on any thread, as well as periodically on a timer.
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
index 5733463bedb94..ada3ac66bd435 100644
index cb78aa1680aec..d50ddc7ae3c56 100644
--- third_party/crashpad/crashpad/handler/handler_main.cc
+++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -39,6 +39,7 @@
@@ -38,6 +38,7 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -259,9 +259,9 @@ index 5733463bedb94..ada3ac66bd435 100644
#include "client/crash_report_database.h"
#include "client/crashpad_client.h"
#include "client/crashpad_info.h"
@@ -89,6 +90,10 @@
@@ -88,6 +89,10 @@
#include "util/win/session_end_watcher.h"
#endif // OS_APPLE
#endif // BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(ENABLE_CEF)
+#include "cef/libcef/common/cef_crash_report_upload_thread.h"
@ -270,7 +270,7 @@ index 5733463bedb94..ada3ac66bd435 100644
namespace crashpad {
namespace {
@@ -213,6 +218,9 @@ struct Options {
@@ -247,6 +252,9 @@ struct Options {
bool periodic_tasks;
bool rate_limit;
bool upload_gzip;
@ -280,7 +280,7 @@ index 5733463bedb94..ada3ac66bd435 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
bool use_cros_crash_reporter = false;
base::FilePath minidump_dir_for_tests;
@@ -582,6 +590,9 @@ int HandlerMain(int argc,
@@ -616,6 +624,9 @@ int HandlerMain(int argc,
kOptionTraceParentWithException,
#endif
kOptionURL,
@ -290,8 +290,8 @@ index 5733463bedb94..ada3ac66bd435 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
kOptionUseCrosCrashReporter,
kOptionMinidumpDirForTests,
@@ -683,6 +694,9 @@ int HandlerMain(int argc,
#endif // OS_ANDROID
@@ -716,6 +727,9 @@ int HandlerMain(int argc,
#endif // BUILDFLAG(IS_ANDROID)
{"help", no_argument, nullptr, kOptionHelp},
{"version", no_argument, nullptr, kOptionVersion},
+ {"max-uploads", required_argument, nullptr, kOptionMaxUploads},
@ -300,7 +300,7 @@ index 5733463bedb94..ada3ac66bd435 100644
{nullptr, 0, nullptr, 0},
};
@@ -838,6 +852,27 @@ int HandlerMain(int argc,
@@ -873,6 +887,27 @@ int HandlerMain(int argc,
options.url = optarg;
break;
}
@ -328,7 +328,7 @@ index 5733463bedb94..ada3ac66bd435 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
case kOptionUseCrosCrashReporter: {
options.use_cros_crash_reporter = true;
@@ -987,8 +1022,14 @@ int HandlerMain(int argc,
@@ -1022,8 +1057,14 @@ int HandlerMain(int argc,
upload_thread_options.upload_gzip = options.upload_gzip;
upload_thread_options.watch_pending_reports = options.periodic_tasks;
@ -343,7 +343,7 @@ index 5733463bedb94..ada3ac66bd435 100644
upload_thread.Get()->Start();
}
@@ -1058,7 +1099,8 @@ int HandlerMain(int argc,
@@ -1094,7 +1135,8 @@ int HandlerMain(int argc,
ScopedStoppable prune_thread;
if (options.periodic_tasks) {
prune_thread.Reset(new PruneCrashReportThread(

10
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 a001f60b279ed..b0ee6283be54f 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@
@ -10,8 +10,8 @@ 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(
}
@@ -276,6 +277,12 @@ blink::UserAgentBrandList GetBrandFullVersionList(
} // namespace
std::string GetProduct(const bool allow_version_override) {
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@ -20,6 +20,6 @@ index 1876f324468dc..f22b44017b38a 100644
+ switches::kUserAgentProductAndVersion);
+ }
+
// FF Priority 1: force major version to 99 and minor version to major version
// number.
if (allow_version_override &&
base::FeatureList::IsEnabled(
blink::features::kForceMajorVersion100InUserAgent))

4
patch/patches/extensions_1947.patch
View File

@ -161,7 +161,7 @@ index f88183071e861..a05302a7a2f0b 100644
// A pointer to the current or speculative main frame in `host_contents_`. We
// can't access this frame through the `host_contents_` directly as it does
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 564a62eb00beb..5f29a54e92169 100644
index 1fa1e67dddcfd..7af2a0e231824 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -27,6 +27,7 @@
@ -180,7 +180,7 @@ index 564a62eb00beb..5f29a54e92169 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -206,6 +208,14 @@ class ExtensionsBrowserClient {
@@ -207,6 +209,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;

28
patch/patches/gn_config.patch
View File

@ -1,8 +1,8 @@
diff --git .gn .gn
index fdde78244eb3d..ff26203773839 100644
index 22070a9adc507..e55d32f80b438 100644
--- .gn
+++ .gn
@@ -160,6 +160,8 @@ exec_script_whitelist =
@@ -156,6 +156,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
@ -12,7 +12,7 @@ index fdde78244eb3d..ff26203773839 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 7bb204910c41c..5ec046f0c1e3b 100644
index df8b37fc8b0af..e46843b39d228 100644
--- BUILD.gn
+++ BUILD.gn
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -66,10 +66,10 @@ index 982fbe8d3f0d0..e757be4688f10 100644
+ "studio path")
}
diff --git chrome/app/framework.order chrome/app/framework.order
index d2266b28b33f8..a7ff6d9b68f38 100644
index 839144aa1e9bd..29c8ab32398a7 100644
--- chrome/app/framework.order
+++ chrome/app/framework.order
@@ -72,3 +72,8 @@ _ChromeMain
@@ -28,3 +28,8 @@ _ChromeMain
_lprofDirMode
___llvm_profile_filename
___llvm_profile_raw_version
@ -79,18 +79,18 @@ index d2266b28b33f8..a7ff6d9b68f38 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 32eb89f02d799..a2baacc70957d 100644
index c540719a510ab..1107dfc9f2537 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -4,6 +4,7 @@
@@ -5,6 +5,7 @@
import("//ash/ambient/resources/resources.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/locales.gni")
+import("//cef/libcef/features/features.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
@@ -72,6 +73,10 @@ template("chrome_repack_percent") {
@@ -75,6 +76,10 @@ template("chrome_repack_percent") {
"//ui/chromeos/resources",
]
}
@ -102,7 +102,7 @@ index 32eb89f02d799..a2baacc70957d 100644
sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ]
deps += [ "//extensions:extensions_browser_resources" ]
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
index 7e6722603df99..0607f2e18c421 100644
index d969da6550bcb..97a5d2b843af5 100644
--- chrome/chrome_repack_locales.gni
+++ chrome/chrome_repack_locales.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@ -113,7 +113,7 @@ index 7e6722603df99..0607f2e18c421 100644
import("//extensions/buildflags/buildflags.gni")
import("//tools/grit/repack.gni")
@@ -95,6 +96,10 @@ template("chrome_repack_locales") {
@@ -90,6 +91,10 @@ template("chrome_repack_locales") {
[ "${root_gen_dir}/chromeos/strings/chromeos_strings_" ]
deps += [ "//chromeos/strings" ]
}
@ -152,12 +152,12 @@ index 51fa0d7f4cf77..2ede68e9377eb 100644
outputs = [
# See also chrome.packed.7z conditionally added below.
diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni
index 6bf3b8b3e42bd..025d5bd2e9118 100644
index 60022cbefac60..00f3bcd528ee0 100644
--- tools/grit/grit_defines.gni
+++ tools/grit/grit_defines.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/crypto.gni")
import("//build/config/devtools.gni")
+import("//build/config/locales.gni")
import("//build/config/ui.gni")

4
patch/patches/gritsettings.patch
View File

@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index 20c0a7835ce97..f54233b73a2d4 100644
index 667a253432794..a4601aa2ab136 100644
--- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec
@@ -905,6 +905,15 @@
@@ -916,6 +916,15 @@
# END "everything else" section.
# Everything but chrome/, components/, content/, and ios/

15
patch/patches/ime_1610.patch
View File

@ -1,15 +0,0 @@
diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
index fd587926e4b4f..aae0143c6cd67 100644
--- ui/base/ime/win/input_method_win_base.cc
+++ ui/base/ime/win/input_method_win_base.cc
@@ -263,8 +263,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
// receiving keyboard input as long as it is an active window. This works well
// even when the |attached_window_handle| becomes active but has not received
// WM_FOCUS yet.
+ // With CEF |toplevel_window_handle_| may be a child window.
return toplevel_window_handle_ &&
- GetActiveWindow() == toplevel_window_handle_;
+ GetActiveWindow() == ::GetAncestor(toplevel_window_handle_, GA_ROOT);
}
LRESULT InputMethodWinBase::OnChar(HWND window_handle,

8
patch/patches/linux_assets_path_1936.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
index bbc1d4d057291..a7c7d75f61df6 100644
index f60ad777ab769..5c585569da117 100644
--- content/browser/child_process_launcher_helper_linux.cc
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
@ -25,13 +25,13 @@ index 7022a65e03578..c9aaf5d76e4a1 100644
if (base::PathExists(sandbox_candidate))
sandbox_binary = sandbox_candidate;
diff --git ui/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
index e028d8cf8dec6..d172832589534 100644
index 08d42145b1d75..8fee0adc9b819 100644
--- ui/ozone/common/egl_util.cc
+++ ui/ozone/common/egl_util.cc
@@ -158,7 +158,7 @@ bool LoadDefaultEGLGLES2Bindings(
#if BUILDFLAG(ENABLE_SWIFTSHADER)
base::FilePath module_path;
#if !defined(OS_FUCHSIA)
#if !BUILDFLAG(IS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
return false;
@ -40,7 +40,7 @@ index e028d8cf8dec6..d172832589534 100644
@@ -171,7 +171,7 @@ bool LoadDefaultEGLGLES2Bindings(
} else if (implementation.gl == gl::kGLImplementationEGLANGLE) {
base::FilePath module_path;
#if !defined(OS_FUCHSIA)
#if !BUILDFLAG(IS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
return false;

4
patch/patches/linux_atk_1123214.patch
View File

@ -1,5 +1,5 @@
diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn
index 92baff2a9b6ee..fdf40cd38ad3a 100644
index 647bef697ec8f..64708b91d273f 100644
--- build/config/linux/atk/BUILD.gn
+++ build/config/linux/atk/BUILD.gn
@@ -11,7 +11,7 @@ import("//build/config/ui.gni")
@ -12,7 +12,7 @@ index 92baff2a9b6ee..fdf40cd38ad3a 100644
if (use_atk) {
assert(use_glib, "use_atk=true requires that use_glib=true")
diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn
index 988a995681361..1791ea607550e 100644
index d103d09a39a51..e032b7f357e85 100644
--- build/config/linux/atspi2/BUILD.gn
+++ build/config/linux/atspi2/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni")

4
patch/patches/linux_ui_ozone.patch
View File

@ -1,8 +1,8 @@
diff --git ui/ozone/BUILD.gn ui/ozone/BUILD.gn
index 3fde8b3379e2e..5966cefc752ee 100644
index 1a8ac4adbe961..473b6b89309d2 100644
--- ui/ozone/BUILD.gn
+++ ui/ozone/BUILD.gn
@@ -356,6 +356,8 @@ action("generate_test_support_constructor_list") {
@@ -369,6 +369,8 @@ action("generate_test_support_constructor_list") {
]
deps = [ ":generate_ozone_platform_list" ]

10
patch/patches/message_loop.patch
View File

@ -30,7 +30,7 @@ index d1140d7945a2d..a3b894aa4f6b0 100644
}
if (has_msg)
diff --git base/task/current_thread.cc base/task/current_thread.cc
index 718ba706b977c..aaa993ee8775b 100644
index b7e9d215c2039..57816ea1c8b81 100644
--- base/task/current_thread.cc
+++ base/task/current_thread.cc
@@ -49,6 +49,8 @@ void CurrentThread::AddDestructionObserver(
@ -43,14 +43,14 @@ index 718ba706b977c..aaa993ee8775b 100644
current_->RemoveDestructionObserver(destruction_observer);
}
diff --git base/task/current_thread.h base/task/current_thread.h
index 7ca1e0ee2cef9..40fd430d1885a 100644
index f82025cca1d17..6feb6ac241895 100644
--- base/task/current_thread.h
+++ base/task/current_thread.h
@@ -130,6 +130,12 @@ class BASE_EXPORT CurrentThread {
// to run. There can only be one OnNextIdleCallback at a time.
void RegisterOnNextIdleCallback(OnceClosure on_next_idle_callback);
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+ void set_os_modal_loop(bool os_modal_loop) { os_modal_loop_ = os_modal_loop; }
+
+ bool os_modal_loop() const { return os_modal_loop_; }
@ -64,7 +64,7 @@ index 7ca1e0ee2cef9..40fd430d1885a 100644
sequence_manager::internal::SequenceManagerImpl* current_;
+
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+ private:
+ // Should be set to true before calling Windows APIs like TrackPopupMenu, etc.
+ // which enter a modal message loop.
@ -72,4 +72,4 @@ index 7ca1e0ee2cef9..40fd430d1885a 100644
+#endif
};
#if !defined(OS_NACL)
#if !BUILDFLAG(IS_NACL)

2
patch/patches/message_pump_mac_2495.patch
View File

@ -1,5 +1,5 @@
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
index dd8147b884833..281a88eea8883 100644
index 36836673e97e5..96414c7bf97ee 100644
--- base/message_loop/message_pump_mac.mm
+++ base/message_loop/message_pump_mac.mm
@@ -696,7 +696,8 @@ void MessagePumpUIApplication::Detach() {

8
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
index dd068f90aecef..7f942d7f44361 100644
index 2c29b5c5c96b9..9ba3aaa327478 100644
--- content/browser/web_contents/web_contents_view.h
+++ content/browser/web_contents/web_contents_view.h
@@ -21,7 +21,7 @@ struct DropData;
@ -12,7 +12,7 @@ index dd068f90aecef..7f942d7f44361 100644
virtual ~WebContentsView() = default;
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index ded1894a7d1d7..6ea82766e8e87 100644
index 2a8095bb93264..2ee0f179d1002 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -210,6 +210,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@ -48,7 +48,7 @@ index ded1894a7d1d7..6ea82766e8e87 100644
WebContents* source,
const content::OpenURLParams& params) {
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 4c0820c60e765..68a499da10e80 100644
index 1b388778aac14..0ac4a5294dfa1 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -143,6 +143,7 @@ class MimeHandlerViewGuest
@ -59,7 +59,7 @@ index 4c0820c60e765..68a499da10e80 100644
// WebContentsDelegate implementation.
content::WebContents* OpenURLFromTab(
@@ -201,6 +202,7 @@ class MimeHandlerViewGuest
@@ -200,6 +201,7 @@ class MimeHandlerViewGuest
content::ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE};
int embedder_widget_routing_id_ = MSG_ROUTING_NONE;

4
patch/patches/net_cookie_flags.patch
View File

@ -10,10 +10,10 @@ index 96d1a51ec1078..e8120a818b1f2 100644
+// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index dc5c2d9ab617b..9d88970660678 100644
index affbbf4c11723..e003f694aa5ac 100644
--- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc
@@ -561,7 +561,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
@@ -591,7 +591,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode
// is being overridden by NetworkDelegate and will eventually block them, as
// blocked cookies still need to be logged in that case.

8
patch/patches/osr_fling_2745.patch
View File

@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
} // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index 367c17952131a..d15bd1e82577e 100644
index 7436238cd110e..bbc937f1c14df 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3098,6 +3098,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -3107,6 +3107,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
}
@ -57,10 +57,10 @@ index 367c17952131a..d15bd1e82577e 100644
const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index da4223e064f94..7567102173983 100644
index 785cf70788ddb..fc72ea7bb0d7b 100644
--- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h
@@ -777,6 +777,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -776,6 +776,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
void ProgressFlingIfNeeded(base::TimeTicks current_time);
void StopFling();

20
patch/patches/print_preview_123.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
index a45799d6fc9ee..d884e88e754cc 100644
index dbfae7b5e3d2c..bf18a6fbddf6d 100644
--- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@
@ -34,7 +34,7 @@ index a45799d6fc9ee..d884e88e754cc 100644
}
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
index 96929c4158ce5..68bacf03a27ff 100644
index 332fbc21aa0e3..1286fc203d6cd 100644
--- chrome/browser/printing/print_preview_dialog_controller.cc
+++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -15,6 +15,7 @@
@ -46,7 +46,7 @@ index 96929c4158ce5..68bacf03a27ff 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 c9f1502da55d8..874c95c2db26c 100644
index c759b7a7c9d19..c63900f5d1686 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO(
@ -66,7 +66,7 @@ index c9f1502da55d8..874c95c2db26c 100644
}
auto* printer_query_ptr = printer_query.get();
printer_query_ptr->SetSettings(
@@ -667,6 +668,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -675,6 +676,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
}
@ -74,7 +74,7 @@ index c9f1502da55d8..874c95c2db26c 100644
auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
weak_ptr_factory_.GetWeakPtr(), std::move(callback));
@@ -674,7 +676,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -682,7 +684,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
FROM_HERE,
base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
std::move(callback_wrapper), queue_,
@ -86,10 +86,10 @@ index c9f1502da55d8..874c95c2db26c 100644
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
index 5771a3ebd7614..acec0bea2841b 100644
index aa7915ac042fe..ab4d9a8ac6e24 100644
--- chrome/browser/printing/print_view_manager_base.h
+++ chrome/browser/printing/print_view_manager_base.h
@@ -150,9 +150,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
@@ -146,9 +146,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
// Manages the low-level talk to the printer.
scoped_refptr<PrintJob> print_job_;
@ -140,7 +140,7 @@ index 8c5ba47779d24..69dff1ae88000 100644
ConstrainedWebDialogUI::~ConstrainedWebDialogUI() = default;
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
index c4442eabef9b9..4196fdb4281cd 100644
index e5dfa76d26d86..b7dcf7a11479f 100644
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -21,6 +21,7 @@
@ -293,7 +293,7 @@ index 46c8b1d08b075..1ee95cd7c3240 100644
base::FilePath GetSaveLocation() const;
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index f35a751173b05..0c96bc1d7ce96 100644
index da70f602899a9..ca99c7d2ec09f 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,7 @@
@ -321,7 +321,7 @@ index f35a751173b05..0c96bc1d7ce96 100644
@@ -342,7 +350,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
chrome::kCloudPrintCertificateErrorLearnMoreURL);
#if !defined(OS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
- const std::u16string shortcut_text(kBasicPrintShortcut);
+ const std::u16string shortcut_text(GetBasicPrintShortcut());
source->AddString("systemDialogOption",

10
patch/patches/printing_context_2196.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index d8f67ab511648..707ca0f50328b 100644
index c7a7f857a28d0..9479a7874ea3b 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -142,6 +142,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
@@ -136,6 +136,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
ShouldPrintingContextSkipSystemCalls())),
thread_("Printing_Worker") {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@ -11,10 +11,10 @@ index d8f67ab511648..707ca0f50328b 100644
PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h
index 7d937e7e3f19d..be49a65eeed94 100644
index 3f36303105b79..aea7f788504d6 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -177,6 +177,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -172,6 +172,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }
@ -28,7 +28,7 @@ index 7d937e7e3f19d..be49a65eeed94 100644
protected:
explicit PrintingContext(Delegate* delegate);
@@ -221,6 +228,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -216,6 +223,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active.
int job_id_;

4
patch/patches/renderer_host_1070713.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 2d918fcf473d6..9f9b81727062d 100644
index 950fbd61f3a95..27064eb0a26bf 100644
--- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc
@@ -630,6 +630,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
@@ -643,6 +643,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
}
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

4
patch/patches/resource_bundle_2512.patch
View File

@ -1,5 +1,5 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index 27adbaa00ac5e..066ad65042fb8 100644
index 45dbcdb991f95..1f021598f6c8d 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -873,6 +873,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@ -28,7 +28,7 @@ index 27adbaa00ac5e..066ad65042fb8 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index ceca1e5ed14bf..0aa84b41bdcc7 100644
index 5e53e16ce105d..56ad14da6dc5b 100644
--- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h
@@ -208,6 +208,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {

6
patch/patches/runhooks.patch
View File

@ -26,10 +26,10 @@ index ec9e9eeda7cb7..b58e1900de059 100644
if (cpu != 'x64'):
# x64 is default target CPU thus any other CPU requires a target set
diff --git build/vs_toolchain.py build/vs_toolchain.py
index ecf0971ab1349..bf90866524442 100755
index e759bd6ca2afe..c146bfea59fc8 100755
--- build/vs_toolchain.py
+++ build/vs_toolchain.py
@@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
@@ -107,9 +107,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
runtime_path = os.path.pathsep.join(vs_runtime_dll_dirs)
os.environ['PATH'] = runtime_path + os.path.pathsep + os.environ['PATH']
elif sys.platform == 'win32' and not depot_tools_win_toolchain:
@ -46,7 +46,7 @@ index ecf0971ab1349..bf90866524442 100755
# When using an installed toolchain these files aren't needed in the output
# directory in order to run binaries locally, but they are needed in order
# to create isolates or the mini_installer. Copying them to the output
@@ -153,6 +160,10 @@ def _RegistryGetValue(key, value):
@@ -158,6 +165,10 @@ def _RegistryGetValue(key, value):
def GetVisualStudioVersion():
"""Return best available version of Visual Studio.
"""

16
patch/patches/rwh_background_color_1984.patch
View File

@ -1,8 +1,16 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 9bbfba2c8a3b5..93cb5605394cd 100644
index 20d613c480ce5..1753448bff5ce 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -710,10 +710,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
#include <memory>
+#include <tuple>
#include <set>
#include <utility>
@@ -678,10 +679,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
void RenderWidgetHostViewAura::UpdateBackgroundColor() {
DCHECK(GetBackgroundColor());
@ -19,7 +27,7 @@ index 9bbfba2c8a3b5..93cb5605394cd 100644
}
absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
@@ -2194,6 +2196,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2167,6 +2170,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
// This needs to happen only after |window_| has been initialized using
// Init(), because it needs to have the layer.
window_->SetEmbedFrameSinkId(frame_sink_id_);
@ -31,7 +39,7 @@ index 9bbfba2c8a3b5..93cb5605394cd 100644
+ if (web_contents) {
+ // TODO(mostynb): actually use prefs. Landing this as a separate CL
+ // first to rebaseline some unreliable layout tests.
+ ignore_result(web_contents->GetOrCreateWebPreferences());
+ std::ignore = web_contents->GetOrCreateWebPreferences();
+ }
}

60
patch/patches/services_network_2622.patch
View File

@ -1,16 +1,16 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 598fb5e2ee02a..85e742c8c1fec 100644
index d89552afd9c8f..7f2da3945aa3b 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
#include "base/task/post_task.h"
@@ -22,6 +22,7 @@
#include "base/task/thread_pool.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
+#include "cef/libcef/features/runtime.h"
#include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -695,7 +696,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -718,7 +719,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes).
@ -31,10 +31,10 @@ index 598fb5e2ee02a..85e742c8c1fec 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -708,7 +721,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@@ -746,7 +759,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
}
+ }
+ if (!in_memory) {
@ -42,10 +42,10 @@ index 598fb5e2ee02a..85e742c8c1fec 100644
::network::mojom::NetworkContextFilePaths::New();
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index c39c0da541fd4..81ef64813d2ae 100644
index 0aaef609b0709..ab1a8e96fdb30 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -539,6 +539,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -545,6 +545,25 @@ void CookieMonster::SetCookieableSchemes(
MaybeRunCookieCallback(std::move(callback), true);
}
@ -72,10 +72,10 @@ index c39c0da541fd4..81ef64813d2ae 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 98ff48a4e7bfa..663f8496df336 100644
index 1ed421b60d526..d65d32b4c0ca0 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -201,6 +201,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -205,6 +205,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
CookieChangeDispatcher& GetChangeDispatcher() override;
void SetCookieableSchemes(const std::vector<std::string>& schemes,
SetCookieableSchemesCallback callback) override;
@ -101,10 +101,10 @@ index 8631b10535c7d..7c4c518ee5b3d 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index abce7aed59cdc..e89ed1d6b7afb 100644
index f0660ffa8bd4d..4eb14790b8979 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -290,14 +290,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -324,14 +324,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
void CookieManager::AllowFileSchemeCookies(
bool allow,
AllowFileSchemeCookiesCallback callback) {
@ -123,28 +123,28 @@ index abce7aed59cdc..e89ed1d6b7afb 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 4a3f4fe1fb97a..fc0120b23374c 100644
index abcf825d8049a..552d8403fa0a8 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2195,16 +2195,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2216,17 +2216,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
+ std::unique_ptr<net::CookieMonster> cookie_store;
if (session_cleanup_cookie_store) {
- if (session_cleanup_cookie_store) {
- std::unique_ptr<net::CookieMonster> cookie_store =
+ cookie_store =
std::make_unique<net::CookieMonster>(session_cleanup_cookie_store.get(),
net_log);
if (params_->persist_session_cookies)
cookie_store->SetPersistSessionCookies(true);
- std::make_unique<net::CookieMonster>(
- session_cleanup_cookie_store.get(), net_log,
- network_service_->first_party_sets()->is_enabled());
- if (params_->persist_session_cookies)
- cookie_store->SetPersistSessionCookies(true);
+ std::unique_ptr<net::CookieMonster> cookie_store =
+ std::make_unique<net::CookieMonster>(
+ session_cleanup_cookie_store.get(), net_log,
+ network_service_->first_party_sets()->is_enabled());
+ if (session_cleanup_cookie_store && params_->persist_session_cookies)
+ cookie_store->SetPersistSessionCookies(true);
- builder.SetCookieStore(std::move(cookie_store));
+ } else {
+ cookie_store =
+ std::make_unique<net::CookieMonster>(nullptr /* store */, net_log);
+ }
+
+ if (params_->cookieable_schemes.has_value()) {
+ cookie_store->SetCookieableSchemes(
+ *params_->cookieable_schemes,
@ -157,10 +157,10 @@ index 4a3f4fe1fb97a..fc0120b23374c 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 8cdb76c6eac2b..d98843e5cdd32 100644
index d7c10e5a55bf0..958c2c27211f7 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -325,6 +325,9 @@ struct NetworkContextParams {
@@ -330,6 +330,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;

10
patch/patches/services_network_2718.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index 2a729ea2de461..4d6bcddba181d 100644
index 6df863b5fbc90..6b98a515af9f8 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -489,10 +489,6 @@ class LoginHandlerDelegate {
@@ -490,10 +490,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index 2a729ea2de461..4d6bcddba181d 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -544,12 +540,6 @@ void OnAuthRequiredContinuation(
@@ -545,12 +541,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index 2a729ea2de461..4d6bcddba181d 100644
new LoginHandlerDelegate(
std::move(auth_challenge_responder), std::move(web_contents_getter),
auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
@@ -2717,8 +2707,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2729,8 +2719,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@ -40,7 +40,7 @@ index 2a729ea2de461..4d6bcddba181d 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -2728,9 +2722,12 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -2740,9 +2734,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New();

6
patch/patches/storage_incognito_2289.patch
View File

@ -13,10 +13,10 @@ index df1a7ae70bdc3..10e9a0b3b881a 100644
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 6decb2aacdfdd..011ca030011df 100644
index 967c0ea22204d..e1a64c68e00f8 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -130,7 +130,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@@ -129,7 +129,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
StoragePartition* BrowserContext::GetStoragePartition(
const StoragePartitionConfig& storage_partition_config,
bool can_create) {
@ -25,7 +25,7 @@ index 6decb2aacdfdd..011ca030011df 100644
// An off the record profile MUST only use in memory storage partitions.
CHECK(storage_partition_config.in_memory());
}
@@ -371,7 +371,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
@@ -370,7 +370,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
const bool kUseInMemoryDBDefault = false;
bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,

2
patch/patches/trace_event.patch
View File

@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index f6f346bbc56d4..4eb24caa74d5a 100644
index 5404ededf7722..aadd1faff7d63 100644
--- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h
@@ -61,6 +61,8 @@

4
patch/patches/ui_dragdrop_355390.patch
View File

@ -1,8 +1,8 @@
diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
index 4cd2a43b4d937..cd1b9faf6e9a7 100644
index d337bee1db15b..1dfc9e77a50aa 100644
--- ui/base/x/x11_os_exchange_data_provider.cc
+++ ui/base/x/x11_os_exchange_data_provider.cc
@@ -127,7 +127,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
@@ -139,7 +139,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
format_map_.Insert(x11::GetAtom(kMimeTypeMozillaURL), mem);
// Set a string fallback as well.

40
patch/patches/views_1749_2102.patch
View File

@ -43,10 +43,10 @@ index 11f1421cc79c1..c5dbc643ae7c8 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 99120dd6d7fb0..94f2d52787860 100644
index de5999c5252f3..97d08b4d3b7f9 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -650,6 +650,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
@@ -659,6 +659,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
}
}
@ -61,7 +61,7 @@ index 99120dd6d7fb0..94f2d52787860 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -1994,6 +2002,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -2003,6 +2011,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false;
@ -82,7 +82,7 @@ index 99120dd6d7fb0..94f2d52787860 100644
}
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index b936fe3ed5196..f878635e34513 100644
index ec064d43e5afd..3893339b72cf3 100644
--- ui/gfx/render_text.h
+++ ui/gfx/render_text.h
@@ -343,6 +343,10 @@ class GFX_EXPORT RenderText {
@ -150,7 +150,7 @@ index 75d1292ce4d49..e22a73e3771c4 100644
ImageView* image() const { return image_; }
Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index bb2e1b4412205..493cb05b5c7fa 100644
index 1852dffd41233..7e581af0d4465 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -53,12 +53,27 @@ enum LabelPropertyKey {
@ -181,7 +181,7 @@ index bb2e1b4412205..493cb05b5c7fa 100644
} // namespace
namespace views {
@@ -422,6 +437,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
@@ -426,6 +441,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
}
@ -197,7 +197,7 @@ index bb2e1b4412205..493cb05b5c7fa 100644
std::u16string Label::GetTooltipText() const {
return tooltip_text_;
}
@@ -718,6 +742,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
@@ -722,6 +746,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SelectRange(stored_selection_range_);
}
@ -215,10 +215,10 @@ index bb2e1b4412205..493cb05b5c7fa 100644
}
diff --git ui/views/controls/label.h ui/views/controls/label.h
index 1642bff4910d9..34b560bddae57 100644
index 8132b9b9a1c75..4f78f6f41c77f 100644
--- ui/views/controls/label.h
+++ ui/views/controls/label.h
@@ -232,6 +232,10 @@ class VIEWS_EXPORT Label : public View,
@@ -234,6 +234,10 @@ class VIEWS_EXPORT Label : public View,
gfx::ElideBehavior GetElideBehavior() const;
void SetElideBehavior(gfx::ElideBehavior elide_behavior);
@ -229,7 +229,7 @@ index 1642bff4910d9..34b560bddae57 100644
// Gets/Sets the tooltip text. Default behavior for a label (single-line) is
// to show the full text if it is wider than its bounds. Calling this
// overrides the default behavior and lets you set a custom tooltip. To
@@ -478,6 +482,7 @@ class VIEWS_EXPORT Label : public View,
@@ -480,6 +484,7 @@ class VIEWS_EXPORT Label : public View,
int max_width_ = 0;
// This is used in single-line mode.
int max_width_single_line_ = 0;
@ -238,10 +238,10 @@ index 1642bff4910d9..34b560bddae57 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 25d5a0cc92b5f..cf85b366d15c8 100644
index 2571ad8b9cbb9..77ffb9f214b34 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2877,8 +2877,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2868,8 +2868,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@ -256,7 +256,7 @@ index 25d5a0cc92b5f..cf85b366d15c8 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2897,8 +2902,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2888,8 +2893,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@ -308,10 +308,10 @@ index 9c1542e1f4f0f..548fc8e87d520 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 51518e199ab63..ce7a13a1fa1cb 100644
index 20f678de0dcbf..4668a984ddcea 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1083,6 +1083,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -1084,6 +1084,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@ -327,7 +327,7 @@ index 51518e199ab63..ce7a13a1fa1cb 100644
} else if (paint_as_selected) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1149,6 +1158,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
@@ -1151,6 +1160,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
}
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -449,7 +449,7 @@ index b7c7474fb5910..ce3e14071f0c6 100644
void WillHideMenu(MenuItemView* menu) override;
void OnMenuClosed(MenuItemView* menu) override;
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
index 2375a989af49c..67ffa4aa8fc30 100644
index 86bb005ff2c81..397d34be23dcb 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -239,6 +239,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@ -465,10 +465,10 @@ index 2375a989af49c..67ffa4aa8fc30 100644
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
diff --git ui/views/view.h ui/views/view.h
index 211ca9cb8916b..afad4c1a5b29f 100644
index bc6f04c6d2b1b..be4a0c8ad6695 100644
--- ui/views/view.h
+++ ui/views/view.h
@@ -22,6 +22,7 @@
@@ -21,6 +21,7 @@
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece.h"
@ -476,7 +476,7 @@ index 211ca9cb8916b..afad4c1a5b29f 100644
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/skia/include/core/SkPath.h"
@@ -270,7 +271,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
@@ -269,7 +270,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::EventTarget,
public ui::EventHandler,
public ui::PropertyHandler,

68
patch/patches/views_widget.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index 0399fd10fffc2..82fce2b5b0558 100644
index 1eb2b692c59d3..e48e4618bbc7b 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -606,6 +606,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
@ -18,7 +18,7 @@ index 0399fd10fffc2..82fce2b5b0558 100644
if (!GetMouseWheelPhaseHandler())
return;
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 7759ce1982ecf..9696bd87f8067 100644
index 0c21c3b6e2a4b..bf50bce147881 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -67,6 +67,7 @@ class CursorManager;
@ -49,7 +49,7 @@ index 7759ce1982ecf..9696bd87f8067 100644
// Called by the TextInputManager to notify the view about being removed from
// the list of registered views, i.e., TextInputManager is no longer tracking
// TextInputState from this view. The RWHV should reset |text_input_manager_|
@@ -413,6 +420,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
@@ -407,6 +414,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0;
@ -62,7 +62,7 @@ index 7759ce1982ecf..9696bd87f8067 100644
// Sets the cursor for this view to the one associated with the specified
// cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -644,6 +657,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
@@ -638,6 +651,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
raw_ptr<TooltipObserver> tooltip_observer_for_testing_ = nullptr;
@ -73,7 +73,7 @@ index 7759ce1982ecf..9696bd87f8067 100644
private:
FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest,
@@ -663,10 +680,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
@@ -659,10 +676,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
void SynchronizeVisualProperties();
@ -85,26 +85,26 @@ index 7759ce1982ecf..9696bd87f8067 100644
// renderer process changes. This method is called before notifying
// RenderWidgetHostImpl in order to allow the view to allocate a new
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
index 98aca4f460df0..3988d00691d13 100644
index 855e5ff668236..2bf32cabf159b 100644
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -53,6 +53,10 @@ namespace {
@@ -52,6 +52,10 @@ namespace {
// of the border area, in percentage of the corresponding dimension.
const int kMouseLockBorderPercentage = 15;
+#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
+#include "ui/aura/window_tree_host.h"
+#endif
+
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
// A callback function for EnumThreadWindows to enumerate and dismiss
// any owned popup windows.
@@ -838,6 +842,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
@@ -834,6 +838,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
}
return;
}
+#endif
+#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
+ if (host_view_->HasExternalParent() &&
+ window_ && window_->delegate()->CanFocus()) {
+ aura::WindowTreeHost* host = window_->GetHost();
@ -114,11 +114,11 @@ index 98aca4f460df0..3988d00691d13 100644
#endif
synthetic_move_position_ = center_in_screen;
}
@@ -867,6 +879,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
@@ -863,6 +875,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
}
void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
+ if (host_view_->HasExternalParent() &&
+ window_ && window_->delegate()->CanFocus()) {
+ aura::WindowTreeHost* host = window_->GetHost();
@ -133,7 +133,7 @@ index 98aca4f460df0..3988d00691d13 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index 3b119c648e34d..7c5f5761b3905 100644
index d213587450f06..3fde9a9ce47d5 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -253,6 +253,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@ -148,11 +148,11 @@ index 3b119c648e34d..7c5f5761b3905 100644
+ // Chromium-controlled view/window hierarchy.
+ virtual bool HasExternalParent() const = 0;
+
#if defined(OS_MAC)
#if BUILDFLAG(IS_MAC)
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index 4fa2992394329..f318cf87313bb 100644
index 549190ed1823a..8532cf8511570 100644
--- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc
@@ -1710,7 +1710,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@ -179,7 +179,7 @@ index 7c352dd0d992d..516623a91b0e1 100644
return host ? host->GetAcceleratedWidget() : nullptr;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
index 80d1019a5661b..48073dd9540e4 100644
index a41611a5d66a2..e39a12c85686d 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -231,6 +231,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@ -201,9 +201,9 @@ index 80d1019a5661b..48073dd9540e4 100644
void DesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
// In Windows, the native events sent to chrome are separated into client
// and non-client versions of events, which we record on our LocatedEvent
@@ -370,6 +382,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
properties->wm_class_class = params.wm_class_class;
properties->wm_role_name = params.wm_role_name;
@@ -372,6 +384,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
properties->wayland_app_id = params.wayland_app_id;
+ properties->parent_widget = params.parent_widget;
+
@ -243,10 +243,10 @@ index e9a126e30da2a..e2d068ba5f592 100644
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
};
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
index 5750a270fc4f4..de19047841809 100644
index 1c9525d4d4302..f6e54a3362848 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -216,8 +216,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
@@ -217,8 +217,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
if (properties.parent_widget) {
window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
properties.parent_widget);
@ -258,10 +258,10 @@ index 5750a270fc4f4..de19047841809 100644
// Calculate initial bounds.
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index d44e1caec0a36..e0a87ea6dfa19 100644
index 7323cb11296e9..7876f7d208bd1 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -181,8 +181,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -180,8 +180,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
native_widget_delegate_);
HWND parent_hwnd = nullptr;
@ -275,7 +275,7 @@ index d44e1caec0a36..e0a87ea6dfa19 100644
remove_standard_frame_ = params.remove_standard_frame;
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
@@ -989,11 +993,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -988,11 +992,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -294,7 +294,7 @@ index d44e1caec0a36..e0a87ea6dfa19 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 9432480a38e45..82c4ffa97eee4 100644
index 7511694b58e56..eb7d82b4d520e 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -322,6 +322,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@ -309,10 +309,10 @@ index 9432480a38e45..82c4ffa97eee4 100644
// a reference.
raw_ptr<corewm::TooltipWin> tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index a2627e07f3131..7acd793ca3cb3 100644
index 0e20d424e46c5..8d394e3e2f10a 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -359,7 +359,8 @@ void Widget::Init(InitParams params) {
@@ -341,7 +341,8 @@ void Widget::Init(InitParams params) {
}
params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -322,7 +322,7 @@ index a2627e07f3131..7acd793ca3cb3 100644
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
params.type != views::Widget::InitParams::TYPE_WINDOW) {
@@ -435,13 +436,21 @@ void Widget::Init(InitParams params) {
@@ -417,13 +418,21 @@ void Widget::Init(InitParams params) {
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
Maximize();
@ -345,7 +345,7 @@ index a2627e07f3131..7acd793ca3cb3 100644
}
native_theme_observation_.Observe(GetNativeTheme());
@@ -1417,10 +1426,16 @@ void Widget::OnNativeWidgetDestroyed() {
@@ -1407,10 +1416,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@ -363,7 +363,7 @@ index a2627e07f3131..7acd793ca3cb3 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 52c0b91c81c41..d91ce4fd14094 100644
index 0bcdee12f8539..200e0a1b0770b 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -329,6 +329,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -391,7 +391,7 @@ index 3375d6c362923..24f36f6e5587a 100644
bool enable_arrow_key_traversal() const {
return params_.enable_arrow_key_traversal;
diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
index c23259757d984..450b2610e34d1 100644
index b10784dce1f69..4a6acf542dece 100644
--- ui/views/widget/widget_hwnd_utils.cc
+++ ui/views/widget/widget_hwnd_utils.cc
@@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams(
@ -404,10 +404,10 @@ index c23259757d984..450b2610e34d1 100644
if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 387b5a7fd9c19..51d1f8bc9e40c 100644
index 302915bac66a4..0bbed4079bfaf 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -3119,10 +3119,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3126,10 +3126,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::ET_MOUSEWHEEL) {
ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable.

36
patch/patches/viz_osr_2575.patch
View File

@ -1,12 +1,12 @@
diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
index 3b00759e513dc..90fe332d59f5b 100644
index d3970b4d86e1f..eac209e0a8159 100644
--- components/viz/host/host_display_client.cc
+++ components/viz/host/host_display_client.cc
@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
@@ -46,9 +46,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
}
#endif
-#if defined(OS_WIN)
-#if BUILDFLAG(IS_WIN)
+void HostDisplayClient::UseProxyOutputDevice(
+ UseProxyOutputDeviceCallback callback) {
+ std::move(callback).Run(false);
@ -14,11 +14,11 @@ index 3b00759e513dc..90fe332d59f5b 100644
+
void HostDisplayClient::CreateLayeredWindowUpdater(
mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) {
+#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
if (!NeedsToUseLayerWindow(widget_)) {
DLOG(ERROR) << "HWND shouldn't be using a layered window";
return;
@@ -55,8 +60,8 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
@@ -56,8 +61,8 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
layered_window_updater_ =
std::make_unique<LayeredWindowUpdaterImpl>(widget_, std::move(receiver));
@ -29,7 +29,7 @@ index 3b00759e513dc..90fe332d59f5b 100644
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
index b2ad84c881ac7..c207f7b5ac831 100644
index 1c2885c42f494..7dc5f41a7da79 100644
--- components/viz/host/host_display_client.h
+++ components/viz/host/host_display_client.h
@@ -34,17 +34,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
@ -41,12 +41,12 @@ index b2ad84c881ac7..c207f7b5ac831 100644
// mojom::DisplayClient implementation:
+ void UseProxyOutputDevice(UseProxyOutputDeviceCallback callback) override;
+
#if defined(OS_APPLE)
#if BUILDFLAG(IS_APPLE)
void OnDisplayReceivedCALayerParams(
const gfx::CALayerParams& ca_layer_params) override;
#endif
-#if defined(OS_WIN)
-#if BUILDFLAG(IS_WIN)
void CreateLayeredWindowUpdater(
mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
-#endif
@ -80,10 +80,10 @@ index 309422bcf8581..759549f3046f4 100644
private:
const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index fae4aae8ed31b..d29584721a4bf 100644
index c92e6d2ad10fb..a1d74b50e244b 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -216,6 +216,8 @@ viz_component("service") {
@@ -221,6 +221,8 @@ viz_component("service") {
"transitions/transferable_resource_tracker.cc",
"transitions/transferable_resource_tracker.h",
"viz_service_export.h",
@ -93,10 +93,10 @@ index fae4aae8ed31b..d29584721a4bf 100644
defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
index e0afde4b0cb45..8782e6a6a3cc3 100644
index 8a277c6337d44..c857919b010c6 100644
--- components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -16,6 +16,7 @@
@@ -17,6 +17,7 @@
#include "build/chromecast_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
@ -104,7 +104,7 @@ index e0afde4b0cb45..8782e6a6a3cc3 100644
#include "components/viz/common/display/renderer_settings.h"
#include "components/viz/common/frame_sinks/begin_frame_source.h"
#include "components/viz/service/display/display_compositor_memory_and_task_controller.h"
@@ -246,6 +247,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
@@ -247,6 +248,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
if (headless_)
return std::make_unique<SoftwareOutputDevice>();
@ -122,7 +122,7 @@ index e0afde4b0cb45..8782e6a6a3cc3 100644
+ }
+ }
+
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
display_client);
diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
@ -142,10 +142,10 @@ index 583e3e2525c75..e1836039ad8a5 100644
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
index ba0d6ca4e9004..167c4b095ff84 100644
index 0e3af0f9280ab..8a1e93995b316 100644
--- content/browser/compositor/viz_process_transport_factory.cc
+++ content/browser/compositor/viz_process_transport_factory.cc
@@ -383,8 +383,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -381,8 +381,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
compositor_data.display_private.reset();
root_params->display_private =
compositor_data.display_private.BindNewEndpointAndPassReceiver();
@ -162,7 +162,7 @@ index ba0d6ca4e9004..167c4b095ff84 100644
compositor_data.display_client->GetBoundRemote(resize_task_runner_);
diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
index ab6f00f2c8b05..d648e49cf4372 100644
index e7e67ee824b2a..bb044cff83f58 100644
--- mojo/public/cpp/bindings/sync_call_restrictions.h
+++ mojo/public/cpp/bindings/sync_call_restrictions.h
@@ -42,6 +42,7 @@ class Compositor;
@ -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 7e3a624f99fea..749c6acb701c2 100644
index 383aff3755d4b..a5b2a79d3a724 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -30,7 +30,9 @@

30
patch/patches/web_contents_1257_1565.patch
View File

@ -1,10 +1,10 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index a3ff7b5dece60..4905203885513 100644
index bf235e7493dd0..1f0eb81769b56 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2971,6 +2971,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
params.renderer_initiated_creation,
params.main_frame_name, GetOriginalOpener());
@@ -2979,6 +2979,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
@ -15,7 +15,7 @@ index a3ff7b5dece60..4905203885513 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2981,6 +2987,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2989,6 +2995,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -23,7 +23,7 @@ index a3ff7b5dece60..4905203885513 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3854,6 +3861,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3853,6 +3860,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@ -39,7 +39,7 @@ index a3ff7b5dece60..4905203885513 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7621,6 +7637,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7625,6 +7641,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames).
SetFocusedFrameTree(node->frame_tree());
}
@ -50,10 +50,10 @@ index a3ff7b5dece60..4905203885513 100644
void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 6d1587c1d7e36..a998ec5a27543 100644
index b980a289bd530..3b33291faa4b9 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -93,10 +93,12 @@ class BrowserContext;
@@ -92,10 +92,12 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@ -66,7 +66,7 @@ index 6d1587c1d7e36..a998ec5a27543 100644
class WebUI;
struct DropData;
struct MHTMLGenerationParams;
@@ -234,6 +236,10 @@ class WebContents : public PageNavigator,
@@ -233,6 +235,10 @@ class WebContents : public PageNavigator,
network::mojom::WebSandboxFlags starting_sandbox_flags =
network::mojom::WebSandboxFlags::kNone;
@ -78,10 +78,10 @@ index 6d1587c1d7e36..a998ec5a27543 100644
// the value that'll be returned by GetLastActiveTime(). If this is left
// default initialized then the value is not passed on to the WebContents
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index f04506bf8b64f..936f86af74eda 100644
index 58e977220a5d9..17c8e137c4f61 100644
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -58,10 +58,12 @@ class EyeDropperListener;
@@ -57,10 +57,12 @@ class EyeDropperListener;
class FileSelectListener;
class JavaScriptDialogManager;
class RenderFrameHost;
@ -94,7 +94,7 @@ index f04506bf8b64f..936f86af74eda 100644
struct ContextMenuParams;
struct DropData;
struct MediaPlayerWatchTime;
@@ -344,6 +346,14 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -343,6 +345,14 @@ class CONTENT_EXPORT WebContentsDelegate {
const StoragePartitionId& partition_id,
SessionStorageNamespace* session_storage_namespace);
@ -110,10 +110,10 @@ index f04506bf8b64f..936f86af74eda 100644
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index fe2f6632ad95d..0c6a1e77caec1 100644
index 469b98f8405d2..980fed8e97ea1 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -739,6 +739,10 @@ class CONTENT_EXPORT WebContentsObserver {
@@ -778,6 +778,10 @@ class CONTENT_EXPORT WebContentsObserver {
// WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

12
patch/patches/webkit_popups.patch
View File

@ -11,10 +11,10 @@ index 14d4a00293ab0..fc574edaaa2ad 100644
// Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 68dfddc7d98a2..7ae8a410bf4ed 100644
index 87e3d73b791eb..7cc3388b38c3f 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -248,8 +248,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -247,8 +247,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@ -30,7 +30,7 @@ index 68dfddc7d98a2..7ae8a410bf4ed 100644
}
namespace {
@@ -557,6 +562,7 @@ WebViewImpl::WebViewImpl(
@@ -556,6 +561,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@ -39,7 +39,7 @@ index 68dfddc7d98a2..7ae8a410bf4ed 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
page_base_background_color_(
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 63e97c417f170..2423ae2573624 100644
index 25f9a9fc617d7..8c59629d4cfa1 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -133,7 +133,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -62,10 +62,10 @@ index 63e97c417f170..2423ae2573624 100644
TransformationMatrix device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index c821dd940201d..5e62b8bda57b6 100644
index c442ddf0d214c..56bf5066688d3 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -863,7 +863,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
@@ -889,7 +889,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();

6
patch/patches/webkit_runtime_enabled_features.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
index 898ba62f2518d..bbd6a8d3b0375 100644
index f5462b5ff494e..cf4984b6effd0 100644
--- third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
+++ third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
@@ -12,6 +12,8 @@
@@ -13,6 +13,8 @@
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
@ -11,7 +11,7 @@ index 898ba62f2518d..bbd6a8d3b0375 100644
#define ASSERT_ORIGIN_TRIAL(feature) \
static_assert(std::is_same<decltype(::blink::RuntimeEnabledFeatures:: \
feature##EnabledByRuntimeFlag()), \
@@ -122,6 +124,7 @@ class PLATFORM_EXPORT RuntimeEnabledFeatures : public RuntimeEnabledFeaturesBase
@@ -106,6 +108,7 @@ class PLATFORM_EXPORT RuntimeEnabledFeatures : public RuntimeEnabledFeaturesBase
// protected section of RuntimeEnabledFeaturesBase. Normally, unit tests
// should use the ScopedFeatureNameForTest classes defined in
// platform/testing/runtime_enabled_features_test_helpers.h.

16
patch/patches/webui_2037.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index 39752c1bed2ba..3d3a9349be280 100644
index a09a1c38dc293..bd28d427873a9 100644
--- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -10,6 +10,7 @@
@ -39,7 +39,7 @@ index 39752c1bed2ba..3d3a9349be280 100644
PopulateExtensionInfoLogs(response.get());
PopulatePowerApiLogs(response.get());
PopulateDataReductionProxyLogs(response.get());
@@ -408,6 +415,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
@@ -414,6 +421,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
if (!profile)
return;
@ -52,8 +52,8 @@ index 39752c1bed2ba..3d3a9349be280 100644
extensions::ExtensionRegistry* extension_registry =
extensions::ExtensionRegistry::Get(profile);
std::string extensions_list;
@@ -515,6 +528,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
#if defined(OS_WIN)
@@ -521,6 +534,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
#if BUILDFLAG(IS_WIN)
void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
SystemLogsResponse* response) {
+ // The below call may result in some DLLs being loaded.
@ -62,7 +62,7 @@ index 39752c1bed2ba..3d3a9349be280 100644
bool result =
base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
index b732247e53b72..b7969350923a9 100644
index 8eb1f1699728e..ebc105d79372f 100644
--- chrome/browser/memory_details.cc
+++ chrome/browser/memory_details.cc
@@ -8,6 +8,7 @@
@ -70,10 +70,10 @@ index b732247e53b72..b7969350923a9 100644
#include "base/bind.h"
+#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "base/containers/cxx20_erase.h"
#include "base/file_version_info.h"
#include "base/metrics/histogram_macros.h"
@@ -17,6 +18,7 @@
@@ -18,6 +19,7 @@
#include "base/task/thread_pool.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profile.h"
@ -81,7 +81,7 @@ index b732247e53b72..b7969350923a9 100644
#include "components/nacl/common/nacl_process_type.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
@@ -287,7 +289,9 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -291,7 +293,9 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
// Determine if this is an extension process.
bool process_is_for_extensions = false;
const extensions::ExtensionSet* extension_set = nullptr;

4
patch/patches/webview_plugin_2020.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index a9fd3a713304a..f55246a93f3ba 100644
index 2e9301625477b..d941840163cb1 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5413,7 +5413,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -5424,7 +5424,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">

4
patch/patches/win_sandbox_3210.patch
View File

@ -1,8 +1,8 @@
diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
index 497d535f27884..4d3ea83b29c56 100644
index 197e66eeb5b3b..f92f0659aa13f 100644
--- sandbox/policy/win/sandbox_win.cc
+++ sandbox/policy/win/sandbox_win.cc
@@ -1152,6 +1152,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
@@ -1155,6 +1155,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
const base::HandlesToInheritVector& handles_to_inherit,
SandboxDelegate* delegate,
base::Process* process) {