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

Update to Chromium version 128.0.6613.18

This commit is contained in:
Marshall Greenblatt 2024-08-02 15:12:24 +00:00 committed by Marshall Greenblatt
parent 2b5cb6a8ab
commit d38e4ef3ba
10 changed files with 54 additions and 54 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 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/128.0.6613.7' 'chromium_checkout': 'refs/tags/128.0.6613.18'
} }

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index 214c70f690b18..7e481aee2a1ca 100644
// Make an exception to allow most visited tiles to commit in // Make an exception to allow most visited tiles to commit in
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index fa22dada07038..470611958482f 100644 index c90fd914ef5b0..42fc2b7467cee 100644
--- content/browser/renderer_host/navigation_request.cc --- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc
@@ -8128,10 +8128,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( @@ -8131,10 +8131,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
bool use_opaque_origin = bool use_opaque_origin =
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
network::mojom::WebSandboxFlags::kOrigin; network::mojom::WebSandboxFlags::kOrigin;
@ -47,7 +47,7 @@ index fa22dada07038..470611958482f 100644
} }
return origin_and_debug_info; return origin_and_debug_info;
@@ -8239,6 +8251,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { @@ -8242,6 +8254,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
DetermineInitiatorRelationship(initiator_rfh, DetermineInitiatorRelationship(initiator_rfh,
frame_tree_node_->current_frame_host())); frame_tree_node_->current_frame_host()));

2
patch/patches/chrome_browser_browser.patch
View File

@ -173,7 +173,7 @@ index c54ec37e56ad7..fda899ec278ef 100644
] ]
} }
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 681fe10f28260..89da7d87b306b 100644 index 5513b0d21ea63..0c8291992f194 100644
--- chrome/browser/ui/browser.cc --- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc
@@ -271,6 +271,25 @@ @@ -271,6 +271,25 @@

12
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 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index ec801ac598ed6..818c55412f280 100644 index 98a4191e1e91d..9fbe141d267c9 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -350,6 +350,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -352,6 +352,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get(); return callback.get();
} }
@ -21,7 +21,7 @@ index ec801ac598ed6..818c55412f280 100644
enum class UmaEnumIdLookupType { enum class UmaEnumIdLookupType {
GeneralEnumId, GeneralEnumId,
ContextSpecificEnumId, ContextSpecificEnumId,
@@ -615,6 +627,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { @@ -617,6 +629,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
return 1; return 1;
} }
@ -32,7 +32,7 @@ index ec801ac598ed6..818c55412f280 100644
id = CollapseCommandsForUMA(id); id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type); const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id); auto it = map.find(id);
@@ -881,6 +897,14 @@ RenderViewContextMenu::RenderViewContextMenu( @@ -883,6 +899,14 @@ RenderViewContextMenu::RenderViewContextMenu(
: nullptr; : nullptr;
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -47,7 +47,7 @@ index ec801ac598ed6..818c55412f280 100644
observers_.AddObserver(&autofill_context_menu_manager_); observers_.AddObserver(&autofill_context_menu_manager_);
} }
@@ -1342,6 +1366,12 @@ void RenderViewContextMenu::InitMenu() { @@ -1344,6 +1368,12 @@ void RenderViewContextMenu::InitMenu() {
autofill_client->HideAutofillSuggestions( autofill_client->HideAutofillSuggestions(
autofill::SuggestionHidingReason::kContextMenuOpened); autofill::SuggestionHidingReason::kContextMenuOpened);
} }
@ -60,7 +60,7 @@ index ec801ac598ed6..818c55412f280 100644
} }
Profile* RenderViewContextMenu::GetProfile() const { Profile* RenderViewContextMenu::GetProfile() const {
@@ -3615,6 +3645,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( @@ -3626,6 +3656,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb); execute_plugin_action_callback_ = std::move(cb);
} }

8
patch/patches/chrome_browser_frame_mac.patch
View File

@ -33,10 +33,10 @@ index decd0b51ddc3d..17fce2da6ad0e 100644
~BrowserFrameMac() override; ~BrowserFrameMac() override;
diff --git chrome/browser/ui/views/frame/browser_frame_mac.mm chrome/browser/ui/views/frame/browser_frame_mac.mm diff --git chrome/browser/ui/views/frame/browser_frame_mac.mm chrome/browser/ui/views/frame/browser_frame_mac.mm
index 7b52e844d31d1..38862163b6698 100644 index e1939647c8a9c..22f994f0ce220 100644
--- chrome/browser/ui/views/frame/browser_frame_mac.mm --- chrome/browser/ui/views/frame/browser_frame_mac.mm
+++ chrome/browser/ui/views/frame/browser_frame_mac.mm +++ chrome/browser/ui/views/frame/browser_frame_mac.mm
@@ -184,7 +184,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() { @@ -185,7 +185,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() {
void BrowserFrameMac::ValidateUserInterfaceItem( void BrowserFrameMac::ValidateUserInterfaceItem(
int32_t tag, int32_t tag,
remote_cocoa::mojom::ValidateUserInterfaceItemResult* result) { remote_cocoa::mojom::ValidateUserInterfaceItemResult* result) {
@ -52,7 +52,7 @@ index 7b52e844d31d1..38862163b6698 100644
if (!chrome::SupportsCommand(browser, tag)) { if (!chrome::SupportsCommand(browser, tag)) {
result->enable = false; result->enable = false;
return; return;
@@ -305,8 +312,16 @@ bool BrowserFrameMac::WillExecuteCommand( @@ -308,8 +315,16 @@ bool BrowserFrameMac::WillExecuteCommand(
int32_t command, int32_t command,
WindowOpenDisposition window_open_disposition, WindowOpenDisposition window_open_disposition,
bool is_before_first_responder) { bool is_before_first_responder) {
@ -70,7 +70,7 @@ index 7b52e844d31d1..38862163b6698 100644
if (is_before_first_responder) { if (is_before_first_responder) {
// The specification for this private extensions API is incredibly vague. // The specification for this private extensions API is incredibly vague.
// For now, we avoid triggering chrome commands prior to giving the // For now, we avoid triggering chrome commands prior to giving the
@@ -337,11 +352,20 @@ bool BrowserFrameMac::ExecuteCommand( @@ -340,11 +355,20 @@ bool BrowserFrameMac::ExecuteCommand(
int32_t command, int32_t command,
WindowOpenDisposition window_open_disposition, WindowOpenDisposition window_open_disposition,
bool is_before_first_responder) { bool is_before_first_responder) {

50
patch/patches/chrome_runtime_views.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 0108532731b73..ddfcc75ae9801 100644 index 8837e8baf3025..c48dd62adf626 100644
--- chrome/browser/ui/browser_command_controller.cc --- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc
@@ -412,6 +412,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -412,6 +412,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@ -41,10 +41,10 @@ index 0108532731b73..ddfcc75ae9801 100644
void BrowserCommandController::InitCommandState() { void BrowserCommandController::InitCommandState() {
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
index 28f18cbca8a49..31cec595eab48 100644 index 3903f81165b4a..873b193af1b05 100644
--- chrome/browser/ui/toolbar/app_menu_model.cc --- chrome/browser/ui/toolbar/app_menu_model.cc
+++ chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -715,10 +715,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( @@ -717,10 +717,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
ui::SimpleMenuModel::Delegate* delegate) ui::SimpleMenuModel::Delegate* delegate)
: SimpleMenuModel(delegate) { : SimpleMenuModel(delegate) {
AddItemWithStringIdAndVectorIcon(this, IDC_FIND, IDS_FIND, kSearchMenuIcon); AddItemWithStringIdAndVectorIcon(this, IDC_FIND, IDS_FIND, kSearchMenuIcon);
@ -57,7 +57,7 @@ index 28f18cbca8a49..31cec595eab48 100644
} }
class SaveAndShareSubMenuModel : public ui::SimpleMenuModel { class SaveAndShareSubMenuModel : public ui::SimpleMenuModel {
@@ -783,6 +785,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( @@ -785,6 +787,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
} }
} }
@ -115,7 +115,7 @@ index 28f18cbca8a49..31cec595eab48 100644
} // namespace } // namespace
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@@ -1676,7 +1729,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { @@ -1678,7 +1731,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
return false; return false;
} }
@ -124,7 +124,7 @@ index 28f18cbca8a49..31cec595eab48 100644
GlobalError* error = GlobalError* error =
GlobalErrorServiceFactory::GetForProfile(browser_->profile()) GlobalErrorServiceFactory::GetForProfile(browser_->profile())
->GetGlobalErrorByMenuItemCommandID(command_id); ->GetGlobalErrorByMenuItemCommandID(command_id);
@@ -1692,6 +1745,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { @@ -1694,6 +1747,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
} }
} }
@ -155,7 +155,7 @@ index 28f18cbca8a49..31cec595eab48 100644
bool AppMenuModel::IsCommandIdAlerted(int command_id) const { bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
if (command_id == IDC_VIEW_PASSWORDS || if (command_id == IDC_VIEW_PASSWORDS ||
command_id == IDC_SHOW_PASSWORD_MANAGER) { command_id == IDC_SHOW_PASSWORD_MANAGER) {
@@ -1854,8 +1931,10 @@ void AppMenuModel::Build() { @@ -1856,8 +1933,10 @@ void AppMenuModel::Build() {
IDS_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA,
kTrashCanRefreshIcon); kTrashCanRefreshIcon);
@ -166,7 +166,7 @@ index 28f18cbca8a49..31cec595eab48 100644
AddSeparator(ui::NORMAL_SEPARATOR); AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon); AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon);
@@ -1967,6 +2046,11 @@ void AppMenuModel::Build() { @@ -1972,6 +2051,11 @@ void AppMenuModel::Build() {
} }
#endif // !BUILDFLAG(IS_CHROMEOS_ASH) #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
@ -397,7 +397,7 @@ index 14a8a70d853f6..bf81594947886 100644
// regenerated. // regenerated.
bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type); bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type);
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index ab37088b71722..f4e1786b902c9 100644 index 6e5ce23ae43a4..12cd21a6e71ab 100644
--- chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -354,11 +354,10 @@ using content::WebContents; @@ -354,11 +354,10 @@ using content::WebContents;
@ -564,7 +564,7 @@ index ab37088b71722..f4e1786b902c9 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -4280,11 +4323,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) { @@ -4283,11 +4326,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
bool BrowserView::ShouldDescendIntoChildForEventHandling( bool BrowserView::ShouldDescendIntoChildForEventHandling(
gfx::NativeView child, gfx::NativeView child,
const gfx::Point& location) { const gfx::Point& location) {
@ -605,7 +605,7 @@ index ab37088b71722..f4e1786b902c9 100644
// Draggable regions are defined relative to the web contents. // Draggable regions are defined relative to the web contents.
gfx::Point point_in_contents_web_view_coords(location); gfx::Point point_in_contents_web_view_coords(location);
views::View::ConvertPointToTarget(GetWidget()->GetRootView(), views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
@@ -4293,7 +4363,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( @@ -4296,7 +4366,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
// Draggable regions should be ignored for clicks into any browser view's // Draggable regions should be ignored for clicks into any browser view's
// owned widgets, for example alerts, permission prompts or find bar. // owned widgets, for example alerts, permission prompts or find bar.
@ -614,7 +614,7 @@ index ab37088b71722..f4e1786b902c9 100644
point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.x(),
point_in_contents_web_view_coords.y()) || point_in_contents_web_view_coords.y()) ||
WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
@@ -4404,8 +4474,10 @@ void BrowserView::Layout(PassKey) { @@ -4407,8 +4477,10 @@ void BrowserView::Layout(PassKey) {
// TODO(jamescook): Why was this in the middle of layout code? // TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -627,7 +627,7 @@ index ab37088b71722..f4e1786b902c9 100644
// Some of the situations when the BrowserView is laid out are: // Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode. // - Enter/exit immersive fullscreen mode.
@@ -4471,6 +4543,11 @@ void BrowserView::AddedToWidget() { @@ -4474,6 +4546,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@ -639,7 +639,7 @@ index ab37088b71722..f4e1786b902c9 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when // TODO(pbos): Investigate whether the side panels should be creatable when
@@ -4512,13 +4589,9 @@ void BrowserView::AddedToWidget() { @@ -4515,13 +4592,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();
@ -655,7 +655,7 @@ index ab37088b71722..f4e1786b902c9 100644
using_native_frame_ = frame_->ShouldUseNativeFrame(); using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
@@ -4886,7 +4959,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) { @@ -4889,7 +4962,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) {
// Undo our anti-jankiness hacks and force a re-layout. // Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false; in_process_fullscreen_ = false;
ToolbarSizeChanged(false); ToolbarSizeChanged(false);
@ -665,7 +665,7 @@ index ab37088b71722..f4e1786b902c9 100644
} }
void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) { void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) {
@@ -5387,6 +5461,8 @@ Profile* BrowserView::GetProfile() { @@ -5390,6 +5464,8 @@ Profile* BrowserView::GetProfile() {
} }
void BrowserView::UpdateUIForTabFullscreen() { void BrowserView::UpdateUIForTabFullscreen() {
@ -674,7 +674,7 @@ index ab37088b71722..f4e1786b902c9 100644
frame()->GetFrameView()->UpdateFullscreenTopUI(); frame()->GetFrameView()->UpdateFullscreenTopUI();
} }
@@ -5409,6 +5485,8 @@ void BrowserView::HideDownloadShelf() { @@ -5412,6 +5488,8 @@ void BrowserView::HideDownloadShelf() {
} }
bool BrowserView::CanUserExitFullscreen() const { bool BrowserView::CanUserExitFullscreen() const {
@ -961,10 +961,10 @@ index 0bd4cfc52548b..8515cec793563 100644
case PageActionIconType::kPaymentsOfferNotification: case PageActionIconType::kPaymentsOfferNotification:
add_page_action_icon( add_page_action_icon(
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 28cff32121b69..443e43779e8f5 100644 index 190843e6c42f7..da4e026a790a3 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -606,29 +606,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( @@ -600,29 +600,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
} }
bool BrowserTabStripController::IsFrameCondensed() const { bool BrowserTabStripController::IsFrameCondensed() const {
@ -1007,7 +1007,7 @@ index 28cff32121b69..443e43779e8f5 100644
} }
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 0ef2fcb160af2..010279ae8e5dc 100644 index d1519e7f3782a..f82d651692a99 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc --- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -192,7 +192,7 @@ class TabstripLikeBackground : public views::Background { @@ -192,7 +192,7 @@ class TabstripLikeBackground : public views::Background {
@ -1035,7 +1035,7 @@ index 0ef2fcb160af2..010279ae8e5dc 100644
SetID(VIEW_ID_TOOLBAR); SetID(VIEW_ID_TOOLBAR);
container_view_ = AddChildView(std::make_unique<ContainerView>()); container_view_ = AddChildView(std::make_unique<ContainerView>());
@@ -255,9 +256,24 @@ ToolbarView::~ToolbarView() { @@ -257,9 +258,24 @@ ToolbarView::~ToolbarView() {
for (const auto& view_and_command : GetViewCommandMap()) for (const auto& view_and_command : GetViewCommandMap())
chrome::RemoveCommandObserver(browser_, view_and_command.second, this); chrome::RemoveCommandObserver(browser_, view_and_command.second, this);
@ -1060,7 +1060,7 @@ index 0ef2fcb160af2..010279ae8e5dc 100644
#if defined(USE_AURA) #if defined(USE_AURA)
// Avoid generating too many occlusion tracking calculation events before this // Avoid generating too many occlusion tracking calculation events before this
// function returns. The occlusion status will be computed only once once this // function returns. The occlusion status will be computed only once once this
@@ -280,12 +296,12 @@ void ToolbarView::Init() { @@ -282,12 +298,12 @@ void ToolbarView::Init() {
auto location_bar = std::make_unique<LocationBarView>( auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this, browser_, browser_->profile(), browser_->command_controller(), this,
@ -1075,7 +1075,7 @@ index 0ef2fcb160af2..010279ae8e5dc 100644
download_button = download_button =
std::make_unique<DownloadToolbarButtonView>(browser_view_); std::make_unique<DownloadToolbarButtonView>(browser_view_);
} }
@@ -365,8 +381,10 @@ void ToolbarView::Init() { @@ -367,8 +383,10 @@ void ToolbarView::Init() {
toolbar_divider = std::make_unique<views::View>(); toolbar_divider = std::make_unique<views::View>();
} }
std::unique_ptr<media_router::CastToolbarButton> cast; std::unique_ptr<media_router::CastToolbarButton> cast;
@ -1087,7 +1087,7 @@ index 0ef2fcb160af2..010279ae8e5dc 100644
std::unique_ptr<MediaToolbarButtonView> media_button; std::unique_ptr<MediaToolbarButtonView> media_button;
if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) { if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) {
@@ -376,7 +394,8 @@ void ToolbarView::Init() { @@ -378,7 +396,8 @@ void ToolbarView::Init() {
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView> std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
send_tab_to_self_button; send_tab_to_self_button;
@ -1097,7 +1097,7 @@ index 0ef2fcb160af2..010279ae8e5dc 100644
send_tab_to_self_button = send_tab_to_self_button =
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>( std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
browser_view_); browser_view_);
@@ -810,7 +829,8 @@ void ToolbarView::Layout(PassKey) { @@ -812,7 +831,8 @@ void ToolbarView::Layout(PassKey) {
if (display_mode_ == DisplayMode::NORMAL) { if (display_mode_ == DisplayMode::NORMAL) {
LayoutCommon(); LayoutCommon();

6
patch/patches/message_pump_mac_2495.patch
View File

@ -1,8 +1,8 @@
diff --git base/message_loop/message_pump_apple.mm base/message_loop/message_pump_apple.mm diff --git base/message_loop/message_pump_apple.mm base/message_loop/message_pump_apple.mm
index e7fe3f71d8710..3a145fc9282ee 100644 index 987a3ed711f33..95e058b0b8bbd 100644
--- base/message_loop/message_pump_apple.mm --- base/message_loop/message_pump_apple.mm
+++ base/message_loop/message_pump_apple.mm +++ base/message_loop/message_pump_apple.mm
@@ -761,7 +761,8 @@ void MessagePumpUIApplication::Detach() { @@ -762,7 +762,8 @@ void MessagePumpUIApplication::Detach() {
#else #else
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@ -12,7 +12,7 @@ index e7fe3f71d8710..3a145fc9282ee 100644
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask()); DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
// Pumping events in private runloop modes is known to interact badly with // Pumping events in private runloop modes is known to interact badly with
// app modal windows like NSAlert. // app modal windows like NSAlert.
@@ -772,7 +773,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { @@ -773,7 +774,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
} }
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() { ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {

4
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 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 07de8257e5952..02fa4b4813566 100644 index 92ea6fb1bccff..3428f597dedcc 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
@ -35,7 +35,7 @@ index 07de8257e5952..02fa4b4813566 100644
} }
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
@@ -2366,6 +2370,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { @@ -2367,6 +2371,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor() window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor()
: SK_ColorWHITE); : SK_ColorWHITE);
UpdateFrameSinkIdRegistration(); UpdateFrameSinkIdRegistration();

16
patch/patches/views_widget.patch
View File

@ -61,10 +61,10 @@ index 791fc1874851e..db58beed440f8 100644
case ui::SHOW_STATE_MAXIMIZED: case ui::SHOW_STATE_MAXIMIZED:
return kSerializedShowStateMaximized; return kSerializedShowStateMaximized;
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index ae1a7849dab02..89db94663ad59 100644 index 63cd2577218a5..86c5e7ebbe226 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc --- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -708,6 +708,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const { @@ -709,6 +709,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
return scale_override_for_capture_; return scale_override_for_capture_;
} }
@ -80,7 +80,7 @@ index ae1a7849dab02..89db94663ad59 100644
if (!GetMouseWheelPhaseHandler()) if (!GetMouseWheelPhaseHandler())
return; return;
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 41308c925e5e3..bd958ba6acaa8 100644 index f1e4add662295..d2b84d0f6b19f 100644
--- content/browser/renderer_host/render_widget_host_view_base.h --- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -76,6 +76,7 @@ namespace content { @@ -76,6 +76,7 @@ namespace content {
@ -91,7 +91,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
class ScopedViewTransitionResources; class ScopedViewTransitionResources;
class TextInputManager; class TextInputManager;
class TouchSelectionControllerClientManager; class TouchSelectionControllerClientManager;
@@ -203,6 +204,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -204,6 +205,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
float GetDeviceScaleFactor() const final; float GetDeviceScaleFactor() const final;
bool IsPointerLocked() override; bool IsPointerLocked() override;
@ -101,7 +101,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Identical to `CopyFromSurface()`, except that this method issues the // Identical to `CopyFromSurface()`, except that this method issues the
// `viz::CopyOutputRequest` against the exact `viz::Surface` currently // `viz::CopyOutputRequest` against the exact `viz::Surface` currently
// embedded by this View, while `CopyFromSurface()` may return a copy of any // embedded by this View, while `CopyFromSurface()` may return a copy of any
@@ -264,6 +268,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -265,6 +269,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// Called when screen information or native widget bounds change. // Called when screen information or native widget bounds change.
virtual void UpdateScreenInfo(); virtual void UpdateScreenInfo();
@ -112,7 +112,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Called by the TextInputManager to notify the view about being removed from // Called by the TextInputManager to notify the view about being removed from
// the list of registered views, i.e., TextInputManager is no longer tracking // the list of registered views, i.e., TextInputManager is no longer tracking
// TextInputState from this view. The RWHV should reset |text_input_manager_| // TextInputState from this view. The RWHV should reset |text_input_manager_|
@@ -388,6 +396,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -389,6 +397,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
const gfx::Rect& bounds, const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0; const gfx::Rect& anchor_rect) = 0;
@ -125,7 +125,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Indicates whether the page has finished loading. // Indicates whether the page has finished loading.
virtual void SetIsLoading(bool is_loading) = 0; virtual void SetIsLoading(bool is_loading) = 0;
@@ -648,6 +662,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -649,6 +663,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// to all displays. // to all displays.
gfx::Size system_cursor_size_; gfx::Size system_cursor_size_;
@ -136,7 +136,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
private: private:
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest, BrowserSideFlingBrowserTest,
@@ -669,10 +687,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -670,10 +688,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void SynchronizeVisualProperties(); void SynchronizeVisualProperties();

2
patch/patches/viz_osr_2575.patch
View File

@ -150,7 +150,7 @@ index 796ae2688436e..37a3406790210 100644
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this); TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
index b9ad5c8cbeb5b..05ab69062b3b2 100644 index 2ea7347d2abe0..ab412fabe399b 100644
--- content/browser/compositor/viz_process_transport_factory.cc --- content/browser/compositor/viz_process_transport_factory.cc
+++ content/browser/compositor/viz_process_transport_factory.cc +++ content/browser/compositor/viz_process_transport_factory.cc
@@ -390,8 +390,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( @@ -390,8 +390,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(