bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 102.0.4997.0 (#990845)

Browse Source 
- Windows: SDK version 10.0.20348.0 is now required.
- MacOS: SDK version 12.3 (Xcode 13.3) is now required.
- Legacy swiftshader binaries (`swiftshader/*` on Win/Linux and
  `libswiftshader_*.dylib` on MacOS) have been removed (see issue #3176).
This commit is contained in:
Marshall Greenblatt
2022-04-21 14:58:48 -04:00
parent b318adddac
commit 916360e2e5
80 changed files with 544 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 29f74fb8bedaa..2608ea2a70aca 100644
index 15da9351b899b..a027749fce2ef 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -37,6 +37,7 @@ import("//build/nocompile.gni")
@@ -9,8 +9,8 @@ index 29f74fb8bedaa..2608ea2a70aca 100644
+import("//cef/libcef/features/features.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1896,7 +1897,11 @@ mixed_component("base") {
@@ -1886,7 +1887,11 @@ mixed_component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@@ -23,7 +23,7 @@ index 29f74fb8bedaa..2608ea2a70aca 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -2150,6 +2155,12 @@ mixed_component("base") {
@@ -2030,6 +2035,12 @@ mixed_component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

13
patch/patches/blink_security_policy_1289230.patch
View File

@@ -1,13 +0,0 @@
diff --git third_party/blink/renderer/platform/weborigin/security_policy.cc third_party/blink/renderer/platform/weborigin/security_policy.cc
index e0527ec908014..5ea849a975818 100644
--- third_party/blink/renderer/platform/weborigin/security_policy.cc
+++ third_party/blink/renderer/platform/weborigin/security_policy.cc
@@ -90,7 +90,7 @@ Referrer SecurityPolicy::GenerateReferrer(
ReferrerUtils::MojoReferrerPolicyResolveDefault(referrer_policy);
if (referrer == Referrer::NoReferrer())
return Referrer(Referrer::NoReferrer(), referrer_policy_no_default);
- DCHECK(!referrer.IsEmpty());
+ // DCHECK(!referrer.IsEmpty());
KURL referrer_url = KURL(NullURL(), referrer).UrlStrippedForUseAsReferrer();

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 243e8830a3369..17416baa5fbf3 100644
index 38d037f3b861f..b2af20324bd35 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -301,7 +301,7 @@ BrowserTaskExecutor::OnUserInputStart() {
@@ -304,7 +304,7 @@ BrowserTaskExecutor::OnUserInputStart() {
// static
void BrowserTaskExecutor::Shutdown() {

6
patch/patches/browser_security_policy_1081397.patch
View File

@@ -20,10 +20,10 @@ index f5b91aa9fc965..65319cceb358c 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 dad72b675ef23..e5afb8080f074 100644
index c9dc13f15119a..ac34d086f26c0 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -6053,6 +6053,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
@@ -6120,6 +6120,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 dad72b675ef23..e5afb8080f074 100644
// Apply sandbox flags.
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
@@ -6086,6 +6092,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
@@ -6153,6 +6159,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin();

15
patch/patches/browser_web_ui_controller_factory.patch
View File

@@ -12,3 +12,18 @@ index eb068fb9bb42c..4e8e6a1a7abf4 100644
static void UnregisterFactoryForTesting(WebUIControllerFactory* factory);
};
diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h
index 69f7420dc3807..a928869f5ecf5 100644
--- content/public/browser/webui_config_map.h
+++ content/public/browser/webui_config_map.h
@@ -53,6 +53,10 @@ class CONTENT_EXPORT WebUIConfigMap {
WebUIConfig* GetConfig(BrowserContext* browser_context,
const url::Origin& origin);
+ WebUIControllerFactory* controller_factory() const {
+ return webui_controller_factory_.get();
+ }
+
private:
void AddWebUIConfigImpl(std::unique_ptr<WebUIConfig> config);

4
patch/patches/build.patch
View File

@@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 60165f14531c4..5695b04b0a28f 100644
index c411ee37ca205..d63ea867cb635 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -1857,8 +1857,6 @@ config("thin_archive") {
@@ -1839,8 +1839,6 @@ config("thin_archive") {
# confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ]

6
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index fbceb85450c53..1141aa50698fe 100644
index 5c126bf6ff139..d3af3a615e240 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index fbceb85450c53..1141aa50698fe 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1916,6 +1917,7 @@ static_library("browser") {
@@ -1939,6 +1940,7 @@ static_library("browser") {
"//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index fbceb85450c53..1141aa50698fe 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2572,6 +2574,10 @@ static_library("browser") {
@@ -2601,6 +2603,10 @@ static_library("browser") {
deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
}

8
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@@ -14,10 +14,10 @@ index d7b9aa164f161..a042abaecbce7 100644
std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 0084eeb6ec160..8f5794588fe8a 100644
index 44e000fe1d3ea..1dc5893f5bd65 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -1001,18 +1001,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -1003,18 +1003,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
return download_request_limiter_.get();
}
@@ -52,10 +52,10 @@ index 8fd6e51b8f078..fb09ea0eb6ba1 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 7bc92543cf2bd..ae150df4ada12 100644
index 8601ee1efb576..52da94c02f6f1 100644
--- chrome/browser/lifetime/browser_close_manager.cc
+++ chrome/browser/lifetime/browser_close_manager.cc
@@ -151,12 +151,14 @@ void BrowserCloseManager::CloseBrowsers() {
@@ -156,12 +156,14 @@ void BrowserCloseManager::CloseBrowsers() {
// exit can restore all browsers open before exiting.
ProfileManager::ShutdownSessionServices();
#endif

50
patch/patches/chrome_browser_browser.patch
View File

@@ -13,7 +13,7 @@ index 9e534ff1683f1..de406f5879be0 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 936021a313995..2dd2554f8a7c5 100644
index b26bef7fb2293..421f7b723bbc0 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni")
@@ -24,7 +24,7 @@ index 936021a313995..2dd2554f8a7c5 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
@@ -353,6 +354,10 @@ static_library("ui") {
@@ -359,6 +360,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -35,7 +35,7 @@ index 936021a313995..2dd2554f8a7c5 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -375,6 +380,7 @@ static_library("ui") {
@@ -381,6 +386,7 @@ static_library("ui") {
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//cc/paint",
@@ -43,7 +43,7 @@ index 936021a313995..2dd2554f8a7c5 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5301,6 +5307,7 @@ static_library("ui") {
@@ -5342,6 +5348,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
@@ -52,10 +52,10 @@ index 936021a313995..2dd2554f8a7c5 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 3284c6c6353cc..6694f9000c14a 100644
index 70ee9049e3cb7..97af3ddf51ecf 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -262,6 +262,25 @@
@@ -263,6 +263,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@@ -81,7 +81,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -504,6 +523,13 @@ Browser::Browser(const CreateParams& params)
@@ -505,6 +524,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@@ -95,7 +95,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1322,6 +1348,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1323,6 +1349,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -110,7 +110,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1329,8 +1363,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1330,8 +1364,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -131,7 +131,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1535,6 +1579,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1536,6 +1580,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@@ -146,8 +146,8 @@ index 3284c6c6353cc..6694f9000c14a 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1642,6 +1694,15 @@ void Browser::AddNewContents(WebContents* source,
source, disposition);
@@ -1658,6 +1710,15 @@ void Browser::AddNewContents(WebContents* source,
new_contents.get());
}
+#if BUILDFLAG(ENABLE_CEF)
@@ -160,9 +160,9 @@ index 3284c6c6353cc..6694f9000c14a 100644
+#endif
+
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect);
disposition, initial_rect, window_action);
}
@@ -1660,6 +1721,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1676,6 +1737,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -171,7 +171,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1687,6 +1750,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1703,6 +1766,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -180,7 +180,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
if (!GetStatusBubble())
return;
@@ -1694,6 +1759,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1710,6 +1775,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -198,7 +198,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1718,6 +1794,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -1734,6 +1810,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@@ -218,7 +218,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1810,6 +1899,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1826,6 +1915,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -229,7 +229,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1854,6 +1947,8 @@ void Browser::RendererResponsive(
@@ -1870,6 +1963,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -238,7 +238,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1909,11 +2004,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1925,11 +2020,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@@ -254,7 +254,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2623,13 +2722,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2642,13 +2741,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@@ -276,7 +276,7 @@ index 3284c6c6353cc..6694f9000c14a 100644
return window_ ? window_->GetStatusBubble() : nullptr;
}
@@ -2756,6 +2862,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2775,6 +2881,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
}
@@ -388,7 +388,7 @@ index 5edda102ff59c..f2cccff5a5c56 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 a5d8ce8641968..b57d9ebb5734d 100644
index a1680f4c54a57..bd8894ef42889 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -498,6 +498,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -406,10 +406,10 @@ index a5d8ce8641968..b57d9ebb5734d 100644
// tab helpers, so the entire set of tab helpers needs to be set up
// immediately.
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
index 40907675219d3..19e1093947ed0 100644
index 9d0cf64ac7dcb..b6066163d2dc3 100644
--- chrome/browser/ui/browser_tabstrip.cc
+++ chrome/browser/ui/browser_tabstrip.cc
@@ -30,9 +30,13 @@ void AddTabAt(Browser* browser,
@@ -31,9 +31,13 @@ void AddTabAt(Browser* browser,
// Time new tab page creation time. We keep track of the timing data in
// WebContents, but we want to include the time it takes to create the
// WebContents object too.

30
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 5e4b07cda7100..420badf9841e9 100644
index 1687c8f965a49..95c31e8641311 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -292,6 +292,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -296,6 +296,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@@ -16,7 +16,7 @@ index 5e4b07cda7100..420badf9841e9 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -504,6 +511,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -522,6 +529,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@@ -27,7 +27,7 @@ index 5e4b07cda7100..420badf9841e9 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -690,6 +701,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -708,6 +719,14 @@ RenderViewContextMenu::RenderViewContextMenu(
system_app_ = GetBrowser() && GetBrowser()->app_controller()
? GetBrowser()->app_controller()->system_app()
: nullptr;
@@ -42,7 +42,7 @@ index 5e4b07cda7100..420badf9841e9 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1055,6 +1074,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1086,6 +1105,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 5e4b07cda7100..420badf9841e9 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2782,6 +2807,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -2849,6 +2874,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@@ -69,10 +69,10 @@ index 5e4b07cda7100..420badf9841e9 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 5ef77d88c8990..5b236d4c6be2e 100644
index 16edbd2b396d2..36147131456e8 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -125,6 +125,12 @@ class RenderViewContextMenu
@@ -124,6 +124,12 @@ class RenderViewContextMenu
base::OnceCallback<void(content::RenderFrameHost*,
blink::mojom::PluginActionType)> cb);
@@ -85,7 +85,7 @@ index 5ef77d88c8990..5b236d4c6be2e 100644
protected:
Profile* GetProfile() const;
@@ -333,6 +339,9 @@ class RenderViewContextMenu
@@ -335,6 +341,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;
@@ -96,10 +96,10 @@ index 5ef77d88c8990..5b236d4c6be2e 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 4c5d58479aee4..04f23ed98bebd 100644
index dd729e8186d03..c1bc086e34a91 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
@@ -138,6 +138,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
@@ -139,6 +139,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
int command_id,
ui::Accelerator* accel) const {
@@ -110,7 +110,7 @@ index 4c5d58479aee4..04f23ed98bebd 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 0b1b12a3bb350..b2197ccda45a9 100644
index a3ba440acb3e9..48e77e93050e1 100644
--- components/renderer_context_menu/render_view_context_menu_base.cc
+++ components/renderer_context_menu/render_view_context_menu_base.cc
@@ -378,6 +378,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
@@ -132,7 +132,7 @@ index 0b1b12a3bb350..b2197ccda45a9 100644
command_executed_ = true;
RecordUsedItem(id);
diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
index 0dc1c3e553566..a4e7d7b91a89f 100644
index 3da0bab3d7bde..f1d5d7f09d6dc 100644
--- components/renderer_context_menu/render_view_context_menu_base.h
+++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -86,6 +86,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
@@ -165,9 +165,9 @@ index 0dc1c3e553566..a4e7d7b91a89f 100644
protected:
friend class RenderViewContextMenuTest;
friend class RenderViewContextMenuPrefsTest;
@@ -161,9 +170,6 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
// TODO(oshima): Remove this.
@@ -162,9 +171,6 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
virtual void AppendPlatformEditableItems() {}
virtual void ExecOpenInReadAnything() = 0;
- // May return nullptr if the frame was deleted while the menu was open.
- content::RenderFrameHost* GetRenderFrameHost() const;

2
patch/patches/chrome_browser_dialogs.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
index 8792cc3a5d40e..8807feaf6063c 100644
index 0145003ac8ad9..cf033c0afeccc 100644
--- chrome/browser/file_select_helper.cc
+++ chrome/browser/file_select_helper.cc
@@ -20,6 +20,7 @@

10
patch/patches/chrome_browser_extensions.patch
View File

@@ -1,16 +1,16 @@
diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
index c5a6b1acb7b08..c5726c8a6b39f 100644
index 56c0864f53c5c..5f4940b11bcda 100644
--- chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -14,6 +14,7 @@
#include "base/task/post_task.h"
@@ -13,6 +13,7 @@
#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
+#include "cef/libcef/features/runtime.h"
#include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.h"
#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
#include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h"
@@ -75,6 +76,10 @@
@@ -74,6 +75,10 @@
#include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h"
#endif
@@ -21,7 +21,7 @@ index c5a6b1acb7b08..c5726c8a6b39f 100644
#if BUILDFLAG(ENABLE_PDF)
#include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
@@ -295,6 +300,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
@@ -294,6 +299,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
std::unique_ptr<MimeHandlerViewGuestDelegate>
ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
MimeHandlerViewGuest* guest) const {

6
patch/patches/chrome_browser_profile_menu.patch
View File

@@ -14,7 +14,7 @@ index fdc911e5aeb83..724ef4429f14f 100644
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
}
diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
index 37294dc0d6da0..5995be5955fcf 100644
index 4569d0afcb80a..5af2fb12f1d7a 100644
--- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
+++ chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
@@ -30,6 +30,9 @@ IncognitoClearBrowsingDataDialog* g_incognito_cbd_dialog = nullptr;
@@ -39,7 +39,7 @@ index 37294dc0d6da0..5995be5955fcf 100644
SetShowCloseButton(true);
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
index 98617c979713b..1fac2a76ce097 100644
index 9c0ed63b74ca8..b9e7bcbcfd605 100644
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
@@ -37,7 +37,9 @@
@@ -54,7 +54,7 @@ index 98617c979713b..1fac2a76ce097 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 0fe5235b7655f..a1d559458f0df 100644
index 1a6a648e63e31..dc1316b9fb227 100644
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -512,7 +512,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,

18
patch/patches/chrome_browser_profiles.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
index fa75e0580e3c5..f7a13da171372 100644
index 64f159f52fb2f..8ae9d9d126ceb 100644
--- chrome/browser/profiles/off_the_record_profile_impl.cc
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -637,7 +637,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
@@ -636,7 +636,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
#endif
if (!profile)
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@@ -14,7 +14,7 @@ index fa75e0580e3c5..f7a13da171372 100644
}
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
index f89b024a0d565..298cd2a82c850 100644
index c34520bfd62fe..1358d28347098 100644
--- chrome/browser/profiles/profile.cc
+++ chrome/browser/profiles/profile.cc
@@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@@ -25,7 +25,7 @@ index f89b024a0d565..298cd2a82c850 100644
const char kDevToolsOTRProfileIDPrefix[] = "Devtools::BrowserContext";
const char kMediaRouterOTRProfileIDPrefix[] = "MediaRouter::Presentation";
const char kTestOTRProfileIDPrefix[] = "Test::OTR";
@@ -97,6 +98,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
@@ -99,6 +100,8 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
// DevTools::BrowserContext and MediaRouter::Presentation are an
// exception to this ban.
return *this == PrimaryID() ||
@@ -34,7 +34,7 @@ index f89b024a0d565..298cd2a82c850 100644
base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix,
base::CompareCase::SENSITIVE) ||
base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix,
@@ -118,6 +121,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
@@ -120,6 +123,16 @@ Profile::OTRProfileID Profile::OTRProfileID::CreateUnique(
base::GUID::GenerateRandomV4().AsLowercaseString().c_str()));
}
@@ -85,10 +85,10 @@ index ca2561e412621..febd52df6c971 100644
virtual bool IsSignedIn() = 0;
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index fca66c2bf16ec..a44efeea30d44 100644
index a3d0830cebbca..3af475c216e63 100644
--- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc
@@ -1001,7 +1001,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -993,7 +993,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile);
@@ -100,10 +100,10 @@ index fca66c2bf16ec..a44efeea30d44 100644
return raw_otr_profile;
}
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 8072c84fc1e92..c62c8c0d3978c 100644
index 026d2c91a4923..1a49c3c42e7ca 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -510,7 +510,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -512,7 +512,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
base::Unretained(this)));
#endif

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 9dcd2757e06d9..91c7a10daf62c 100644
index 0fdd7247bf67f..a80f9a05c37b4 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -27,6 +27,7 @@ static_library("safe_browsing") {

8
patch/patches/chrome_browser_themes.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index e921b7e8be8dc..414358c5191f1 100644
index a61c192f90de2..79b1fa46b2421 100644
--- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc
@@ -32,6 +32,7 @@
@@ -31,6 +31,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -10,7 +10,7 @@ index e921b7e8be8dc..414358c5191f1 100644
#include "chrome/browser/browser_features.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
@@ -68,6 +69,10 @@
@@ -67,6 +68,10 @@
#include "ui/color/color_id.h"
#include "ui/color/color_provider.h"
@@ -21,7 +21,7 @@ index e921b7e8be8dc..414358c5191f1 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry_observer.h"
@@ -573,11 +578,19 @@ void ThemeService::Init() {
@@ -570,11 +575,19 @@ void ThemeService::Init() {
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
// constructed in time to observe the corresponding events.
#if BUILDFLAG(ENABLE_EXTENSIONS)

24
patch/patches/chrome_plugins.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
index f2d3d1a0cd308..49c9747006521 100644
index 9c889652b408b..31a3df33fd42e 100644
--- chrome/browser/plugins/plugin_info_host_impl.cc
+++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -17,6 +17,7 @@
#include "base/task/task_runner_util.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
@@ -10,7 +10,7 @@ index f2d3d1a0cd308..49c9747006521 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -53,6 +54,10 @@
@@ -52,6 +53,10 @@
#include "url/gurl.h"
#include "url/origin.h"
@@ -21,7 +21,7 @@ index f2d3d1a0cd308..49c9747006521 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "components/guest_view/browser/guest_view_base.h"
#include "extensions/browser/extension_registry.h"
@@ -102,6 +107,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
@@ -101,6 +106,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
extensions::ExtensionRegistry* extension_registry,
int process_id,
const GURL& resource) {
@@ -31,7 +31,7 @@ index f2d3d1a0cd308..49c9747006521 100644
extensions::WebViewRendererState* renderer_state =
extensions::WebViewRendererState::GetInstance();
std::string partition_id;
@@ -130,14 +138,18 @@ bool IsPluginLoadingAccessibleResourceInWebView(
@@ -129,14 +137,18 @@ bool IsPluginLoadingAccessibleResourceInWebView(
PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
: render_process_id_(render_process_id),
@@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644
// that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index bbac287647477..3179dc62bf1d2 100644
index 7a096b1c69de4..08a5142af028b 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -920,6 +920,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -931,6 +931,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -136,7 +136,7 @@ index bbac287647477..3179dc62bf1d2 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1121,7 +1122,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1132,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -146,7 +146,7 @@ index bbac287647477..3179dc62bf1d2 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1130,7 +1132,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1141,7 +1143,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 bbac287647477..3179dc62bf1d2 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1140,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1151,7 +1154,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -166,7 +166,7 @@ index bbac287647477..3179dc62bf1d2 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1148,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1159,7 +1163,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 b58cdd14c9a58..927738fd22b80 100644
index 066c66c1a2d1b..428cb1871a6af 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 {

8
patch/patches/chrome_renderer.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 1528c9fd8ad56..82099ac89bf57 100644
index 4dc47fb91328a..6d2f00350f14d 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@@ -18,7 +18,7 @@ index 1528c9fd8ad56..82099ac89bf57 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -207,6 +209,10 @@ static_library("renderer") {
@@ -209,6 +211,10 @@ static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -27,5 +27,5 @@ index 1528c9fd8ad56..82099ac89bf57 100644
+ }
+
if (enable_nacl) {
deps += [
"//components/nacl/loader",
deps += [ "//components/nacl/renderer" ]

74
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 cc6167f7767ed..c5e33cba1c6d9 100644
index 81550e6dca168..c633f6c122f17 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -32,6 +32,7 @@
@@ -33,6 +33,7 @@
#include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -10,7 +10,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
#include "chrome/browser/defaults.h"
@@ -387,6 +388,8 @@ struct MainFunction {
@@ -388,6 +389,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) {
@@ -19,7 +19,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
#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.
@@ -709,7 +712,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
@@ -702,7 +705,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
}
#if BUILDFLAG(IS_WIN)
@@ -28,8 +28,8 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
+ }
base::sequence_manager::internal::ThreadControllerPowerMonitor::
InitializeOnMainThread();
#endif
@@ -1022,6 +1027,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
base::InitializePlatformThreadFeatures();
@@ -1016,6 +1021,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -37,7 +37,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_POSIX)
@@ -1032,6 +1038,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1026,6 +1032,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@@ -45,7 +45,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1159,6 +1166,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1153,6 +1160,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -53,7 +53,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1191,6 +1199,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1185,6 +1193,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 cc6167f7767ed..c5e33cba1c6d9 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1276,6 +1285,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1270,6 +1279,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@@ -69,7 +69,7 @@ index cc6167f7767ed..c5e33cba1c6d9 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 =
@@ -1292,6 +1302,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1286,6 +1296,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
@@ -78,7 +78,7 @@ index cc6167f7767ed..c5e33cba1c6d9 100644
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index 566535f74acf1..4b435553575b0 100644
index e07874dc5a2fa..e2e4f795e74a2 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -52,6 +52,7 @@
@@ -89,7 +89,7 @@ index 566535f74acf1..4b435553575b0 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1578,11 +1579,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1581,11 +1582,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->local_state());
}
@@ -98,12 +98,12 @@ index 566535f74acf1..4b435553575b0 100644
// called inside PostProfileInit.
content::WebUIControllerFactory::RegisterFactory(
ChromeWebUIControllerFactory::GetInstance());
ChromeUntrustedWebUIControllerFactory::RegisterInstance();
RegisterChromeUntrustedWebUIConfigs();
+#endif
#if BUILDFLAG(IS_ANDROID)
page_info::SetPageInfoClient(new ChromePageInfoClient());
@@ -1745,11 +1748,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1748,11 +1751,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|.
@@ -119,7 +119,7 @@ index 566535f74acf1..4b435553575b0 100644
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -1777,8 +1783,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1780,8 +1786,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@@ -132,7 +132,7 @@ index 566535f74acf1..4b435553575b0 100644
GetMainRunLoopInstance()->QuitWhenIdleClosure());
}
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
index 831d7173873d1..594aee58331a7 100644
index 8bf722c61c059..ac755279227f2 100644
--- chrome/browser/chrome_browser_main_mac.mm
+++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@@ -143,7 +143,7 @@ index 831d7173873d1..594aee58331a7 100644
#import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_listener.h"
#include "chrome/browser/browser_process.h"
@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
@@ -112,6 +113,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
}
}
@@ -151,15 +151,15 @@ index 831d7173873d1..594aee58331a7 100644
// Create the app delegate. This object is intentionally leaked as a global
// singleton. It is accessed through -[NSApp delegate].
AppController* app_controller = [[AppController alloc] init];
@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
@@ -120,6 +122,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
chrome::BuildMainMenu(NSApp, app_controller,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
[app_controller mainMenuCreated];
+#endif // BUILDFLAG(ENABLE_CEF)
chrome::DeveloperIDCertificateReauthorizeInApp();
@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
chrome::PurgeStaleScreenCapturePermission();
@@ -182,7 +185,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
}
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@@ -170,7 +170,7 @@ index 831d7173873d1..594aee58331a7 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 019fd68040dc5..794765646efc7 100644
index f83e2e268deae..3ef9193ffa150 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -28,6 +28,7 @@
@@ -181,7 +181,7 @@ index 019fd68040dc5..794765646efc7 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1272,6 +1273,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
@@ -1280,6 +1281,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
} // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@@ -190,7 +190,7 @@ index 019fd68040dc5..794765646efc7 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif
@@ -1297,6 +1300,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1305,6 +1308,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear();
}
@@ -202,7 +202,7 @@ index 019fd68040dc5..794765646efc7 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3725,9 +3733,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -3735,9 +3743,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@@ -214,7 +214,7 @@ index 019fd68040dc5..794765646efc7 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5354,7 +5364,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -5373,7 +5383,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service);
}
@@ -223,7 +223,7 @@ index 019fd68040dc5..794765646efc7 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -5372,6 +5382,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -5391,6 +5401,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@@ -232,7 +232,7 @@ index 019fd68040dc5..794765646efc7 100644
}
std::vector<base::FilePath>
@@ -6212,10 +6224,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -6262,10 +6274,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -245,7 +245,7 @@ index 019fd68040dc5..794765646efc7 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6234,7 +6246,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -6284,7 +6296,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@@ -255,7 +255,7 @@ index 019fd68040dc5..794765646efc7 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -6342,7 +6355,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -6392,7 +6405,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@@ -265,10 +265,10 @@ index 019fd68040dc5..794765646efc7 100644
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
weak_factory_.GetWeakPtr(),
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 4aa99834bd6c7..cd932dd3cacf4 100644
index 41a5ddd24bbfc..9e70243361d4e 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -120,6 +120,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -116,6 +116,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
~ChromeContentBrowserClient() override;
@@ -277,7 +277,7 @@ index 4aa99834bd6c7..cd932dd3cacf4 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out
// to chrome/ to get values or notify about events, but both of these
// functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -561,7 +563,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -557,7 +559,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@@ -286,7 +286,7 @@ index 4aa99834bd6c7..cd932dd3cacf4 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -913,7 +915,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -908,7 +910,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@@ -296,7 +296,7 @@ index 4aa99834bd6c7..cd932dd3cacf4 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index a265ff6d1cf43..cebf6e611c84d 100644
index be73964172416..eeb8f6511aace 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@@ -307,7 +307,7 @@ index a265ff6d1cf43..cebf6e611c84d 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
@@ -161,6 +162,10 @@
@@ -163,6 +164,10 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
@@ -318,7 +318,7 @@ index a265ff6d1cf43..cebf6e611c84d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1264,6 +1269,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1296,6 +1301,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry);
#endif

50
patch/patches/chrome_runtime_views.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index f9d291e52bc70..288d8ea2b3d72 100644
index e5daf6829b114..25fe7f09c8604 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -377,8 +377,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -381,8 +381,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// CommandUpdaterDelegate and CommandUpdater declare this function so we
// choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set).
@@ -14,7 +14,7 @@ index f9d291e52bc70..288d8ea2b3d72 100644
// No commands are enabled if there is not yet any selected tab.
// TODO(pkasting): It seems like we should not need this, because either
@@ -393,6 +395,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -397,6 +399,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id;
@@ -28,7 +28,7 @@ index f9d291e52bc70..288d8ea2b3d72 100644
// The order of commands in this switch statement must match the function
// declaration order in browser.h!
switch (id) {
@@ -995,11 +1004,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -1027,11 +1036,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@@ -180,10 +180,10 @@ index d42661a633fcd..85b03452d4dc3 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 39cef285ed27c..e08ec72ba9c85 100644
index ce0286c8ec074..fb3c16fa81bf3 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -300,11 +300,10 @@ using content::WebContents;
@@ -305,11 +305,10 @@ using content::WebContents;
using views::ColumnSet;
using web_modal::WebContentsModalDialogHost;
@@ -198,7 +198,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -689,11 +688,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
@@ -798,11 +797,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@@ -222,7 +222,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -728,7 +738,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -837,7 +847,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@@ -230,7 +230,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -771,8 +780,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -880,8 +889,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@@ -248,7 +248,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1644,6 +1660,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1769,6 +1785,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@@ -257,7 +257,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -2814,7 +2832,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
@@ -2977,7 +2995,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
}
void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -267,7 +267,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3334,8 +3353,10 @@ void BrowserView::Layout() {
@@ -3518,8 +3537,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -280,7 +280,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3401,6 +3422,11 @@ void BrowserView::AddedToWidget() {
@@ -3585,6 +3606,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@@ -292,7 +292,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3459,13 +3485,9 @@ void BrowserView::AddedToWidget() {
@@ -3648,13 +3674,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@@ -308,7 +308,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -3894,7 +3916,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4082,7 +4104,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@@ -318,7 +318,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4221,6 +4244,8 @@ Profile* BrowserView::GetProfile() {
@@ -4409,6 +4432,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@@ -327,7 +327,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4243,6 +4268,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4431,6 +4456,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@@ -337,10 +337,10 @@ index 39cef285ed27c..e08ec72ba9c85 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 69f92ec5228c4..b6100283f81d0 100644
index c380e63f2f7ac..1b34d1b8098a6 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -127,11 +127,16 @@ class BrowserView : public BrowserWindow,
@@ -128,11 +128,16 @@ class BrowserView : public BrowserWindow,
public webapps::AppBannerManager::Observer {
public:
METADATA_HEADER(BrowserView);
@@ -357,7 +357,7 @@ index 69f92ec5228c4..b6100283f81d0 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; }
@@ -732,6 +737,12 @@ class BrowserView : public BrowserWindow,
@@ -749,6 +754,12 @@ class BrowserView : public BrowserWindow,
const std::map<std::string, std::string>& extra_data) override;
#endif
@@ -371,7 +371,7 @@ index 69f92ec5228c4..b6100283f81d0 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable.
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index a6f15f3436bef..5e2ab8373458b 100644
index cec2daa7b9525..bfed50aad8489 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -42,6 +42,10 @@
@@ -398,10 +398,10 @@ index a6f15f3436bef..5e2ab8373458b 100644
bool toolbar_visible = delegate_->IsToolbarVisible();
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
diff --git chrome/browser/ui/views/frame/contents_web_view.cc chrome/browser/ui/views/frame/contents_web_view.cc
index 5f985efa03120..cd38b49974ecb 100644
index bc047256f110a..b6bc9dfc0eee5 100644
--- chrome/browser/ui/views/frame/contents_web_view.cc
+++ chrome/browser/ui/views/frame/contents_web_view.cc
@@ -24,6 +24,11 @@
@@ -26,6 +26,11 @@
ContentsWebView::ContentsWebView(content::BrowserContext* browser_context)
: views::WebView(browser_context),
status_bubble_(nullptr) {
@@ -466,7 +466,7 @@ index 7475765f4b514..25c59d942782b 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index ef42774da13f6..840b7aa893ca8 100644
index 8dceab5d386ec..5d3063ac774cb 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -172,12 +172,13 @@ auto& GetViewCommandMap() {
@@ -495,7 +495,7 @@ index ef42774da13f6..840b7aa893ca8 100644
size_animation_.Reset(1);
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index a60109508b7f5..3df342afd279b 100644
index 9eb9688bb442b..9d20d3d262588 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -94,7 +94,8 @@ class ToolbarView : public views::AccessiblePaneView,

12
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 e9ba4490665df..a42717a23f067 100644
index 3161f705e051c..255ee775935e3 100644
--- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h
@@ -97,7 +97,7 @@ bool ApplyUserAgentMetadataOverrides(
@@ -96,7 +96,7 @@ bool ApplyUserAgentMetadataOverrides(
FrameTreeNode* frame_tree_node,
absl::optional<blink::UserAgentMetadata>* override_out);
@@ -12,18 +12,18 @@ index e9ba4490665df..a42717a23f067 100644
bool is_navigation,
bool is_download,
diff --git content/browser/renderer_host/input/mouse_wheel_phase_handler.h content/browser/renderer_host/input/mouse_wheel_phase_handler.h
index 5206955ca2609..3ae147e0edf58 100644
index 3d8e22b048f58..4a41f15ce258c 100644
--- content/browser/renderer_host/input/mouse_wheel_phase_handler.h
+++ content/browser/renderer_host/input/mouse_wheel_phase_handler.h
@@ -8,6 +8,7 @@
#include "base/memory/raw_ptr.h"
@@ -9,6 +9,7 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h"
+#include "content/common/content_export.h"
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
#include "third_party/blink/public/mojom/input/input_event_result.mojom-shared.h"
@@ -50,7 +51,7 @@ enum class FirstScrollUpdateAckState {
@@ -51,7 +52,7 @@ enum class FirstScrollUpdateAckState {
// The MouseWheelPhaseHandler is responsible for adding the proper phase to
// wheel events. Phase information is necessary for wheel scrolling since it
// shows the start and end of a scrolling sequence.

36
patch/patches/content_2015.patch
View File

@@ -12,10 +12,10 @@ index fc87fd9a6ffca..99c6b27018e13 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 3f06e6b8cd335..257d3f20f92d7 100644
index 7a0e48df998df..017d915f6fe6b 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -672,6 +672,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -673,6 +673,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture, initiating_origin,
initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
@@ -34,7 +34,7 @@ index 3f06e6b8cd335..257d3f20f92d7 100644
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 2ba5cc555c691..a092c6ba09112 100644
index 2a51c8c4d4cd2..e01e40175477f 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -11,7 +11,7 @@
@@ -46,7 +46,7 @@ index 2ba5cc555c691..a092c6ba09112 100644
#include <utility>
@@ -892,7 +892,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -894,7 +894,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@@ -55,7 +55,7 @@ index 2ba5cc555c691..a092c6ba09112 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -901,6 +901,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -903,6 +903,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@@ -64,18 +64,18 @@ index 2ba5cc555c691..a092c6ba09112 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 5c757ff4b622d..1286b9c26f427 100644
index d6ad990189520..42540f27a98eb 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -34,6 +34,7 @@
@@ -32,6 +32,7 @@
#include "content/public/browser/login_delegate.h"
#include "content/public/browser/mojo_binder_policy_map.h"
#include "content/public/browser/storage_partition_config.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_browser_interface_broker_registry.h"
#include "content/public/common/alternative_error_page_override_info.mojom.h"
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
#include "content/public/common/main_function_params.h"
@@ -1668,7 +1669,7 @@ class CONTENT_EXPORT ContentBrowserClient {
#include "content/public/common/page_visibility_state.h"
@@ -1663,7 +1664,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
@@ -84,7 +84,7 @@ index 5c757ff4b622d..1286b9c26f427 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1875,6 +1876,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1870,6 +1871,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@@ -104,7 +104,7 @@ index 5c757ff4b622d..1286b9c26f427 100644
// Creates an OverlayWindow to be used for video or document
// Picture-in-Picture respectively. This window will house the content shown
// when in Picture-in-Picture mode. This will return a new OverlayWindow.
@@ -1936,6 +1950,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1931,6 +1945,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -141,10 +141,10 @@ index eb8968c2a8610..143c3aaeda88e 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 707a469b90696..095e396218812 100644
index 24b18a620f3e6..caa91a70894f3 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -658,6 +658,8 @@ void RenderThreadImpl::Init() {
@@ -655,6 +655,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame);
@@ -154,10 +154,10 @@ index 707a469b90696..095e396218812 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 3d551f3d74e22..b2495b1d26391 100644
index dbde0706007b8..ba34b8edfe561 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -1113,6 +1113,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -1109,6 +1109,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@@ -174,10 +174,10 @@ index 3d551f3d74e22..b2495b1d26391 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 7255ac218c8fd..858a6d83e315e 100644
index e7d0d3e7c08c2..da82175f396ec 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -262,6 +262,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -261,6 +261,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
base::PlatformThreadId GetIOThreadId() const override;

14
patch/patches/content_main_654986.patch
View File

@@ -105,10 +105,10 @@ index bb2d3e9911958..7af313040906e 100644
}
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index abb29771ee9b8..998747bb905cc 100644
index 85a55e9bbb740..2d298c5776594 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -44,6 +44,7 @@
@@ -43,6 +43,7 @@
#include "base/task/thread_pool/thread_pool_instance.h"
#include "base/threading/hang_watcher.h"
#include "base/threading/platform_thread.h"
@@ -116,7 +116,7 @@ index abb29771ee9b8..998747bb905cc 100644
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -1205,6 +1206,12 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1177,6 +1178,12 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}
@@ -130,11 +130,11 @@ index abb29771ee9b8..998747bb905cc 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 225a0aa930732..48b5aa44c8441 100644
index 423ad00697648..cd1a9df97eba0 100644
--- content/app/content_main_runner_impl.h
+++ content/app/content_main_runner_impl.h
@@ -30,7 +30,7 @@ namespace content {
class ContentClient;
@@ -29,7 +29,7 @@ class DiscardableSharedMemoryManager;
namespace content {
class MojoIpcSupport;
-class ContentMainRunnerImpl : public ContentMainRunner {
@@ -142,7 +142,7 @@ index 225a0aa930732..48b5aa44c8441 100644
public:
static std::unique_ptr<ContentMainRunnerImpl> Create();
@@ -49,6 +49,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
@@ -48,6 +48,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
int Run() override;
void Shutdown() override;

14
patch/patches/crashpad_tp_1995.patch
View File

@@ -197,7 +197,7 @@ index efbeab7804c44..44fd31e58175c 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 70f1628354455..cd043a821e96d 100644
index 2af958d7da9e5..6a67185a668af 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,16 +208,16 @@ index 70f1628354455..cd043a821e96d 100644
#include <memory>
#include <string>
#include <unordered_map>
@@ -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;
@@ -111,7 +112,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! \return `true` if the thread is running, `false` if it is not.
bool is_running() const { return thread_.is_running(); }
- private:
+ protected:
//! \brief The result code from UploadReport().
enum class UploadResult {
//! \brief The crash report was uploaded successfully.
@@ -136,7 +137,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -139,7 +140,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 70f1628354455..cd043a821e96d 100644
//! \brief Processes a single pending report from the database.
//!
@@ -150,7 +151,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -153,7 +154,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 70f1628354455..cd043a821e96d 100644
//! \brief Attempts to upload a crash report.
//!
@@ -167,6 +168,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
@@ -170,6 +171,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
UploadResult UploadReport(const CrashReportDatabase::UploadReport* report,
std::string* response_body);

4
patch/patches/embedder_product_override.patch
View File

@@ -1,5 +1,5 @@
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index ca9de380c4a07..b893e1a0590fd 100644
index 7af5de1f3fda5..9b291ee80c1d6 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@
@@ -10,7 +10,7 @@ index ca9de380c4a07..b893e1a0590fd 100644
#include "components/embedder_support/pref_names.h"
#include "components/embedder_support/switches.h"
#include "components/policy/core/common/policy_pref_names.h"
@@ -329,6 +330,12 @@ std::string GetMajorVersionForUserAgentString(
@@ -330,6 +331,12 @@ std::string GetMajorVersionForUserAgentString(
std::string GetProductAndVersion(
ForceMajorVersionToMinorPosition force_major_to_minor) {

20
patch/patches/extensions_1947.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 5c903a13a14ed..c85964a7bab17 100644
index 2f5f7a7645103..9ab6fc1d4a654 100644
--- chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -6,6 +6,7 @@
@@ -21,7 +21,7 @@ index 5c903a13a14ed..c85964a7bab17 100644
namespace extensions {
void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
@@ -42,6 +47,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
@@ -34,6 +39,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
if (!web_contents)
return;
@@ -29,7 +29,7 @@ index 5c903a13a14ed..c85964a7bab17 100644
// If the request was for NoStatePrefetch, abort the prefetcher and do not
// continue. This is because plugins cancel NoStatePrefetch, see
// http://crbug.com/343590.
@@ -52,6 +58,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
@@ -44,6 +50,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
no_state_prefetch_contents->Destroy(prerender::FINAL_STATUS_DOWNLOAD);
return;
}
@@ -37,7 +37,7 @@ index 5c903a13a14ed..c85964a7bab17 100644
auto* browser_context = web_contents->GetBrowserContext();
@@ -78,9 +85,18 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
@@ -70,9 +77,18 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
// forms of zooming won't work).
// TODO(1042323): Present a coherent representation of a tab id for portal
// contents.
@@ -60,10 +60,10 @@ index 5c903a13a14ed..c85964a7bab17 100644
std::unique_ptr<StreamContainer> stream_container(
new StreamContainer(tab_id, embedded, handler_url, extension_id,
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 936a1100e25f9..c782d70bc3643 100644
index 045808bde7362..0e879d052506e 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -57,11 +57,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -58,11 +58,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
DCHECK(host_type == mojom::ViewType::kExtensionBackgroundPage ||
host_type == mojom::ViewType::kExtensionDialog ||
host_type == mojom::ViewType::kExtensionPopup);
@@ -79,7 +79,7 @@ index 936a1100e25f9..c782d70bc3643 100644
main_frame_host_ = host_contents_->GetMainFrame();
// Listen for when an extension is unloaded from the same profile, as it may
@@ -76,6 +77,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -77,6 +78,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
ExtensionHostRegistry::Get(browser_context_)->ExtensionHostCreated(this);
}
@@ -161,7 +161,7 @@ index dd22bbc07fb52..c695ece6b1a47 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 c3e25378bbaf8..0959392a4cb29 100644
index d11e8485a2c6c..201d0a1b63aba 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -28,6 +28,7 @@
@@ -196,10 +196,10 @@ index c3e25378bbaf8..0959392a4cb29 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 78b6535762526..83675c49911db 100644
index 3cb5eb629cd29..ac25fab9fd2a5 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -391,9 +391,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -392,9 +392,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();

35
patch/patches/gn_config.patch
View File

@@ -1,8 +1,8 @@
diff --git .gn .gn
index 5356717746edd..6345b837a6ea6 100644
index 5a11496a47ae7..76d199e4b69fa 100644
--- .gn
+++ .gn
@@ -151,6 +151,8 @@ exec_script_whitelist =
@@ -157,6 +157,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
@@ -12,7 +12,7 @@ index 5356717746edd..6345b837a6ea6 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index f686fc6368936..37848e164aeb0 100644
index 338241fc0f990..7a513198476e6 100644
--- BUILD.gn
+++ BUILD.gn
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@@ -23,16 +23,17 @@ index f686fc6368936..37848e164aeb0 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/media/router/features.gni")
import("//components/nacl/features.gni")
@@ -252,6 +253,9 @@ group("gn_all") {
deps += [ "//chrome/test:telemetry_perf_unittests${_target_suffix}" ]
}
}
+ if (enable_cef) {
+ deps += [ "//cef" ]
+ }
} else if (is_ios) {
deps += [
"//ios:all",
@@ -117,6 +118,10 @@ group("gn_all") {
]
}
+ if (enable_cef) {
+ deps += [ "//cef" ]
+ }
+
if (enable_js_type_check) {
deps += [ ":webui_closure_compile" ]
}
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
index 982fbe8d3f0d0..e757be4688f10 100644
--- build/config/win/visual_studio_version.gni
@@ -79,7 +80,7 @@ index f8f71ef369c08..7a2ed5da7bda3 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 10acea1dbb8db..ff419de6494ce 100644
index dd4142e9596eb..4eee52e9b528e 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -5,6 +5,7 @@
@@ -90,7 +91,7 @@ index 10acea1dbb8db..ff419de6494ce 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
@@ -75,6 +76,10 @@ template("chrome_repack_percent") {
@@ -76,6 +77,10 @@ template("chrome_repack_percent") {
"//ui/chromeos/resources",
]
}
@@ -152,7 +153,7 @@ 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 061bdf6812cff..3b0a4b832bd24 100644
index bc59070a45360..71dfd4536d432 100644
--- tools/grit/grit_defines.gni
+++ tools/grit/grit_defines.gni
@@ -5,6 +5,7 @@
@@ -163,7 +164,7 @@ index 061bdf6812cff..3b0a4b832bd24 100644
import("//build/config/ui.gni")
shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
@@ -119,6 +120,13 @@ if (is_android) {
@@ -118,6 +119,13 @@ if (is_android) {
]
}

4
patch/patches/gritsettings.patch
View File

@@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index 22896db086972..014ac14f680c0 100644
index b036986b35dac..69f95510bb1fa 100644
--- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec
@@ -958,6 +958,15 @@
@@ -957,6 +957,15 @@
# END "everything else" section.
# Everything but chrome/, components/, content/, and ios/

14
patch/patches/libxml_371.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git third_party/libxml/src/tree.c third_party/libxml/src/tree.c
index 8077348a980a1..46c0b6eddb486 100644
--- third_party/libxml/src/tree.c
+++ third_party/libxml/src/tree.c
@@ -4361,7 +4361,8 @@ xmlStaticCopyNode(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent,
}
insert->last = copy;
- if (cur->children != NULL) {
+ if ((cur->type != XML_ENTITY_REF_NODE) &&
+ (cur->children != NULL)) {
cur = cur->children;
insert = copy;
continue;

2
patch/patches/libxml_visibility.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn
index 9f6403fa49078..1422961ed0c75 100644
index 24688c1643c77..212edc9a66a8c 100644
--- third_party/libxml/BUILD.gn
+++ third_party/libxml/BUILD.gn
@@ -138,6 +138,7 @@ static_library("libxml") {

15
patch/patches/linux_assets_path_1936.patch
View File

@@ -25,20 +25,11 @@ index e79a6e0b31091..9626ec1b9a922 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 08d42145b1d75..8fee0adc9b819 100644
index 9ebf5d4d121a8..8783a6d2cc297 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 !BUILDFLAG(IS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
return false;
module_path = module_path.Append(FILE_PATH_LITERAL("swiftshader/"));
#endif
@@ -171,7 +171,7 @@ bool LoadDefaultEGLGLES2Bindings(
} else if (implementation.gl == gl::kGLImplementationEGLANGLE) {
@@ -138,7 +138,7 @@ bool LoadDefaultEGLGLES2Bindings(
if (implementation.gl == gl::kGLImplementationEGLANGLE) {
base::FilePath module_path;
#if !BUILDFLAG(IS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))

18
patch/patches/linux_bluetooth_1319006.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
index 1dce4a29c0820..12e3abe85ddf2 100644
--- device/bluetooth/BUILD.gn
+++ device/bluetooth/BUILD.gn
@@ -50,13 +50,6 @@ source_set("deprecated_experimental_mojo") {
"socket.h",
]
- if (is_chromeos || is_linux) {
- sources += [
- "bluez/metrics_recorder.cc",
- "bluez/metrics_recorder.h",
- ]
- }
-
deps = [
":bluetooth",
"//device/bluetooth/public/mojom:deprecated_experimental_interfaces",

4
patch/patches/linux_ui_ozone.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/ozone/BUILD.gn ui/ozone/BUILD.gn
index 3d21581e2d7f9..cd07bcb130de2 100644
index dc0b0ab02a931..ca3f433f32209 100644
--- ui/ozone/BUILD.gn
+++ ui/ozone/BUILD.gn
@@ -394,6 +394,8 @@ action("generate_test_support_constructor_list") {
@@ -395,6 +395,8 @@ action("generate_test_support_constructor_list") {
]
deps = [ ":generate_ozone_platform_list" ]

2
patch/patches/mac_gpu.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
index 4c78f4c18ee15..e573f78e4e475 100644
index b1fbd1fedf16f..42948953fbac5 100644
--- ui/gl/init/gl_initializer_mac.cc
+++ ui/gl/init/gl_initializer_mac.cc
@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {

2
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@@ -12,7 +12,7 @@ index 2c29b5c5c96b9..9ba3aaa327478 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 56b6d5d28fe21..42d417f80b19c 100644
index b652f1f30ce70..6b5f004385803 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
@@ -224,6 +224,8 @@ void MimeHandlerViewGuest::CreateWebContents(

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 93a60c910726a..efb9b8e4793ed 100644
index 2db8e1bc9e5bb..680db4669dfe7 100644
--- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc
@@ -1774,7 +1774,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
@@ -1771,7 +1771,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
// 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 d6b7b2533b80d..f36ec7fcb9fb9 100644
index 9e740edbf36dd..a8110db456aa3 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3130,6 +3130,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -3119,6 +3119,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
}
@@ -57,10 +57,10 @@ index d6b7b2533b80d..f36ec7fcb9fb9 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 5cc97c9c8305b..0a7869e4df266 100644
index 23783e5e004b6..af0b954a40d61 100644
--- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h
@@ -779,6 +779,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -786,6 +786,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
void ProgressFlingIfNeeded(base::TimeTicks current_time);
void StopFling();

26
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 04679ec67bf2e..864f08b030ccb 100644
index f5ef1239dbece..98210504ccf53 100644
--- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@
@@ -21,7 +21,7 @@ index 04679ec67bf2e..864f08b030ccb 100644
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -342,6 +347,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
@@ -344,6 +349,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
// static
DownloadPrefs* DownloadPrefs::FromBrowserContext(
content::BrowserContext* context) {
@@ -46,10 +46,10 @@ index d656ccabc3899..a4b7ce6a7dcd8 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 1f37c11047d47..eea8a9944ec3e 100644
index 3a3f733c45e08..c9a2d7672346a 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -222,12 +222,12 @@ void UpdatePrintSettingsOnIO(
@@ -224,12 +224,12 @@ void UpdatePrintSettingsOnIO(
mojom::PrintManagerHost::UpdatePrintSettingsCallback callback,
scoped_refptr<PrintQueriesQueue> queue,
base::Value job_settings,
@@ -65,7 +65,7 @@ index 1f37c11047d47..eea8a9944ec3e 100644
}
auto* printer_query_ptr = printer_query.get();
printer_query_ptr->SetSettings(
@@ -646,6 +646,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -680,6 +680,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
}
@@ -73,7 +73,7 @@ index 1f37c11047d47..eea8a9944ec3e 100644
auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
weak_ptr_factory_.GetWeakPtr(), std::move(callback));
@@ -653,7 +654,8 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -687,7 +688,8 @@ void PrintViewManagerBase::UpdatePrintSettings(
FROM_HERE,
base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
std::move(callback_wrapper), queue_,
@@ -84,10 +84,10 @@ index 1f37c11047d47..eea8a9944ec3e 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 2661776307f77..b9edc98619c29 100644
index 3a4cfa1e44d78..341d0f56a42b1 100644
--- chrome/browser/printing/print_view_manager_base.h
+++ chrome/browser/printing/print_view_manager_base.h
@@ -146,9 +146,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
@@ -160,9 +160,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
// Manages the low-level talk to the printer.
scoped_refptr<PrintJob> print_job_;
@@ -98,10 +98,10 @@ index 2661776307f77..b9edc98619c29 100644
void RenderFrameHostStateChanged(
content::RenderFrameHost* render_frame_host,
diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
index 920f646f06484..76c0b5e5ee04b 100644
index 5ea55a097c156..1ad6e23647be9 100644
--- chrome/browser/resources/print_preview/ui/destination_dialog.html
+++ chrome/browser/resources/print_preview/ui/destination_dialog.html
@@ -25,10 +25,7 @@
@@ -15,10 +15,7 @@
</print-preview-destination-list>
</div>
<div slot="button-container">
@@ -136,7 +136,7 @@ index f6098966f5b34..da78289b66155 100644
}
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index eba14d78d87ff..7901f000a44b5 100644
index 8574017c74653..0ca94f8d1da47 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 @@
@@ -161,8 +161,8 @@ index eba14d78d87ff..7901f000a44b5 100644
constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview";
constexpr char kInvalidPageNumberForDidPreviewPage[] =
@@ -339,7 +347,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
chrome::kCloudPrintCertificateErrorLearnMoreURL);
@@ -330,7 +338,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedStrings(kLocalizedStrings);
#if !BUILDFLAG(IS_CHROMEOS)
- const std::u16string shortcut_text(kBasicPrintShortcut);

2
patch/patches/printing_context_2196.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index 27305997182f0..c97a5b89bf831 100644
index f989f040cb9ff..7c618b0e274fc 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -131,6 +131,7 @@ PrintJobWorker::PrintJobWorker(content::GlobalRenderFrameHostId rfh_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 f6bcef150f4d3..c1d121271c5c1 100644
index 32df5050f5a66..892e92c8e753b 100644
--- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc
@@ -646,6 +646,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
@@ -657,6 +657,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
}
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

4
patch/patches/runhooks.patch
View File

@@ -1,5 +1,5 @@
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index d692fc94dab73..87e71e627ce75 100644
index 831e36f74ea29..9ccf48db4ae2d 100644
--- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py
@@ -157,13 +157,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
@@ -26,7 +26,7 @@ index d692fc94dab73..87e71e627ce75 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 93b79a3cf04bf..9a93667f78b65 100755
index fc2e5e00961ed..3d23cc7ed7675 100755
--- build/vs_toolchain.py
+++ build/vs_toolchain.py
@@ -107,9 +107,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():

6
patch/patches/rwh_background_color_1984.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index a819dcf960a4c..968554d7bb0c1 100644
index 5f29761ad8556..fdfb89ba72ad4 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -5,6 +5,7 @@
@@ -10,7 +10,7 @@ index a819dcf960a4c..968554d7bb0c1 100644
#include <set>
#include <utility>
@@ -702,10 +703,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
@@ -724,10 +725,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
void RenderWidgetHostViewAura::UpdateBackgroundColor() {
DCHECK(GetBackgroundColor());
@@ -27,7 +27,7 @@ index a819dcf960a4c..968554d7bb0c1 100644
}
absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
@@ -2210,6 +2213,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2233,6 +2236,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_);

22
patch/patches/services_network_2622.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index de5084629f6a1..c6ad2d22e1191 100644
index 29db45d3f9b76..1df09e9ff6b0d 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@@ -21,6 +21,7 @@
#include "base/task/thread_pool.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -10,7 +10,7 @@ index de5084629f6a1..c6ad2d22e1191 100644
#include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -741,7 +742,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -740,7 +741,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes).
@@ -21,7 +21,7 @@ index de5084629f6a1..c6ad2d22e1191 100644
+ const base::FilePath& base_cache_path =
+ prefs->GetFilePath(prefs::kDiskCacheDir);
+ DCHECK(!base_cache_path.empty());
+ network_context_params->http_cache_path =
+ network_context_params->http_cache_directory =
+ base_cache_path.Append(chrome::kCacheDirname);
+ network_context_params->http_cache_max_size =
+ prefs->GetInteger(prefs::kDiskCacheSize);
@@ -31,7 +31,7 @@ index de5084629f6a1..c6ad2d22e1191 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -754,7 +767,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -753,7 +766,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@@ -101,10 +101,10 @@ index c143a7381df95..da14e2b0b1c81 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index 49c53dc75789f..07c204a826877 100644
index 5780b295554fe..306e48ad0b84e 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -366,14 +366,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -367,14 +367,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
void CookieManager::AllowFileSchemeCookies(
bool allow,
AllowFileSchemeCookiesCallback callback) {
@@ -123,10 +123,10 @@ index 49c53dc75789f..07c204a826877 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 6564e1dda47a9..d7d67a96a3a64 100644
index e9a56db142f5f..c2156d79c0855 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2300,17 +2300,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2358,17 +2358,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -157,10 +157,10 @@ index 6564e1dda47a9..d7d67a96a3a64 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 560fb1abef486..65f58306c848a 100644
index b2beaa762bfe8..8bb83610172b9 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -331,6 +331,9 @@ struct NetworkContextParams {
@@ -334,6 +334,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 2c0c05a740a29..0181a957ca7bc 100644
index 46cb90ade1321..14e661aeec1d5 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -497,10 +497,6 @@ class LoginHandlerDelegate {
@@ -494,10 +494,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index 2c0c05a740a29..0181a957ca7bc 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -552,12 +548,6 @@ void OnAuthRequiredContinuation(
@@ -549,12 +545,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@@ -26,7 +26,7 @@ index 2c0c05a740a29..0181a957ca7bc 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,
@@ -2764,8 +2754,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2778,8 +2768,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@@ -40,7 +40,7 @@ index 2c0c05a740a29..0181a957ca7bc 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -2775,9 +2769,12 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -2789,9 +2783,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New();

10
patch/patches/storage_incognito_2289.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index a74178f2d4246..8098034a38333 100644
index 7dead74261c3a..9354249366be5 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -121,7 +121,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
// If we're not incognito mode, schedule all of our file tasks to enable
// disk on the storage context.
@@ -13,7 +13,7 @@ index a74178f2d4246..8098034a38333 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 323ffab7c0b25..dbc1a50064361 100644
index 6dd3c9087aa2c..12cd95fabf5c3 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -129,7 +129,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@@ -25,7 +25,7 @@ index 323ffab7c0b25..dbc1a50064361 100644
// An off the record profile MUST only use in memory storage partitions.
CHECK(storage_partition_config.in_memory());
}
@@ -370,7 +370,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
@@ -360,7 +360,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
const bool kUseInMemoryDBDefault = false;
bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,
@@ -58,7 +58,7 @@ index 160c24ce6e6cc..336aee0b8a0e3 100644
// static
diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
index 74423c6f847d4..d1ea3420ec7d3 100644
index 8abec7e8e4b09..1bac4e476c543 100644
--- storage/browser/database/database_tracker.cc
+++ storage/browser/database/database_tracker.cc
@@ -562,7 +562,7 @@ bool DatabaseTracker::LazyInit() {

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 083a46a96bf96..968a1ff27fca4 100644
index 0736e7021761e..6547bf62196c9 100644
--- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h
@@ -63,6 +63,8 @@

36
patch/patches/views_1749_2102.patch
View File

@@ -43,7 +43,7 @@ index 11f1421cc79c1..c5dbc643ae7c8 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 27888933871f1..79e34b4a07416 100644
index 62fbeb6047436..76118781b2d3d 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -659,6 +659,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
@@ -61,7 +61,7 @@ index 27888933871f1..79e34b4a07416 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -2004,6 +2012,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -2010,6 +2018,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false;
@@ -82,10 +82,10 @@ index 27888933871f1..79e34b4a07416 100644
}
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index ec064d43e5afd..3893339b72cf3 100644
index 983cba19002c4..03b7d77a2e8e6 100644
--- ui/gfx/render_text.h
+++ ui/gfx/render_text.h
@@ -343,6 +343,10 @@ class GFX_EXPORT RenderText {
@@ -347,6 +347,10 @@ class GFX_EXPORT RenderText {
return whitespace_elision_;
}
@@ -96,7 +96,7 @@ index ec064d43e5afd..3893339b72cf3 100644
const Rect& display_rect() const { return display_rect_; }
void SetDisplayRect(const Rect& r);
@@ -1052,6 +1056,8 @@ class GFX_EXPORT RenderText {
@@ -1056,6 +1060,8 @@ class GFX_EXPORT RenderText {
// Tell whether or not the |layout_text_| needs an update or is up to date.
mutable bool layout_text_up_to_date_ = false;
@@ -119,10 +119,10 @@ index 7de6bdd643ad1..90994f096a0e0 100644
friend class test::InkDropHostTestApi;
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index 57e3a7d7e1d8c..eaccdf1cc50cc 100644
index c443bf1a2b7e3..541dfb7ed3a02 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -510,6 +510,12 @@ void LabelButton::OnThemeChanged() {
@@ -508,6 +508,12 @@ void LabelButton::OnThemeChanged() {
SchedulePaint();
}
@@ -238,10 +238,10 @@ index 8132b9b9a1c75..4f78f6f41c77f 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 5fdf8d2f9e9a0..7e8fa45de94bc 100644
index 2dbf14bc018d2..ec38c00234980 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2869,8 +2869,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2879,8 +2879,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@@ -256,7 +256,7 @@ index 5fdf8d2f9e9a0..7e8fa45de94bc 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2889,8 +2894,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2899,8 +2904,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@@ -308,7 +308,7 @@ index 7101143c63803..058da34d3499e 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 9f8112be1c949..6649111b2e04e 100644
index 6da48e9716bcd..98f0d4d217f9e 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1091,6 +1091,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -327,7 +327,7 @@ index 9f8112be1c949..6649111b2e04e 100644
} else if (paint_as_selected) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1158,6 +1167,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
@@ -1157,6 +1166,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
}
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@@ -449,10 +449,10 @@ 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 7706c76090589..980de1f486d0c 100644
index 5294a0aa9b177..23f46f2f1fd6c 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)
@@ -235,6 +235,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
scroll_down_button_ =
AddChildView(std::make_unique<MenuScrollButton>(content_view, false));
@@ -465,18 +465,18 @@ index 7706c76090589..980de1f486d0c 100644
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
diff --git ui/views/view.h ui/views/view.h
index f3b4c946e102e..0bd810a18c8ae 100644
index 6d4b66ad1f9e3..60fdc9ce712c5 100644
--- ui/views/view.h
+++ ui/views/view.h
@@ -21,6 +21,7 @@
#include "base/memory/ptr_util.h"
@@ -22,6 +22,7 @@
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "base/strings/string_piece.h"
+#include "base/supports_user_data.h"
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/skia/include/core/SkPath.h"
@@ -269,7 +270,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
@@ -270,7 +271,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::EventTarget,
public ui::EventHandler,
public ui::PropertyHandler,

38
patch/patches/views_widget.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index 6944f34edbfb7..36379a96dde89 100644
index 1bdeb27db614d..6f6b6095ce81a 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -619,6 +619,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
@@ -625,6 +625,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
return screen_infos_.current().device_scale_factor;
}
@@ -18,7 +18,7 @@ index 6944f34edbfb7..36379a96dde89 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 abdd3cf7d93ab..a506724f8520b 100644
index 5f2abc1943e2f..07544842449a7 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 abdd3cf7d93ab..a506724f8520b 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_|
@@ -410,6 +417,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;
@@ -152,10 +152,10 @@ index d213587450f06..3fde9a9ce47d5 100644
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
index 8e096dc664b5e..587363b31681d 100644
index 3f696838ee798..623ec5681893e 100644
--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1711,7 +1711,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1694,7 +1694,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds);
@@ -179,10 +179,10 @@ 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 5ec1e84223896..520e802dcf5a2 100644
index 95784d82cc5b7..ddc4570f2fbfc 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -244,6 +244,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -236,6 +236,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
return result;
}
@@ -201,7 +201,7 @@ index 5ec1e84223896..520e802dcf5a2 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
@@ -385,6 +397,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
@@ -377,6 +389,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
properties->wayland_app_id = params.wayland_app_id;
@@ -211,10 +211,10 @@ index 5ec1e84223896..520e802dcf5a2 100644
properties->x11_extension_delegate = this;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
index 3207a31d2b0d6..1bf291143420d 100644
index 5858882a5e44f..46fe3237039d0 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
@@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -81,6 +81,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
ui::PinnedModeExtension* GetPinnedModeExtension();
const ui::PinnedModeExtension* GetPinnedModeExtension() const;
@@ -223,7 +223,7 @@ index 3207a31d2b0d6..1bf291143420d 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(const Widget::InitParams& params) override;
@@ -94,6 +96,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -90,6 +92,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
const gfx::Vector2d& drag_offset,
Widget::MoveLoopSource source,
Widget::MoveLoopEscapeBehavior escape_behavior) override;
@@ -232,7 +232,7 @@ index 3207a31d2b0d6..1bf291143420d 100644
// PlatformWindowDelegate:
void DispatchEvent(ui::Event* event) override;
@@ -151,6 +155,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -147,6 +151,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
// destroyed.
static std::list<gfx::AcceleratedWidget>* open_windows_;
@@ -243,10 +243,10 @@ index 3207a31d2b0d6..1bf291143420d 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 1c9525d4d4302..f6e54a3362848 100644
index 182a229085a31..989cb75588d95 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -217,8 +217,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
@@ -216,8 +216,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
if (properties.parent_widget) {
window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
properties.parent_widget);
@@ -258,7 +258,7 @@ index 1c9525d4d4302..f6e54a3362848 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 a1de50d6b0f69..53c42fc120c4a 100644
index ece3dfbee04cf..ddc7cf13ec6ef 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) {
@@ -309,7 +309,7 @@ index 444581249014a..5defa787d25cd 100644
// a reference.
raw_ptr<corewm::TooltipWin> tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 35cb9c39c6740..4208536fb9cc3 100644
index c22fcb4edd5a7..a69c113eee3be 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -338,7 +338,8 @@ void Widget::Init(InitParams params) {
@@ -404,10 +404,10 @@ index b3a3efd0e526f..8590a98eaf0b2 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 51ac070553d08..09287f6e3f888 100644
index 2b69f4767e907..5bb0f982eb104 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -3133,10 +3133,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3148,10 +3148,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.

24
patch/patches/viz_osr_2575.patch
View File

@@ -80,7 +80,7 @@ index 309422bcf8581..759549f3046f4 100644
private:
const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index 15a66c6a1e761..71ebc2dc5e787 100644
index 002b3ddfb0f77..48abd11739d05 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -221,6 +221,8 @@ viz_component("service") {
@@ -93,7 +93,7 @@ index 15a66c6a1e761..71ebc2dc5e787 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 8a277c6337d44..e427d41be01c1 100644
index 8a277c6337d44..8bf8ae706624e 100644
--- components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -17,6 +17,7 @@
@@ -104,7 +104,15 @@ index 8a277c6337d44..e427d41be01c1 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"
@@ -247,6 +248,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
@@ -39,6 +40,7 @@
#include "gpu/ipc/scheduler_sequence.h"
#include "gpu/ipc/service/gpu_channel_manager_delegate.h"
#include "gpu/ipc/service/image_transport_surface.h"
+#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
#include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/init/gl_factory.h"
@@ -247,6 +249,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
if (headless_)
return std::make_unique<SoftwareOutputDevice>();
@@ -214,10 +222,10 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
+ Draw(gfx.mojom.Rect damage_rect) => ();
};
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index b30b9460889b9..19d7967f4ef96 100644
index 80bff73a5886e..55a6daaf37364 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -30,7 +30,9 @@
@@ -31,7 +31,9 @@
#include "components/viz/common/frame_sinks/begin_frame_args.h"
#include "components/viz/common/surfaces/frame_sink_id.h"
#include "components/viz/common/surfaces/subtree_capture_id.h"
@@ -227,7 +235,7 @@ index b30b9460889b9..19d7967f4ef96 100644
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom-forward.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -137,6 +139,14 @@ class COMPOSITOR_EXPORT ContextFactory {
@@ -139,6 +141,14 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0;
};
@@ -242,7 +250,7 @@ index b30b9460889b9..19d7967f4ef96 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -178,6 +188,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
@@ -180,6 +190,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -252,7 +260,7 @@ index b30b9460889b9..19d7967f4ef96 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -466,6 +479,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
@@ -476,6 +489,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;

25
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 62818b1c709b7..bcb25dd22fe8f 100644
index d0092176fd24a..a0d751db88136 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -3030,6 +3030,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3057,6 +3057,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
params.main_frame_name, GetOpener(), primary_main_frame_policy);
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
@@ -15,7 +15,7 @@ index 62818b1c709b7..bcb25dd22fe8f 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3040,6 +3046,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3067,6 +3073,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@@ -23,7 +23,7 @@ index 62818b1c709b7..bcb25dd22fe8f 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3218,6 +3225,9 @@ void WebContentsImpl::RenderWidgetCreated(
@@ -3245,6 +3252,9 @@ void WebContentsImpl::RenderWidgetCreated(
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
"render_widget_host", render_widget_host);
created_widgets_.insert(render_widget_host);
@@ -33,7 +33,7 @@ index 62818b1c709b7..bcb25dd22fe8f 100644
}
void WebContentsImpl::RenderWidgetDeleted(
@@ -3906,6 +3916,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3933,6 +3943,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -49,7 +49,7 @@ index 62818b1c709b7..bcb25dd22fe8f 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7733,6 +7752,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7787,6 +7806,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames).
SetFocusedFrameTree(node->frame_tree());
}
@@ -60,7 +60,7 @@ index 62818b1c709b7..bcb25dd22fe8f 100644
void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index cb672eb5276e8..0f2f8f9a57fcc 100644
index c062c66f596f5..8c9d5cd4d9af9 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -93,10 +93,12 @@ class BrowserContext;
@@ -88,10 +88,10 @@ index cb672eb5276e8..0f2f8f9a57fcc 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 9c70cc90402dd..0e0daeb27e880 100644
index 85335ff06c87e..2c88f03d95d52 100644
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -57,10 +57,12 @@ class EyeDropperListener;
@@ -57,9 +57,11 @@ class EyeDropperListener;
class FileSelectListener;
class JavaScriptDialogManager;
class RenderFrameHost;
@@ -99,12 +99,11 @@ index 9c70cc90402dd..0e0daeb27e880 100644
class RenderWidgetHost;
class SessionStorageNamespace;
class SiteInstance;
class WebContentsImpl;
+class WebContentsView;
struct ContextMenuParams;
struct DropData;
struct MediaPlayerWatchTime;
@@ -339,6 +341,14 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -338,6 +340,14 @@ class CONTENT_EXPORT WebContentsDelegate {
const StoragePartitionConfig& partition_config,
SessionStorageNamespace* session_storage_namespace);
@@ -120,7 +119,7 @@ index 9c70cc90402dd..0e0daeb27e880 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 b68d706fe204c..aec4c68851607 100644
index 9ee3b74460c00..c6497c7059d54 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -209,6 +209,9 @@ class CONTENT_EXPORT WebContentsObserver {

6
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index 1d7c9a8e62a68..5d71c71d39167 100644
index 0825226fae036..39fa28472f293 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -873,6 +873,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -868,6 +868,11 @@ class BLINK_PLATFORM_EXPORT Platform {
const WebURL& url,
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {}
@@ -15,7 +15,7 @@ index 1d7c9a8e62a68..5d71c71d39167 100644
static void InitializeMainThreadCommon(Platform* platform,
std::unique_ptr<Thread> main_thread);
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
index 513bee6f4a3e3..df7c2512a343e 100644
index 77f3044734030..26b66953a4ef6 100644
--- third_party/blink/renderer/core/inspector/devtools_session.cc
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
@@ -8,6 +8,7 @@

18
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index 560b72dfbc701..b63918a20ed0a 100644
index a1427a6a95583..e159588700962 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -341,6 +341,7 @@ class WebView {
@@ -336,6 +336,7 @@ class WebView {
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
@@ -11,10 +11,10 @@ index 560b72dfbc701..b63918a20ed0a 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 6aa72717b2576..c05663723089a 100644
index ef2be0e089921..fab6b9af53e60 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -247,8 +247,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -249,8 +249,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@@ -30,7 +30,7 @@ index 6aa72717b2576..c05663723089a 100644
}
namespace {
@@ -559,6 +564,7 @@ WebViewImpl::WebViewImpl(
@@ -561,6 +566,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@@ -39,7 +39,7 @@ index 6aa72717b2576..c05663723089a 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 5107ef421138e..7660b1c3287c1 100644
index 08a54c62b7f4e..1a5c2a27c8ef1 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -134,7 +134,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -52,7 +52,7 @@ index 5107ef421138e..7660b1c3287c1 100644
// Returns whether frames under this WebView are backed by a compositor.
bool does_composite() const { return does_composite_; }
@@ -801,6 +802,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -798,6 +799,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_ = 0.f;
bool fake_page_scale_animation_use_anchor_ = false;
@@ -62,10 +62,10 @@ index 5107ef421138e..7660b1c3287c1 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 dc5f2b7966770..ac01b405f144f 100644
index a32cd2ab42756..0c64dc6bd583c 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -904,7 +904,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
@@ -911,7 +911,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();

7
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 e1e151f58d06f..7ee1d16fa9ffc 100644
index 42eba91627c89..4b4089ff744d5 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 @@
@@ -10,11 +10,12 @@ index e1e151f58d06f..7ee1d16fa9ffc 100644
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -19,14 +20,17 @@
@@ -18,15 +19,18 @@
#include "base/strings/stringprintf.h"
#include "base/system/sys_info.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
+#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"

8
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 d916c59c1d4fe..7cc9401e19800 100644
index 8339cb51e2d2a..2d5282732e86a 100644
--- sandbox/policy/win/sandbox_win.cc
+++ sandbox/policy/win/sandbox_win.cc
@@ -1154,6 +1154,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
@@ -1133,6 +1133,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
const base::HandlesToInheritVector& handles_to_inherit,
SandboxDelegate* delegate,
base::Process* process) {
@@ -13,6 +13,6 @@ index d916c59c1d4fe..7cc9401e19800 100644
+ process);
+ }
+
scoped_refptr<TargetPolicy> policy = g_broker_services->CreatePolicy();
auto policy = g_broker_services->CreatePolicy();
ResultCode result = GeneratePolicyForSandboxedProcess(
cmd_line, process_type, handles_to_inherit, delegate, policy);
cmd_line, process_type, handles_to_inherit, delegate, policy.get());

6
patch/patches/win_shell_dialogs_3294.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/shell_dialogs/base_shell_dialog_win.cc ui/shell_dialogs/base_shell_dialog_win.cc
index 46fd116c02dad..499bf49cff882 100644
index b8ef380ab0059..fc90b5ce0e6d4 100644
--- ui/shell_dialogs/base_shell_dialog_win.cc
+++ ui/shell_dialogs/base_shell_dialog_win.cc
@@ -59,11 +59,15 @@ BaseShellDialogImpl::Owners& BaseShellDialogImpl::GetOwners() {
@@ -58,11 +58,15 @@ BaseShellDialogImpl::Owners& BaseShellDialogImpl::GetOwners() {
// static
void BaseShellDialogImpl::DisableOwner(HWND owner) {
@@ -18,7 +18,7 @@ index 46fd116c02dad..499bf49cff882 100644
// Cannot run a modal shell dialog if one is already running for this owner.
DCHECK(!IsRunningDialogForOwner(owner));
// The owner must be a top level window, otherwise we could end up with two
@@ -89,6 +93,8 @@ void BaseShellDialogImpl::EndRun(std::unique_ptr<RunState> run_state) {
@@ -88,6 +92,8 @@ void BaseShellDialogImpl::EndRun(std::unique_ptr<RunState> run_state) {
}
bool BaseShellDialogImpl::IsRunningDialogForOwner(HWND owner) const {