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

Update to Chromium version 127.0.6533.57

This commit is contained in:
Marshall Greenblatt 2024-07-18 13:35:21 +00:00 committed by Marshall Greenblatt
parent 5bafd32ee1
commit 1567840505
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

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

4
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index e06cdcd322877..7c0382fd1948a 100644
index db90e13763831..4448eac5885b8 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@ -18,7 +18,7 @@ index e06cdcd322877..7c0382fd1948a 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2777,6 +2779,10 @@ static_library("browser") {
@@ -2778,6 +2780,10 @@ static_library("browser") {
]
}

58
patch/patches/chrome_browser_browser.patch
View File

@ -154,10 +154,10 @@ index 49e6bdcbd55a6..0425eb49c4296 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index b4eadfdbfcfac..8ee3f0f988f6d 100644
index a7a3a0722bcbe..53051e86f03c1 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -272,6 +272,25 @@
@@ -271,6 +271,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -183,7 +183,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -537,6 +556,10 @@ Browser::Browser(const CreateParams& params)
@@ -536,6 +555,10 @@ Browser::Browser(const CreateParams& params)
type_(params.type),
profile_(params.profile),
window_(nullptr),
@ -194,7 +194,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -759,6 +782,12 @@ Browser::~Browser() {
@@ -768,6 +791,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@ -207,7 +207,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1219,6 +1248,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1241,6 +1270,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -216,7 +216,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1592,6 +1623,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1614,6 +1645,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -231,7 +231,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1599,8 +1638,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1621,8 +1660,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -252,7 +252,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1776,6 +1825,16 @@ WebContents* Browser::OpenURLFromTab(
@@ -1798,6 +1847,16 @@ WebContents* Browser::OpenURLFromTab(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -269,7 +269,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1938,6 +1997,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1960,6 +2019,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -278,7 +278,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1966,6 +2027,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1988,6 +2049,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -287,7 +287,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
if (!GetStatusBubble())
return;
@@ -1973,6 +2036,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1995,6 +2058,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -305,7 +305,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::ET_MOUSE_EXITED;
@@ -2000,6 +2074,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -2022,6 +2096,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -325,7 +325,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2099,12 +2186,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -2121,12 +2208,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -350,7 +350,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
// Don't show the page hung dialog when a HTML popup hangs because
// the dialog will take the focus and immediately close the popup.
RenderWidgetHostView* view = render_widget_host->GetView();
@@ -2117,6 +2216,13 @@ void Browser::RendererUnresponsive(
@@ -2139,6 +2238,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@ -364,7 +364,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2126,6 +2232,15 @@ void Browser::RendererResponsive(
@@ -2148,6 +2254,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
@ -380,7 +380,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2161,6 +2276,11 @@ void Browser::DraggableRegionsChanged(
@@ -2183,6 +2298,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@ -392,7 +392,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
void Browser::DidFinishNavigation(
@@ -2241,11 +2361,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2263,11 +2383,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -408,7 +408,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2445,6 +2569,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2467,6 +2591,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -424,7 +424,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2989,9 +3122,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -3011,9 +3144,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -437,7 +437,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -2999,6 +3134,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -3021,6 +3156,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -450,7 +450,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
return nullptr;
}
@@ -3148,6 +3289,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3170,6 +3311,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -459,7 +459,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3302,6 +3445,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3324,6 +3467,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -475,7 +475,7 @@ index b4eadfdbfcfac..8ee3f0f988f6d 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index b6d47818d7648..9265c6ffdee64 100644
index 289eb221d6fbb..13aa346aaa37c 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -24,6 +24,7 @@
@ -497,7 +497,7 @@ index b6d47818d7648..9265c6ffdee64 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -373,6 +378,15 @@ class Browser : public TabStripModelObserver,
@@ -377,6 +382,15 @@ class Browser : public TabStripModelObserver,
// Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
std::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
@ -513,7 +513,7 @@ index b6d47818d7648..9265c6ffdee64 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -454,6 +468,13 @@ class Browser : public TabStripModelObserver,
@@ -458,6 +472,13 @@ class Browser : public TabStripModelObserver,
update_ui_immediately_for_testing_ = true;
}
@ -527,7 +527,7 @@ index b6d47818d7648..9265c6ffdee64 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -549,6 +570,12 @@ class Browser : public TabStripModelObserver,
@@ -553,6 +574,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
base::WeakPtr<const Browser> AsWeakPtr() const;
@ -540,7 +540,7 @@ index b6d47818d7648..9265c6ffdee64 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -962,10 +989,18 @@ class Browser : public TabStripModelObserver,
@@ -970,10 +997,18 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -559,7 +559,7 @@ index b6d47818d7648..9265c6ffdee64 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1300,6 +1335,10 @@ class Browser : public TabStripModelObserver,
@@ -1308,6 +1343,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@ -570,7 +570,7 @@ index b6d47818d7648..9265c6ffdee64 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1366,6 +1405,8 @@ class Browser : public TabStripModelObserver,
@@ -1374,6 +1413,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;

4
patch/patches/chrome_browser_context_menus.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index ee4c942790296..f451d56cf929b 100644
index 2c61092b98efd..05934c29c32da 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -356,6 +356,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@ -60,7 +60,7 @@ index ee4c942790296..f451d56cf929b 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3621,6 +3651,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3635,6 +3665,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}

28
patch/patches/chrome_runtime.patch
View File

@ -422,7 +422,7 @@ index 6b27cf7037fce..70fd49bb873ff 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index c6fb861755332..8f2c467018d05 100644
index 7c3178793b3fb..98a4e74106b97 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -46,6 +46,7 @@
@ -433,7 +433,7 @@ index c6fb861755332..8f2c467018d05 100644
#include "chrome/browser/after_startup_task_utils.h"
#include "chrome/browser/ai/ai_manager_impl.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
@@ -1488,6 +1489,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
@@ -1489,6 +1490,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
}
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -442,7 +442,7 @@ index c6fb861755332..8f2c467018d05 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(
std::make_unique<ChromeContentBrowserClientPluginsPart>());
@@ -1525,6 +1528,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1526,6 +1529,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
}
}
@ -454,7 +454,7 @@ index c6fb861755332..8f2c467018d05 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3746,28 +3754,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
@@ -3756,28 +3764,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
web_prefs->preferred_color_scheme;
}
#else
@ -500,7 +500,7 @@ index c6fb861755332..8f2c467018d05 100644
#endif // BUILDFLAG(IS_ANDROID)
// Reauth WebUI doesn't support dark mode yet because it shares the dialog
@@ -4508,9 +4513,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4518,9 +4523,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -512,7 +512,7 @@ index c6fb861755332..8f2c467018d05 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6637,7 +6644,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6647,7 +6654,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@ -521,7 +521,7 @@ index c6fb861755332..8f2c467018d05 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6655,6 +6662,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6665,6 +6672,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -530,7 +530,7 @@ index c6fb861755332..8f2c467018d05 100644
}
std::vector<base::FilePath>
@@ -7777,10 +7786,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7787,10 +7796,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -543,7 +543,7 @@ index c6fb861755332..8f2c467018d05 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7799,7 +7808,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7809,7 +7818,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -553,7 +553,7 @@ index c6fb861755332..8f2c467018d05 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7978,7 +7988,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7988,7 +7998,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -563,7 +563,7 @@ index c6fb861755332..8f2c467018d05 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 522c072575325..b63e9aacd1f0a 100644
index c7ede4d105592..49cfa4193ab5e 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -147,6 +147,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -575,7 +575,7 @@ index 522c072575325..b63e9aacd1f0a 100644
// TODO(crbug.com/41356866): 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.
@@ -691,7 +693,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -693,7 +695,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -584,7 +584,7 @@ index 522c072575325..b63e9aacd1f0a 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1233,7 +1235,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -1235,7 +1237,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@ -594,7 +594,7 @@ index 522c072575325..b63e9aacd1f0a 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 3b6ce83dd7579..bcaa68b901656 100644
index c93cccc815a14..e39d3434fa1b0 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -16,6 +16,7 @@

28
patch/patches/chrome_runtime_views.patch
View File

@ -397,7 +397,7 @@ index 14a8a70d853f6..bf81594947886 100644
// regenerated.
bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type);
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 05a0dd22ce010..3a9a8d6c839fb 100644
index 8a4afd4e2e6aa..db55c9c1a6125 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -351,11 +351,10 @@ using content::WebContents;
@ -544,7 +544,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -3183,7 +3224,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
@@ -3196,7 +3237,8 @@ views::View* BrowserView::GetTopContainer() {
}
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -554,7 +554,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
return download_button->bubble_controller();
return nullptr;
@@ -3738,7 +3780,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -3751,7 +3793,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this)
return;
@ -564,7 +564,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -4221,11 +4264,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
@@ -4234,11 +4277,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
bool BrowserView::ShouldDescendIntoChildForEventHandling(
gfx::NativeView child,
const gfx::Point& location) {
@ -605,7 +605,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
// Draggable regions are defined relative to the web contents.
gfx::Point point_in_contents_web_view_coords(location);
views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
@@ -4234,7 +4304,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
@@ -4247,7 +4317,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
// Draggable regions should be ignored for clicks into any browser view's
// owned widgets, for example alerts, permission prompts or find bar.
@ -614,7 +614,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
point_in_contents_web_view_coords.x(),
point_in_contents_web_view_coords.y()) ||
WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
@@ -4345,8 +4415,10 @@ void BrowserView::Layout(PassKey) {
@@ -4358,8 +4428,10 @@ void BrowserView::Layout(PassKey) {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -627,7 +627,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -4412,6 +4484,11 @@ void BrowserView::AddedToWidget() {
@@ -4425,6 +4497,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -639,7 +639,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when
@@ -4453,13 +4530,9 @@ void BrowserView::AddedToWidget() {
@@ -4466,13 +4543,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -655,7 +655,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -4819,7 +4892,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4832,7 +4905,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -665,7 +665,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
}
void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) {
@@ -5292,6 +5366,8 @@ Profile* BrowserView::GetProfile() {
@@ -5305,6 +5379,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -674,7 +674,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -5314,6 +5390,8 @@ void BrowserView::HideDownloadShelf() {
@@ -5327,6 +5403,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -684,7 +684,7 @@ index 05a0dd22ce010..3a9a8d6c839fb 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 0e1ac9a2fd806..0b6f9370737f0 100644
index 942d62947353e..5c84e60b797e4 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -142,11 +142,16 @@ class BrowserView : public BrowserWindow,
@ -704,7 +704,7 @@ index 0e1ac9a2fd806..0b6f9370737f0 100644
void set_frame(BrowserFrame* frame) {
frame_ = frame;
paint_as_active_subscription_ =
@@ -862,6 +867,10 @@ class BrowserView : public BrowserWindow,
@@ -863,6 +868,10 @@ class BrowserView : public BrowserWindow,
base::WeakPtr<content::WebContents> expected_web_contents,
const enterprise_data_protection::UrlSettings& settings);
@ -715,7 +715,7 @@ index 0e1ac9a2fd806..0b6f9370737f0 100644
protected:
// Enumerates where the devtools are docked relative to the browser's main
// web contents.
@@ -885,6 +894,8 @@ class BrowserView : public BrowserWindow,
@@ -886,6 +895,8 @@ class BrowserView : public BrowserWindow,
const gfx::Rect& contents_webview_bounds,
const gfx::Rect& local_webview_container_bounds);

14
patch/patches/content_2015.patch
View File

@ -47,10 +47,10 @@ index 6ff681f94dcba..82b93e6d3052a 100644
return std::make_pair(
/*is_cacheable=*/false,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 8df62dd712ad5..b191ea472448a 100644
index fe7feddd55aad..86e2ef537de36 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -1104,7 +1104,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -1109,7 +1109,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@ -59,7 +59,7 @@ index 8df62dd712ad5..b191ea472448a 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1113,6 +1113,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -1118,6 +1118,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@ -68,10 +68,10 @@ index 8df62dd712ad5..b191ea472448a 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 8f457dd1d2afb..6df18f193039e 100644
index 698dcf4d5ac83..d93d32acd423e 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -2094,7 +2094,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2100,7 +2100,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
@ -80,7 +80,7 @@ index 8f457dd1d2afb..6df18f193039e 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -2307,6 +2307,21 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2313,6 +2313,21 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -102,7 +102,7 @@ index 8f457dd1d2afb..6df18f193039e 100644
// Creates an OverlayWindow to be used for video or Picture-in-Picture.
// This window will house the content shown when in Picture-in-Picture mode.
// This will return a new OverlayWindow.
@@ -2364,6 +2379,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2370,6 +2385,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();