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

Update to Chromium version 105.0.5195.0 (#1027018)

Browse Source
This commit is contained in:
Marshall Greenblatt 2022-07-25 13:49:32 -04:00
parent e9f29ab3d6
commit 9af494d36c
72 changed files with 811 additions and 686 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/105.0.5176.0' 'chromium_checkout': 'refs/tags/105.0.5195.0'
} }

59
include/capi/cef_menu_model_capi.h
View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=9f30f2caa9eedc0d4fe963dbf0127602ffcbec61$ // $hash=77ac3e0cda15dd166c24e3f94671d1f9c9776142$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
@ -72,7 +72,7 @@ typedef struct _cef_menu_model_t {
/// ///
// Returns the number of items in this menu. // Returns the number of items in this menu.
/// ///
int(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self); size_t(CEF_CALLBACK* get_count)(struct _cef_menu_model_t* self);
/// ///
// Add a separator to the menu. Returns true (1) on success. // Add a separator to the menu. Returns true (1) on success.
@ -115,14 +115,14 @@ typedef struct _cef_menu_model_t {
// on success. // on success.
/// ///
int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_separator_at)(struct _cef_menu_model_t* self,
int index); size_t index);
/// ///
// Insert an item in the menu at the specified |index|. Returns true (1) on // Insert an item in the menu at the specified |index|. Returns true (1) on
// success. // success.
/// ///
int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_item_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
@ -131,7 +131,7 @@ typedef struct _cef_menu_model_t {
// on success. // on success.
/// ///
int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_check_item_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
@ -141,7 +141,7 @@ typedef struct _cef_menu_model_t {
// (1) on success. // (1) on success.
/// ///
int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* insert_radio_item_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label, const cef_string_t* label,
int group_id); int group_id);
@ -152,7 +152,7 @@ typedef struct _cef_menu_model_t {
/// ///
struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)( struct _cef_menu_model_t*(CEF_CALLBACK* insert_sub_menu_at)(
struct _cef_menu_model_t* self, struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label); const cef_string_t* label);
@ -165,7 +165,7 @@ typedef struct _cef_menu_model_t {
/// ///
// Removes the item at the specified |index|. Returns true (1) on success. // Removes the item at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, int index); int(CEF_CALLBACK* remove_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Returns the index associated with the specified |command_id| or -1 if not // Returns the index associated with the specified |command_id| or -1 if not
@ -179,13 +179,13 @@ typedef struct _cef_menu_model_t {
// invalid range or the index being a separator. // invalid range or the index being a separator.
/// ///
int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_command_id_at)(struct _cef_menu_model_t* self,
int index); size_t index);
/// ///
// Sets the command id at the specified |index|. Returns true (1) on success. // Sets the command id at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_command_id_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id); int command_id);
/// ///
@ -201,7 +201,7 @@ typedef struct _cef_menu_model_t {
/// ///
// The resulting string must be freed by calling cef_string_userfree_free(). // The resulting string must be freed by calling cef_string_userfree_free().
cef_string_userfree_t( cef_string_userfree_t(
CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, int index); CEF_CALLBACK* get_label_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Sets the label for the specified |command_id|. Returns true (1) on success. // Sets the label for the specified |command_id|. Returns true (1) on success.
@ -214,7 +214,7 @@ typedef struct _cef_menu_model_t {
// Set the label at the specified |index|. Returns true (1) on success. // Set the label at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_label_at)(struct _cef_menu_model_t* self,
int index, size_t index,
const cef_string_t* label); const cef_string_t* label);
/// ///
@ -227,7 +227,7 @@ typedef struct _cef_menu_model_t {
// Returns the item type at the specified |index|. // Returns the item type at the specified |index|.
/// ///
cef_menu_item_type_t( cef_menu_item_type_t(
CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, int index); CEF_CALLBACK* get_type_at)(struct _cef_menu_model_t* self, size_t index);
/// ///
// Returns the group id for the specified |command_id| or -1 if invalid. // Returns the group id for the specified |command_id| or -1 if invalid.
@ -238,7 +238,8 @@ typedef struct _cef_menu_model_t {
/// ///
// Returns the group id at the specified |index| or -1 if invalid. // Returns the group id at the specified |index| or -1 if invalid.
/// ///
int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self, int index); int(CEF_CALLBACK* get_group_id_at)(struct _cef_menu_model_t* self,
size_t index);
/// ///
// Sets the group id for the specified |command_id|. Returns true (1) on // Sets the group id for the specified |command_id|. Returns true (1) on
@ -252,7 +253,7 @@ typedef struct _cef_menu_model_t {
// Sets the group id at the specified |index|. Returns true (1) on success. // Sets the group id at the specified |index|. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_group_id_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int group_id); int group_id);
/// ///
@ -265,8 +266,9 @@ typedef struct _cef_menu_model_t {
/// ///
// Returns the submenu at the specified |index| or NULL if invalid. // Returns the submenu at the specified |index| or NULL if invalid.
/// ///
struct _cef_menu_model_t*( struct _cef_menu_model_t*(CEF_CALLBACK* get_sub_menu_at)(
CEF_CALLBACK* get_sub_menu_at)(struct _cef_menu_model_t* self, int index); struct _cef_menu_model_t* self,
size_t index);
/// ///
// Returns true (1) if the specified |command_id| is visible. // Returns true (1) if the specified |command_id| is visible.
@ -276,7 +278,8 @@ typedef struct _cef_menu_model_t {
/// ///
// Returns true (1) if the specified |index| is visible. // Returns true (1) if the specified |index| is visible.
/// ///
int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self, int index); int(CEF_CALLBACK* is_visible_at)(struct _cef_menu_model_t* self,
size_t index);
/// ///
// Change the visibility of the specified |command_id|. Returns true (1) on // Change the visibility of the specified |command_id|. Returns true (1) on
@ -291,7 +294,7 @@ typedef struct _cef_menu_model_t {
// success. // success.
/// ///
int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_visible_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int visible); int visible);
/// ///
@ -302,7 +305,8 @@ typedef struct _cef_menu_model_t {
/// ///
// Returns true (1) if the specified |index| is enabled. // Returns true (1) if the specified |index| is enabled.
/// ///
int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self, int index); int(CEF_CALLBACK* is_enabled_at)(struct _cef_menu_model_t* self,
size_t index);
/// ///
// Change the enabled status of the specified |command_id|. Returns true (1) // Change the enabled status of the specified |command_id|. Returns true (1)
@ -317,7 +321,7 @@ typedef struct _cef_menu_model_t {
// success. // success.
/// ///
int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_enabled_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int enabled); int enabled);
/// ///
@ -330,7 +334,8 @@ typedef struct _cef_menu_model_t {
// Returns true (1) if the specified |index| is checked. Only applies to check // Returns true (1) if the specified |index| is checked. Only applies to check
// and radio items. // and radio items.
/// ///
int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self, int index); int(CEF_CALLBACK* is_checked_at)(struct _cef_menu_model_t* self,
size_t index);
/// ///
// Check the specified |command_id|. Only applies to check and radio items. // Check the specified |command_id|. Only applies to check and radio items.
@ -345,7 +350,7 @@ typedef struct _cef_menu_model_t {
// true (1) on success. // true (1) on success.
/// ///
int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_checked_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int checked); int checked);
/// ///
@ -360,7 +365,7 @@ typedef struct _cef_menu_model_t {
// assigned. // assigned.
/// ///
int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* has_accelerator_at)(struct _cef_menu_model_t* self,
int index); size_t index);
/// ///
// Set the keyboard accelerator for the specified |command_id|. |key_code| can // Set the keyboard accelerator for the specified |command_id|. |key_code| can
@ -378,7 +383,7 @@ typedef struct _cef_menu_model_t {
// any virtual key or character value. Returns true (1) on success. // any virtual key or character value. Returns true (1) on success.
/// ///
int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* set_accelerator_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int key_code, int key_code,
int shift_pressed, int shift_pressed,
int ctrl_pressed, int ctrl_pressed,
@ -396,7 +401,7 @@ typedef struct _cef_menu_model_t {
// on success. // on success.
/// ///
int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* remove_accelerator_at)(struct _cef_menu_model_t* self,
int index); size_t index);
/// ///
// Retrieves the keyboard accelerator for the specified |command_id|. Returns // Retrieves the keyboard accelerator for the specified |command_id|. Returns
@ -414,7 +419,7 @@ typedef struct _cef_menu_model_t {
// (1) on success. // (1) on success.
/// ///
int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self, int(CEF_CALLBACK* get_accelerator_at)(struct _cef_menu_model_t* self,
int index, size_t index,
int* key_code, int* key_code,
int* shift_pressed, int* shift_pressed,
int* ctrl_pressed, int* ctrl_pressed,

8
include/cef_api_hash.h
View File

@ -42,13 +42,13 @@
// way that may cause binary incompatibility with other builds. The universal // way that may cause binary incompatibility with other builds. The universal
// hash value will change if any platform is affected whereas the platform hash // hash value will change if any platform is affected whereas the platform hash
// values will change only if that particular platform is affected. // values will change only if that particular platform is affected.
#define CEF_API_HASH_UNIVERSAL "f8cca8b07034c67a6302e505c230ffe0f050fd78" #define CEF_API_HASH_UNIVERSAL "0a10c7f55cfae29a42269f384be6cf146b173e41"
#if defined(OS_WIN) #if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "315cda8357a855c2db9c5cdfce405b5e575fa667" #define CEF_API_HASH_PLATFORM "e867a338bca4b75fefaf7a8f9db88b23d3491521"
#elif defined(OS_MAC) #elif defined(OS_MAC)
#define CEF_API_HASH_PLATFORM "3d59ba798ad73de75680f7b3487a2f8061a1650b" #define CEF_API_HASH_PLATFORM "44255a9eaf170ae120ee53a45a98fe89aadee9b6"
#elif defined(OS_LINUX) #elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "fac4720a6d4e5a3550e421aaf043d46ab15dfa85" #define CEF_API_HASH_PLATFORM "38388c135e2f855789db0e073bfb63093a0507ac"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

50
include/cef_menu_model.h
View File

@ -75,7 +75,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns the number of items in this menu. // Returns the number of items in this menu.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual int GetCount() = 0; virtual size_t GetCount() = 0;
/// ///
// Add a separator to the menu. Returns true on success. // Add a separator to the menu. Returns true on success.
@ -115,14 +115,14 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// success. // success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool InsertSeparatorAt(int index) = 0; virtual bool InsertSeparatorAt(size_t index) = 0;
/// ///
// Insert an item in the menu at the specified |index|. Returns true on // Insert an item in the menu at the specified |index|. Returns true on
// success. // success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool InsertItemAt(int index, virtual bool InsertItemAt(size_t index,
int command_id, int command_id,
const CefString& label) = 0; const CefString& label) = 0;
@ -131,7 +131,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// success. // success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool InsertCheckItemAt(int index, virtual bool InsertCheckItemAt(size_t index,
int command_id, int command_id,
const CefString& label) = 0; const CefString& label) = 0;
@ -141,7 +141,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// on success. // on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool InsertRadioItemAt(int index, virtual bool InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) = 0; int group_id) = 0;
@ -151,7 +151,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// is returned. // is returned.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual CefRefPtr<CefMenuModel> InsertSubMenuAt(int index, virtual CefRefPtr<CefMenuModel> InsertSubMenuAt(size_t index,
int command_id, int command_id,
const CefString& label) = 0; const CefString& label) = 0;
@ -165,7 +165,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Removes the item at the specified |index|. Returns true on success. // Removes the item at the specified |index|. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool RemoveAt(int index) = 0; virtual bool RemoveAt(size_t index) = 0;
/// ///
// Returns the index associated with the specified |command_id| or -1 if not // Returns the index associated with the specified |command_id| or -1 if not
@ -179,13 +179,13 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// invalid range or the index being a separator. // invalid range or the index being a separator.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual int GetCommandIdAt(int index) = 0; virtual int GetCommandIdAt(size_t index) = 0;
/// ///
// Sets the command id at the specified |index|. Returns true on success. // Sets the command id at the specified |index|. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetCommandIdAt(int index, int command_id) = 0; virtual bool SetCommandIdAt(size_t index, int command_id) = 0;
/// ///
// Returns the label for the specified |command_id| or empty if not found. // Returns the label for the specified |command_id| or empty if not found.
@ -198,7 +198,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// invalid range or the index being a separator. // invalid range or the index being a separator.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual CefString GetLabelAt(int index) = 0; virtual CefString GetLabelAt(size_t index) = 0;
/// ///
// Sets the label for the specified |command_id|. Returns true on success. // Sets the label for the specified |command_id|. Returns true on success.
@ -210,7 +210,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Set the label at the specified |index|. Returns true on success. // Set the label at the specified |index|. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetLabelAt(int index, const CefString& label) = 0; virtual bool SetLabelAt(size_t index, const CefString& label) = 0;
/// ///
// Returns the item type for the specified |command_id|. // Returns the item type for the specified |command_id|.
@ -222,7 +222,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns the item type at the specified |index|. // Returns the item type at the specified |index|.
/// ///
/*--cef(default_retval=MENUITEMTYPE_NONE)--*/ /*--cef(default_retval=MENUITEMTYPE_NONE)--*/
virtual MenuItemType GetTypeAt(int index) = 0; virtual MenuItemType GetTypeAt(size_t index) = 0;
/// ///
// Returns the group id for the specified |command_id| or -1 if invalid. // Returns the group id for the specified |command_id| or -1 if invalid.
@ -234,7 +234,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns the group id at the specified |index| or -1 if invalid. // Returns the group id at the specified |index| or -1 if invalid.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual int GetGroupIdAt(int index) = 0; virtual int GetGroupIdAt(size_t index) = 0;
/// ///
// Sets the group id for the specified |command_id|. Returns true on success. // Sets the group id for the specified |command_id|. Returns true on success.
@ -246,7 +246,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Sets the group id at the specified |index|. Returns true on success. // Sets the group id at the specified |index|. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetGroupIdAt(int index, int group_id) = 0; virtual bool SetGroupIdAt(size_t index, int group_id) = 0;
/// ///
// Returns the submenu for the specified |command_id| or empty if invalid. // Returns the submenu for the specified |command_id| or empty if invalid.
@ -258,7 +258,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns the submenu at the specified |index| or empty if invalid. // Returns the submenu at the specified |index| or empty if invalid.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual CefRefPtr<CefMenuModel> GetSubMenuAt(int index) = 0; virtual CefRefPtr<CefMenuModel> GetSubMenuAt(size_t index) = 0;
/// ///
// Returns true if the specified |command_id| is visible. // Returns true if the specified |command_id| is visible.
@ -270,7 +270,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns true if the specified |index| is visible. // Returns true if the specified |index| is visible.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool IsVisibleAt(int index) = 0; virtual bool IsVisibleAt(size_t index) = 0;
/// ///
// Change the visibility of the specified |command_id|. Returns true on // Change the visibility of the specified |command_id|. Returns true on
@ -283,7 +283,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Change the visibility at the specified |index|. Returns true on success. // Change the visibility at the specified |index|. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetVisibleAt(int index, bool visible) = 0; virtual bool SetVisibleAt(size_t index, bool visible) = 0;
/// ///
// Returns true if the specified |command_id| is enabled. // Returns true if the specified |command_id| is enabled.
@ -295,7 +295,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns true if the specified |index| is enabled. // Returns true if the specified |index| is enabled.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool IsEnabledAt(int index) = 0; virtual bool IsEnabledAt(size_t index) = 0;
/// ///
// Change the enabled status of the specified |command_id|. Returns true on // Change the enabled status of the specified |command_id|. Returns true on
@ -309,7 +309,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// success. // success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetEnabledAt(int index, bool enabled) = 0; virtual bool SetEnabledAt(size_t index, bool enabled) = 0;
/// ///
// Returns true if the specified |command_id| is checked. Only applies to // Returns true if the specified |command_id| is checked. Only applies to
@ -323,7 +323,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// and radio items. // and radio items.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool IsCheckedAt(int index) = 0; virtual bool IsCheckedAt(size_t index) = 0;
/// ///
// Check the specified |command_id|. Only applies to check and radio items. // Check the specified |command_id|. Only applies to check and radio items.
@ -337,7 +337,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// true on success. // true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetCheckedAt(int index, bool checked) = 0; virtual bool SetCheckedAt(size_t index, bool checked) = 0;
/// ///
// Returns true if the specified |command_id| has a keyboard accelerator // Returns true if the specified |command_id| has a keyboard accelerator
@ -350,7 +350,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// Returns true if the specified |index| has a keyboard accelerator assigned. // Returns true if the specified |index| has a keyboard accelerator assigned.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool HasAcceleratorAt(int index) = 0; virtual bool HasAcceleratorAt(size_t index) = 0;
/// ///
// Set the keyboard accelerator for the specified |command_id|. |key_code| can // Set the keyboard accelerator for the specified |command_id|. |key_code| can
@ -368,7 +368,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// any virtual key or character value. Returns true on success. // any virtual key or character value. Returns true on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool SetAcceleratorAt(int index, virtual bool SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
@ -386,7 +386,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// success. // success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool RemoveAcceleratorAt(int index) = 0; virtual bool RemoveAcceleratorAt(size_t index) = 0;
/// ///
// Retrieves the keyboard accelerator for the specified |command_id|. Returns // Retrieves the keyboard accelerator for the specified |command_id|. Returns
@ -404,7 +404,7 @@ class CefMenuModel : public virtual CefBaseRefCounted {
// on success. // on success.
/// ///
/*--cef()--*/ /*--cef()--*/
virtual bool GetAcceleratorAt(int index, virtual bool GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,

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

@ -87,12 +87,11 @@
#include "libcef/browser/printing/print_dialog_linux.h" #include "libcef/browser/printing/print_dialog_linux.h"
#include "ui/base/cursor/cursor_factory.h" #include "ui/base/cursor/cursor_factory.h"
#include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method.h"
#include "ui/base/ime/linux/fake_input_method_context_factory.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/base/linux/linux_ui_delegate.h" #include "ui/linux/linux_ui.h"
#include "ui/linux/linux_ui_delegate.h"
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/ozone_platform.h"
#include "ui/views/linux_ui/linux_ui.h"
#include "ui/views/linux_ui/linux_ui_factory.h"
#endif // BUILDFLAG(IS_LINUX) #endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM) #if BUILDFLAG(ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM)
@ -107,7 +106,7 @@ namespace {
#if BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX)
std::unique_ptr<views::LinuxUI> BuildLinuxUI() { std::unique_ptr<ui::LinuxUi> BuildLinuxUI() {
// We can't use GtkUi in combination with multi-threaded-message-loop because // We can't use GtkUi in combination with multi-threaded-message-loop because
// Chromium's GTK implementation doesn't use GDK threads. // Chromium's GTK implementation doesn't use GDK threads.
if (!!CefContext::Get()->settings().multi_threaded_message_loop) if (!!CefContext::Get()->settings().multi_threaded_message_loop)
@ -118,7 +117,7 @@ std::unique_ptr<views::LinuxUI> BuildLinuxUI() {
if (!ui::LinuxUiDelegate::GetInstance()) if (!ui::LinuxUiDelegate::GetInstance())
return nullptr; return nullptr;
return CreateLinuxUi(); return ui::CreateLinuxUi();
} }
// Based on chrome_browser_main_extra_parts_views_linux.cc // Based on chrome_browser_main_extra_parts_views_linux.cc
@ -132,25 +131,11 @@ void ToolkitInitializedLinux() {
GetThemeProfileForWindow(window)); GetThemeProfileForWindow(window));
})); }));
views::LinuxUI::SetInstance(std::move(linux_ui)); ui::LinuxUi::SetInstance(std::move(linux_ui));
// Cursor theme changes are tracked by LinuxUI (via a CursorThemeManager // Cursor theme changes are tracked by LinuxUI (via a CursorThemeManager
// implementation). Start observing them once it's initialized. // implementation). Start observing them once it's initialized.
ui::CursorFactory::GetInstance()->ObserveThemeChanges(); ui::CursorFactory::GetInstance()->ObserveThemeChanges();
} else {
// In case if the toolkit is not used, input method factory won't be set for
// X11 and Ozone/X11. Set a fake one instead to avoid crashing browser
// later.
DCHECK(!ui::LinuxInputMethodContextFactory::instance());
// Try to create input method through Ozone so that the backend has a chance
// to set factory by itself.
ui::OzonePlatform::GetInstance()->CreateInputMethod(
nullptr, gfx::kNullAcceleratedWidget);
}
// If factory is not set, set a fake instance.
if (!ui::LinuxInputMethodContextFactory::instance()) {
ui::LinuxInputMethodContextFactory::SetInstance(
new ui::FakeInputMethodContextFactory());
} }
auto printing_delegate = new CefPrintingContextLinuxDelegate(); auto printing_delegate = new CefPrintingContextLinuxDelegate();

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

@ -1502,16 +1502,6 @@ bool AlloyContentBrowserClient::ArePersistentMediaDeviceIDsAllowed(
->IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin); ->IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin);
} }
bool AlloyContentBrowserClient::ShouldAllowPluginCreation(
const url::Origin& embedder_origin,
const content::PepperPluginInfo& plugin_info) {
if (plugin_info.name == ChromeContentClient::kPDFInternalPluginName) {
return IsPdfInternalPluginAllowedOrigin(embedder_origin);
}
return true;
}
void AlloyContentBrowserClient::OnWebContentsCreated( void AlloyContentBrowserClient::OnWebContentsCreated(
content::WebContents* web_contents) { content::WebContents* web_contents) {
// Attach universal WebContentsObservers. These are quite rare, and in most // Attach universal WebContentsObservers. These are quite rare, and in most

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

@ -245,9 +245,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
const GURL& scope, const GURL& scope,
const net::SiteForCookies& site_for_cookies, const net::SiteForCookies& site_for_cookies,
const absl::optional<url::Origin>& top_frame_origin) override; const absl::optional<url::Origin>& top_frame_origin) override;
bool ShouldAllowPluginCreation(
const url::Origin& embedder_origin,
const content::PepperPluginInfo& plugin_info) override;
void OnWebContentsCreated(content::WebContents* web_contents) override; void OnWebContentsCreated(content::WebContents* web_contents) override;
bool IsFindInPageDisabledForOrigin(const url::Origin& origin) override; bool IsFindInPageDisabledForOrigin(const url::Origin& origin) override;

151
libcef/browser/menu_model_impl.cc
View File

@ -39,9 +39,9 @@ class CefSimpleMenuModel : public ui::MenuModel {
// MenuModel methods. // MenuModel methods.
bool HasIcons() const override { return false; } bool HasIcons() const override { return false; }
int GetItemCount() const override { return impl_->GetCount(); } size_t GetItemCount() const override { return impl_->GetCount(); }
ItemType GetTypeAt(int index) const override { ItemType GetTypeAt(size_t index) const override {
switch (impl_->GetTypeAt(index)) { switch (impl_->GetTypeAt(index)) {
case MENUITEMTYPE_COMMAND: case MENUITEMTYPE_COMMAND:
return TYPE_COMMAND; return TYPE_COMMAND;
@ -59,25 +59,25 @@ class CefSimpleMenuModel : public ui::MenuModel {
} }
} }
ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override { ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override {
return ui::NORMAL_SEPARATOR; return ui::NORMAL_SEPARATOR;
} }
int GetCommandIdAt(int index) const override { int GetCommandIdAt(size_t index) const override {
return impl_->GetCommandIdAt(index); return impl_->GetCommandIdAt(index);
} }
std::u16string GetLabelAt(int index) const override { std::u16string GetLabelAt(size_t index) const override {
return impl_->GetFormattedLabelAt(index); return impl_->GetFormattedLabelAt(index);
} }
bool IsItemDynamicAt(int index) const override { return false; } bool IsItemDynamicAt(size_t index) const override { return false; }
const gfx::FontList* GetLabelFontListAt(int index) const override { const gfx::FontList* GetLabelFontListAt(size_t index) const override {
return impl_->GetLabelFontListAt(index); return impl_->GetLabelFontListAt(index);
} }
bool GetAcceleratorAt(int index, bool GetAcceleratorAt(size_t index,
ui::Accelerator* accelerator) const override { ui::Accelerator* accelerator) const override {
int key_code = 0; int key_code = 0;
bool shift_pressed = false; bool shift_pressed = false;
@ -100,37 +100,37 @@ class CefSimpleMenuModel : public ui::MenuModel {
return false; return false;
} }
bool IsItemCheckedAt(int index) const override { bool IsItemCheckedAt(size_t index) const override {
return impl_->IsCheckedAt(index); return impl_->IsCheckedAt(index);
} }
int GetGroupIdAt(int index) const override { int GetGroupIdAt(size_t index) const override {
return impl_->GetGroupIdAt(index); return impl_->GetGroupIdAt(index);
} }
ui::ImageModel GetIconAt(int index) const override { ui::ImageModel GetIconAt(size_t index) const override {
return ui::ImageModel(); return ui::ImageModel();
} }
ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const override { ui::ButtonMenuItemModel* GetButtonMenuItemAt(size_t index) const override {
return nullptr; return nullptr;
} }
bool IsEnabledAt(int index) const override { bool IsEnabledAt(size_t index) const override {
return impl_->IsEnabledAt(index); return impl_->IsEnabledAt(index);
} }
bool IsVisibleAt(int index) const override { bool IsVisibleAt(size_t index) const override {
return impl_->IsVisibleAt(index); return impl_->IsVisibleAt(index);
} }
void ActivatedAt(int index) override { ActivatedAt(index, 0); } void ActivatedAt(size_t index) override { ActivatedAt(index, 0); }
void ActivatedAt(int index, int event_flags) override { void ActivatedAt(size_t index, int event_flags) override {
impl_->ActivatedAt(index, static_cast<cef_event_flags_t>(event_flags)); impl_->ActivatedAt(index, static_cast<cef_event_flags_t>(event_flags));
} }
MenuModel* GetSubmenuModelAt(int index) const override { MenuModel* GetSubmenuModelAt(size_t index) const override {
CefRefPtr<CefMenuModel> submenu = impl_->GetSubMenuAt(index); CefRefPtr<CefMenuModel> submenu = impl_->GetSubMenuAt(index);
if (submenu.get()) if (submenu.get())
return static_cast<CefMenuModelImpl*>(submenu.get())->model(); return static_cast<CefMenuModelImpl*>(submenu.get())->model();
@ -149,14 +149,14 @@ class CefSimpleMenuModel : public ui::MenuModel {
impl_->UnhandledCloseSubmenu(is_rtl); impl_->UnhandledCloseSubmenu(is_rtl);
} }
bool GetTextColor(int index, bool GetTextColor(size_t index,
bool is_minor, bool is_minor,
bool is_hovered, bool is_hovered,
SkColor* override_color) const override { SkColor* override_color) const override {
return impl_->GetTextColor(index, is_minor, is_hovered, override_color); return impl_->GetTextColor(index, is_minor, is_hovered, override_color);
} }
bool GetBackgroundColor(int index, bool GetBackgroundColor(size_t index,
bool is_hovered, bool is_hovered,
SkColor* override_color) const override { SkColor* override_color) const override {
return impl_->GetBackgroundColor(index, is_hovered, override_color); return impl_->GetBackgroundColor(index, is_hovered, override_color);
@ -263,11 +263,11 @@ bool CefMenuModelImpl::Clear() {
return true; return true;
} }
int CefMenuModelImpl::GetCount() { size_t CefMenuModelImpl::GetCount() {
if (!VerifyContext()) if (!VerifyContext())
return 0; return 0;
return static_cast<int>(items_.size()); return items_.size();
} }
bool CefMenuModelImpl::AddSeparator() { bool CefMenuModelImpl::AddSeparator() {
@ -316,7 +316,7 @@ CefRefPtr<CefMenuModel> CefMenuModelImpl::AddSubMenu(int command_id,
return item.submenu_.get(); return item.submenu_.get();
} }
bool CefMenuModelImpl::InsertSeparatorAt(int index) { bool CefMenuModelImpl::InsertSeparatorAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
@ -326,7 +326,7 @@ bool CefMenuModelImpl::InsertSeparatorAt(int index) {
return true; return true;
} }
bool CefMenuModelImpl::InsertItemAt(int index, bool CefMenuModelImpl::InsertItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext()) if (!VerifyContext())
@ -337,7 +337,7 @@ bool CefMenuModelImpl::InsertItemAt(int index,
return true; return true;
} }
bool CefMenuModelImpl::InsertCheckItemAt(int index, bool CefMenuModelImpl::InsertCheckItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext()) if (!VerifyContext())
@ -348,7 +348,7 @@ bool CefMenuModelImpl::InsertCheckItemAt(int index,
return true; return true;
} }
bool CefMenuModelImpl::InsertRadioItemAt(int index, bool CefMenuModelImpl::InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) { int group_id) {
@ -360,7 +360,7 @@ bool CefMenuModelImpl::InsertRadioItemAt(int index,
} }
CefRefPtr<CefMenuModel> CefMenuModelImpl::InsertSubMenuAt( CefRefPtr<CefMenuModel> CefMenuModelImpl::InsertSubMenuAt(
int index, size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext()) if (!VerifyContext())
@ -376,11 +376,11 @@ bool CefMenuModelImpl::Remove(int command_id) {
return RemoveAt(GetIndexOf(command_id)); return RemoveAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::RemoveAt(int index) { bool CefMenuModelImpl::RemoveAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_.erase(items_.begin() + index); items_.erase(items_.begin() + index);
return true; return true;
} }
@ -399,20 +399,20 @@ int CefMenuModelImpl::GetIndexOf(int command_id) {
return kInvalidIndex; return kInvalidIndex;
} }
int CefMenuModelImpl::GetCommandIdAt(int index) { int CefMenuModelImpl::GetCommandIdAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return kInvalidCommandId; return kInvalidCommandId;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].command_id_; return items_[index].command_id_;
return kInvalidCommandId; return kInvalidCommandId;
} }
bool CefMenuModelImpl::SetCommandIdAt(int index, int command_id) { bool CefMenuModelImpl::SetCommandIdAt(size_t index, int command_id) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].command_id_ = command_id; items_[index].command_id_ = command_id;
return true; return true;
} }
@ -423,11 +423,11 @@ CefString CefMenuModelImpl::GetLabel(int command_id) {
return GetLabelAt(GetIndexOf(command_id)); return GetLabelAt(GetIndexOf(command_id));
} }
CefString CefMenuModelImpl::GetLabelAt(int index) { CefString CefMenuModelImpl::GetLabelAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return CefString(); return CefString();
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].label_; return items_[index].label_;
return CefString(); return CefString();
} }
@ -436,11 +436,11 @@ bool CefMenuModelImpl::SetLabel(int command_id, const CefString& label) {
return SetLabelAt(GetIndexOf(command_id), label); return SetLabelAt(GetIndexOf(command_id), label);
} }
bool CefMenuModelImpl::SetLabelAt(int index, const CefString& label) { bool CefMenuModelImpl::SetLabelAt(size_t index, const CefString& label) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].label_ = label; items_[index].label_ = label;
return true; return true;
} }
@ -451,11 +451,11 @@ CefMenuModelImpl::MenuItemType CefMenuModelImpl::GetType(int command_id) {
return GetTypeAt(GetIndexOf(command_id)); return GetTypeAt(GetIndexOf(command_id));
} }
CefMenuModelImpl::MenuItemType CefMenuModelImpl::GetTypeAt(int index) { CefMenuModelImpl::MenuItemType CefMenuModelImpl::GetTypeAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return MENUITEMTYPE_NONE; return MENUITEMTYPE_NONE;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].type_; return items_[index].type_;
return MENUITEMTYPE_NONE; return MENUITEMTYPE_NONE;
} }
@ -464,11 +464,11 @@ int CefMenuModelImpl::GetGroupId(int command_id) {
return GetGroupIdAt(GetIndexOf(command_id)); return GetGroupIdAt(GetIndexOf(command_id));
} }
int CefMenuModelImpl::GetGroupIdAt(int index) { int CefMenuModelImpl::GetGroupIdAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return kInvalidGroupId; return kInvalidGroupId;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].group_id_; return items_[index].group_id_;
return kInvalidGroupId; return kInvalidGroupId;
} }
@ -477,11 +477,11 @@ bool CefMenuModelImpl::SetGroupId(int command_id, int group_id) {
return SetGroupIdAt(GetIndexOf(command_id), group_id); return SetGroupIdAt(GetIndexOf(command_id), group_id);
} }
bool CefMenuModelImpl::SetGroupIdAt(int index, int group_id) { bool CefMenuModelImpl::SetGroupIdAt(size_t index, int group_id) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].group_id_ = group_id; items_[index].group_id_ = group_id;
return true; return true;
} }
@ -492,11 +492,11 @@ CefRefPtr<CefMenuModel> CefMenuModelImpl::GetSubMenu(int command_id) {
return GetSubMenuAt(GetIndexOf(command_id)); return GetSubMenuAt(GetIndexOf(command_id));
} }
CefRefPtr<CefMenuModel> CefMenuModelImpl::GetSubMenuAt(int index) { CefRefPtr<CefMenuModel> CefMenuModelImpl::GetSubMenuAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return nullptr; return nullptr;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].submenu_.get(); return items_[index].submenu_.get();
return nullptr; return nullptr;
} }
@ -505,11 +505,11 @@ bool CefMenuModelImpl::IsVisible(int command_id) {
return IsVisibleAt(GetIndexOf(command_id)); return IsVisibleAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::IsVisibleAt(int index) { bool CefMenuModelImpl::IsVisibleAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].visible_; return items_[index].visible_;
return false; return false;
} }
@ -518,11 +518,11 @@ bool CefMenuModelImpl::SetVisible(int command_id, bool visible) {
return SetVisibleAt(GetIndexOf(command_id), visible); return SetVisibleAt(GetIndexOf(command_id), visible);
} }
bool CefMenuModelImpl::SetVisibleAt(int index, bool visible) { bool CefMenuModelImpl::SetVisibleAt(size_t index, bool visible) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].visible_ = visible; items_[index].visible_ = visible;
return true; return true;
} }
@ -533,11 +533,11 @@ bool CefMenuModelImpl::IsEnabled(int command_id) {
return IsEnabledAt(GetIndexOf(command_id)); return IsEnabledAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::IsEnabledAt(int index) { bool CefMenuModelImpl::IsEnabledAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].enabled_; return items_[index].enabled_;
return false; return false;
} }
@ -546,11 +546,11 @@ bool CefMenuModelImpl::SetEnabled(int command_id, bool enabled) {
return SetEnabledAt(GetIndexOf(command_id), enabled); return SetEnabledAt(GetIndexOf(command_id), enabled);
} }
bool CefMenuModelImpl::SetEnabledAt(int index, bool enabled) { bool CefMenuModelImpl::SetEnabledAt(size_t index, bool enabled) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].enabled_ = enabled; items_[index].enabled_ = enabled;
return true; return true;
} }
@ -561,11 +561,11 @@ bool CefMenuModelImpl::IsChecked(int command_id) {
return IsCheckedAt(GetIndexOf(command_id)); return IsCheckedAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::IsCheckedAt(int index) { bool CefMenuModelImpl::IsCheckedAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].checked_; return items_[index].checked_;
return false; return false;
} }
@ -574,11 +574,11 @@ bool CefMenuModelImpl::SetChecked(int command_id, bool checked) {
return SetCheckedAt(GetIndexOf(command_id), checked); return SetCheckedAt(GetIndexOf(command_id), checked);
} }
bool CefMenuModelImpl::SetCheckedAt(int index, bool checked) { bool CefMenuModelImpl::SetCheckedAt(size_t index, bool checked) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
items_[index].checked_ = checked; items_[index].checked_ = checked;
return true; return true;
} }
@ -589,11 +589,11 @@ bool CefMenuModelImpl::HasAccelerator(int command_id) {
return HasAcceleratorAt(GetIndexOf(command_id)); return HasAcceleratorAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::HasAcceleratorAt(int index) { bool CefMenuModelImpl::HasAcceleratorAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) if (index < items_.size())
return items_[index].has_accelerator_; return items_[index].has_accelerator_;
return false; return false;
} }
@ -607,7 +607,7 @@ bool CefMenuModelImpl::SetAccelerator(int command_id,
ctrl_pressed, alt_pressed); ctrl_pressed, alt_pressed);
} }
bool CefMenuModelImpl::SetAcceleratorAt(int index, bool CefMenuModelImpl::SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
@ -615,7 +615,7 @@ bool CefMenuModelImpl::SetAcceleratorAt(int index,
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
Item& item = items_[index]; Item& item = items_[index];
item.has_accelerator_ = true; item.has_accelerator_ = true;
item.key_code_ = key_code; item.key_code_ = key_code;
@ -631,11 +631,11 @@ bool CefMenuModelImpl::RemoveAccelerator(int command_id) {
return RemoveAcceleratorAt(GetIndexOf(command_id)); return RemoveAcceleratorAt(GetIndexOf(command_id));
} }
bool CefMenuModelImpl::RemoveAcceleratorAt(int index) { bool CefMenuModelImpl::RemoveAcceleratorAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
Item& item = items_[index]; Item& item = items_[index];
if (item.has_accelerator_) { if (item.has_accelerator_) {
item.has_accelerator_ = false; item.has_accelerator_ = false;
@ -658,7 +658,7 @@ bool CefMenuModelImpl::GetAccelerator(int command_id,
ctrl_pressed, alt_pressed); ctrl_pressed, alt_pressed);
} }
bool CefMenuModelImpl::GetAcceleratorAt(int index, bool CefMenuModelImpl::GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
@ -666,7 +666,7 @@ bool CefMenuModelImpl::GetAcceleratorAt(int index,
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
const Item& item = items_[index]; const Item& item = items_[index];
if (item.has_accelerator_) { if (item.has_accelerator_) {
key_code = item.key_code_; key_code = item.key_code_;
@ -768,7 +768,8 @@ bool CefMenuModelImpl::SetFontListAt(int index, const CefString& font_list) {
return false; return false;
} }
void CefMenuModelImpl::ActivatedAt(int index, cef_event_flags_t event_flags) { void CefMenuModelImpl::ActivatedAt(size_t index,
cef_event_flags_t event_flags) {
if (!VerifyContext()) if (!VerifyContext())
return; return;
@ -812,11 +813,11 @@ void CefMenuModelImpl::UnhandledCloseSubmenu(bool is_rtl) {
base::BindOnce(&CefMenuModelImpl::OnUnhandledCloseSubmenu, this, is_rtl)); base::BindOnce(&CefMenuModelImpl::OnUnhandledCloseSubmenu, this, is_rtl));
} }
bool CefMenuModelImpl::GetTextColor(int index, bool CefMenuModelImpl::GetTextColor(size_t index,
bool is_accelerator, bool is_accelerator,
bool is_hovered, bool is_hovered,
SkColor* override_color) const { SkColor* override_color) const {
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
const Item& item = items_[index]; const Item& item = items_[index];
if (!item.enabled_) { if (!item.enabled_) {
// Use accelerator color for disabled item text. // Use accelerator color for disabled item text.
@ -841,13 +842,13 @@ bool CefMenuModelImpl::GetTextColor(int index,
return false; return false;
} }
bool CefMenuModelImpl::GetBackgroundColor(int index, bool CefMenuModelImpl::GetBackgroundColor(size_t index,
bool is_hovered, bool is_hovered,
SkColor* override_color) const { SkColor* override_color) const {
const cef_menu_color_type_t color_type = const cef_menu_color_type_t color_type =
GetMenuColorType(false, false, is_hovered); GetMenuColorType(false, false, is_hovered);
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
const Item& item = items_[index]; const Item& item = items_[index];
if (item.colors_[color_type] != 0) { if (item.colors_[color_type] != 0) {
*override_color = item.colors_[color_type]; *override_color = item.colors_[color_type];
@ -887,7 +888,7 @@ void CefMenuModelImpl::MenuWillClose() {
FROM_HERE, base::BindOnce(&CefMenuModelImpl::OnMenuClosed, this)); FROM_HERE, base::BindOnce(&CefMenuModelImpl::OnMenuClosed, this));
} }
std::u16string CefMenuModelImpl::GetFormattedLabelAt(int index) { std::u16string CefMenuModelImpl::GetFormattedLabelAt(size_t index) {
std::u16string label = GetLabelAt(index).ToString16(); std::u16string label = GetLabelAt(index).ToString16();
if (delegate_) if (delegate_)
delegate_->FormatLabel(this, label); delegate_->FormatLabel(this, label);
@ -899,8 +900,8 @@ std::u16string CefMenuModelImpl::GetFormattedLabelAt(int index) {
return label; return label;
} }
const gfx::FontList* CefMenuModelImpl::GetLabelFontListAt(int index) const { const gfx::FontList* CefMenuModelImpl::GetLabelFontListAt(size_t index) const {
if (index >= 0 && index < static_cast<int>(items_.size())) { if (index < items_.size()) {
const Item& item = items_[index]; const Item& item = items_[index];
if (item.has_font_list_) if (item.has_font_list_)
return &item.font_list_; return &item.font_list_;
@ -976,11 +977,9 @@ void CefMenuModelImpl::AppendItem(const Item& item) {
items_.push_back(item); items_.push_back(item);
} }
void CefMenuModelImpl::InsertItemAt(const Item& item, int index) { void CefMenuModelImpl::InsertItemAt(const Item& item, size_t index) {
// Sanitize the index. // Sanitize the index.
if (index < 0) if (index > items_.size())
index = 0;
else if (index > static_cast<int>(items_.size()))
index = items_.size(); index = items_.size();
ValidateItem(item); ValidateItem(item);

64
libcef/browser/menu_model_impl.h
View File

@ -67,7 +67,7 @@ class CefMenuModelImpl : public CefMenuModel {
// CefMenuModel methods. // CefMenuModel methods.
bool IsSubMenu() override; bool IsSubMenu() override;
bool Clear() override; bool Clear() override;
int GetCount() override; size_t GetCount() override;
bool AddSeparator() override; bool AddSeparator() override;
bool AddItem(int command_id, const CefString& label) override; bool AddItem(int command_id, const CefString& label) override;
bool AddCheckItem(int command_id, const CefString& label) override; bool AddCheckItem(int command_id, const CefString& label) override;
@ -76,67 +76,69 @@ class CefMenuModelImpl : public CefMenuModel {
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> AddSubMenu(int command_id, CefRefPtr<CefMenuModel> AddSubMenu(int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertSeparatorAt(int index) override; bool InsertSeparatorAt(size_t index) override;
bool InsertItemAt(int index, int command_id, const CefString& label) override; bool InsertItemAt(size_t index,
bool InsertCheckItemAt(int index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertRadioItemAt(int index, bool InsertCheckItemAt(size_t index,
int command_id,
const CefString& label) override;
bool InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> InsertSubMenuAt(int index, CefRefPtr<CefMenuModel> InsertSubMenuAt(size_t index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool Remove(int command_id) override; bool Remove(int command_id) override;
bool RemoveAt(int index) override; bool RemoveAt(size_t index) override;
int GetIndexOf(int command_id) override; int GetIndexOf(int command_id) override;
int GetCommandIdAt(int index) override; int GetCommandIdAt(size_t index) override;
bool SetCommandIdAt(int index, int command_id) override; bool SetCommandIdAt(size_t index, int command_id) override;
CefString GetLabel(int command_id) override; CefString GetLabel(int command_id) override;
CefString GetLabelAt(int index) override; CefString GetLabelAt(size_t index) override;
bool SetLabel(int command_id, const CefString& label) override; bool SetLabel(int command_id, const CefString& label) override;
bool SetLabelAt(int index, const CefString& label) override; bool SetLabelAt(size_t index, const CefString& label) override;
MenuItemType GetType(int command_id) override; MenuItemType GetType(int command_id) override;
MenuItemType GetTypeAt(int index) override; MenuItemType GetTypeAt(size_t index) override;
int GetGroupId(int command_id) override; int GetGroupId(int command_id) override;
int GetGroupIdAt(int index) override; int GetGroupIdAt(size_t index) override;
bool SetGroupId(int command_id, int group_id) override; bool SetGroupId(int command_id, int group_id) override;
bool SetGroupIdAt(int index, int group_id) override; bool SetGroupIdAt(size_t index, int group_id) override;
CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override; CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override;
CefRefPtr<CefMenuModel> GetSubMenuAt(int index) override; CefRefPtr<CefMenuModel> GetSubMenuAt(size_t index) override;
bool IsVisible(int command_id) override; bool IsVisible(int command_id) override;
bool IsVisibleAt(int index) override; bool IsVisibleAt(size_t index) override;
bool SetVisible(int command_id, bool visible) override; bool SetVisible(int command_id, bool visible) override;
bool SetVisibleAt(int index, bool visible) override; bool SetVisibleAt(size_t index, bool visible) override;
bool IsEnabled(int command_id) override; bool IsEnabled(int command_id) override;
bool IsEnabledAt(int index) override; bool IsEnabledAt(size_t index) override;
bool SetEnabled(int command_id, bool enabled) override; bool SetEnabled(int command_id, bool enabled) override;
bool SetEnabledAt(int index, bool enabled) override; bool SetEnabledAt(size_t index, bool enabled) override;
bool IsChecked(int command_id) override; bool IsChecked(int command_id) override;
bool IsCheckedAt(int index) override; bool IsCheckedAt(size_t index) override;
bool SetChecked(int command_id, bool checked) override; bool SetChecked(int command_id, bool checked) override;
bool SetCheckedAt(int index, bool checked) override; bool SetCheckedAt(size_t index, bool checked) override;
bool HasAccelerator(int command_id) override; bool HasAccelerator(int command_id) override;
bool HasAcceleratorAt(int index) override; bool HasAcceleratorAt(size_t index) override;
bool SetAccelerator(int command_id, bool SetAccelerator(int command_id,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool SetAcceleratorAt(int index, bool SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool RemoveAccelerator(int command_id) override; bool RemoveAccelerator(int command_id) override;
bool RemoveAcceleratorAt(int index) override; bool RemoveAcceleratorAt(size_t index) override;
bool GetAccelerator(int command_id, bool GetAccelerator(int command_id,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
bool& alt_pressed) override; bool& alt_pressed) override;
bool GetAcceleratorAt(int index, bool GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
@ -157,21 +159,21 @@ class CefMenuModelImpl : public CefMenuModel {
bool SetFontListAt(int index, const CefString& font_list) override; bool SetFontListAt(int index, const CefString& font_list) override;
// Callbacks from the ui::MenuModel implementation. // Callbacks from the ui::MenuModel implementation.
void ActivatedAt(int index, cef_event_flags_t event_flags); void ActivatedAt(size_t index, cef_event_flags_t event_flags);
void MouseOutsideMenu(const gfx::Point& screen_point); void MouseOutsideMenu(const gfx::Point& screen_point);
void UnhandledOpenSubmenu(bool is_rtl); void UnhandledOpenSubmenu(bool is_rtl);
void UnhandledCloseSubmenu(bool is_rtl); void UnhandledCloseSubmenu(bool is_rtl);
bool GetTextColor(int index, bool GetTextColor(size_t index,
bool is_accelerator, bool is_accelerator,
bool is_hovered, bool is_hovered,
SkColor* override_color) const; SkColor* override_color) const;
bool GetBackgroundColor(int index, bool GetBackgroundColor(size_t index,
bool is_hovered, bool is_hovered,
SkColor* override_color) const; SkColor* override_color) const;
void MenuWillShow(); void MenuWillShow();
void MenuWillClose(); void MenuWillClose();
std::u16string GetFormattedLabelAt(int index); std::u16string GetFormattedLabelAt(size_t index);
const gfx::FontList* GetLabelFontListAt(int index) const; const gfx::FontList* GetLabelFontListAt(size_t index) const;
// Verify that only a single reference exists to all CefMenuModelImpl objects. // Verify that only a single reference exists to all CefMenuModelImpl objects.
bool VerifyRefCount(); bool VerifyRefCount();
@ -197,7 +199,7 @@ class CefMenuModelImpl : public CefMenuModel {
// Functions for inserting items into |items_|. // Functions for inserting items into |items_|.
void AppendItem(const Item& item); void AppendItem(const Item& item);
void InsertItemAt(const Item& item, int index); void InsertItemAt(const Item& item, size_t index);
void ValidateItem(const Item& item); void ValidateItem(const Item& item);
// Notify the delegate asynchronously. // Notify the delegate asynchronously.

4
libcef/browser/native/cursor_util.cc
View File

@ -12,8 +12,8 @@
#include "ui/base/cursor/mojom/cursor_type.mojom.h" #include "ui/base/cursor/mojom/cursor_type.mojom.h"
#if defined(USE_AURA) #if defined(USE_AURA)
#include "ui/aura/cursor/cursor_loader.h"
#include "ui/display/display_util.h" #include "ui/display/display_util.h"
#include "ui/wm/core/cursor_loader.h"
#endif #endif
namespace cursor_util { namespace cursor_util {
@ -90,7 +90,7 @@ bool OnCursorChange(CefRefPtr<CefBrowser> browser,
bool handled = false; bool handled = false;
#if defined(USE_AURA) #if defined(USE_AURA)
aura::CursorLoader cursor_loader; wm::CursorLoader cursor_loader;
scoped_refptr<ui::PlatformCursor> platform_cursor; scoped_refptr<ui::PlatformCursor> platform_cursor;
CefCursorHandle native_cursor = kNullCursorHandle; CefCursorHandle native_cursor = kNullCursorHandle;

59
libcef/browser/simple_menu_model_impl.cc
View File

@ -89,7 +89,7 @@ bool CefSimpleMenuModelImpl::Clear() {
return true; return true;
} }
int CefSimpleMenuModelImpl::GetCount() { size_t CefSimpleMenuModelImpl::GetCount() {
if (!VerifyContext()) if (!VerifyContext())
return 0; return 0;
@ -142,7 +142,7 @@ CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::AddSubMenu(
return new_menu; return new_menu;
} }
bool CefSimpleMenuModelImpl::InsertSeparatorAt(int index) { bool CefSimpleMenuModelImpl::InsertSeparatorAt(size_t index) {
if (!VerifyContext()) if (!VerifyContext())
return false; return false;
@ -150,7 +150,7 @@ bool CefSimpleMenuModelImpl::InsertSeparatorAt(int index) {
return true; return true;
} }
bool CefSimpleMenuModelImpl::InsertItemAt(int index, bool CefSimpleMenuModelImpl::InsertItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
@ -160,7 +160,7 @@ bool CefSimpleMenuModelImpl::InsertItemAt(int index,
return true; return true;
} }
bool CefSimpleMenuModelImpl::InsertCheckItemAt(int index, bool CefSimpleMenuModelImpl::InsertCheckItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
@ -170,7 +170,7 @@ bool CefSimpleMenuModelImpl::InsertCheckItemAt(int index,
return true; return true;
} }
bool CefSimpleMenuModelImpl::InsertRadioItemAt(int index, bool CefSimpleMenuModelImpl::InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) { int group_id) {
@ -182,7 +182,7 @@ bool CefSimpleMenuModelImpl::InsertRadioItemAt(int index,
} }
CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::InsertSubMenuAt( CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::InsertSubMenuAt(
int index, size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
@ -197,7 +197,7 @@ bool CefSimpleMenuModelImpl::Remove(int command_id) {
return RemoveAt(GetIndexOf(command_id)); return RemoveAt(GetIndexOf(command_id));
} }
bool CefSimpleMenuModelImpl::RemoveAt(int index) { bool CefSimpleMenuModelImpl::RemoveAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -219,17 +219,20 @@ int CefSimpleMenuModelImpl::GetIndexOf(int command_id) {
if (!VerifyContext()) if (!VerifyContext())
return kInvalidIndex; return kInvalidIndex;
return model_->GetIndexOfCommandId(command_id); auto index = model_->GetIndexOfCommandId(command_id);
if (index.has_value())
return static_cast<int>(*index);
return -1;
} }
int CefSimpleMenuModelImpl::GetCommandIdAt(int index) { int CefSimpleMenuModelImpl::GetCommandIdAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return kInvalidCommandId; return kInvalidCommandId;
return model_->GetCommandIdAt(index); return model_->GetCommandIdAt(index);
} }
bool CefSimpleMenuModelImpl::SetCommandIdAt(int index, int command_id) { bool CefSimpleMenuModelImpl::SetCommandIdAt(size_t index, int command_id) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
return false; return false;
} }
@ -238,7 +241,7 @@ CefString CefSimpleMenuModelImpl::GetLabel(int command_id) {
return GetLabelAt(GetIndexOf(command_id)); return GetLabelAt(GetIndexOf(command_id));
} }
CefString CefSimpleMenuModelImpl::GetLabelAt(int index) { CefString CefSimpleMenuModelImpl::GetLabelAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return CefString(); return CefString();
@ -249,7 +252,7 @@ bool CefSimpleMenuModelImpl::SetLabel(int command_id, const CefString& label) {
return SetLabelAt(GetIndexOf(command_id), label); return SetLabelAt(GetIndexOf(command_id), label);
} }
bool CefSimpleMenuModelImpl::SetLabelAt(int index, const CefString& label) { bool CefSimpleMenuModelImpl::SetLabelAt(size_t index, const CefString& label) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -263,7 +266,7 @@ CefSimpleMenuModelImpl::MenuItemType CefSimpleMenuModelImpl::GetType(
} }
CefSimpleMenuModelImpl::MenuItemType CefSimpleMenuModelImpl::GetTypeAt( CefSimpleMenuModelImpl::MenuItemType CefSimpleMenuModelImpl::GetTypeAt(
int index) { size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return MENUITEMTYPE_NONE; return MENUITEMTYPE_NONE;
@ -274,7 +277,7 @@ int CefSimpleMenuModelImpl::GetGroupId(int command_id) {
return GetGroupIdAt(GetIndexOf(command_id)); return GetGroupIdAt(GetIndexOf(command_id));
} }
int CefSimpleMenuModelImpl::GetGroupIdAt(int index) { int CefSimpleMenuModelImpl::GetGroupIdAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return kInvalidGroupId; return kInvalidGroupId;
@ -285,7 +288,7 @@ bool CefSimpleMenuModelImpl::SetGroupId(int command_id, int group_id) {
return SetGroupIdAt(GetIndexOf(command_id), group_id); return SetGroupIdAt(GetIndexOf(command_id), group_id);
} }
bool CefSimpleMenuModelImpl::SetGroupIdAt(int index, int group_id) { bool CefSimpleMenuModelImpl::SetGroupIdAt(size_t index, int group_id) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
return false; return false;
} }
@ -294,7 +297,7 @@ CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::GetSubMenu(int command_id) {
return GetSubMenuAt(GetIndexOf(command_id)); return GetSubMenuAt(GetIndexOf(command_id));
} }
CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::GetSubMenuAt(int index) { CefRefPtr<CefMenuModel> CefSimpleMenuModelImpl::GetSubMenuAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return nullptr; return nullptr;
@ -310,7 +313,7 @@ bool CefSimpleMenuModelImpl::IsVisible(int command_id) {
return IsVisibleAt(GetIndexOf(command_id)); return IsVisibleAt(GetIndexOf(command_id));
} }
bool CefSimpleMenuModelImpl::IsVisibleAt(int index) { bool CefSimpleMenuModelImpl::IsVisibleAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -321,7 +324,7 @@ bool CefSimpleMenuModelImpl::SetVisible(int command_id, bool visible) {
return SetVisibleAt(GetIndexOf(command_id), visible); return SetVisibleAt(GetIndexOf(command_id), visible);
} }
bool CefSimpleMenuModelImpl::SetVisibleAt(int index, bool visible) { bool CefSimpleMenuModelImpl::SetVisibleAt(size_t index, bool visible) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -333,7 +336,7 @@ bool CefSimpleMenuModelImpl::IsEnabled(int command_id) {
return IsEnabledAt(GetIndexOf(command_id)); return IsEnabledAt(GetIndexOf(command_id));
} }
bool CefSimpleMenuModelImpl::IsEnabledAt(int index) { bool CefSimpleMenuModelImpl::IsEnabledAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -344,7 +347,7 @@ bool CefSimpleMenuModelImpl::SetEnabled(int command_id, bool enabled) {
return SetEnabledAt(GetIndexOf(command_id), enabled); return SetEnabledAt(GetIndexOf(command_id), enabled);
} }
bool CefSimpleMenuModelImpl::SetEnabledAt(int index, bool enabled) { bool CefSimpleMenuModelImpl::SetEnabledAt(size_t index, bool enabled) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -356,7 +359,7 @@ bool CefSimpleMenuModelImpl::IsChecked(int command_id) {
return IsCheckedAt(GetIndexOf(command_id)); return IsCheckedAt(GetIndexOf(command_id));
} }
bool CefSimpleMenuModelImpl::IsCheckedAt(int index) { bool CefSimpleMenuModelImpl::IsCheckedAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -371,7 +374,7 @@ bool CefSimpleMenuModelImpl::SetChecked(int command_id, bool checked) {
return true; return true;
} }
bool CefSimpleMenuModelImpl::SetCheckedAt(int index, bool checked) { bool CefSimpleMenuModelImpl::SetCheckedAt(size_t index, bool checked) {
return SetChecked(GetCommandIdAt(index), checked); return SetChecked(GetCommandIdAt(index), checked);
} }
@ -379,7 +382,7 @@ bool CefSimpleMenuModelImpl::HasAccelerator(int command_id) {
return HasAcceleratorAt(GetIndexOf(command_id)); return HasAcceleratorAt(GetIndexOf(command_id));
} }
bool CefSimpleMenuModelImpl::HasAcceleratorAt(int index) { bool CefSimpleMenuModelImpl::HasAcceleratorAt(size_t index) {
if (!VerifyContext() || !ValidIndex(index)) if (!VerifyContext() || !ValidIndex(index))
return false; return false;
@ -409,7 +412,7 @@ bool CefSimpleMenuModelImpl::SetAccelerator(int command_id,
return true; return true;
} }
bool CefSimpleMenuModelImpl::SetAcceleratorAt(int index, bool CefSimpleMenuModelImpl::SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
@ -425,7 +428,7 @@ bool CefSimpleMenuModelImpl::RemoveAccelerator(int command_id) {
return true; return true;
} }
bool CefSimpleMenuModelImpl::RemoveAcceleratorAt(int index) { bool CefSimpleMenuModelImpl::RemoveAcceleratorAt(size_t index) {
return RemoveAccelerator(GetCommandIdAt(index)); return RemoveAccelerator(GetCommandIdAt(index));
} }
@ -438,7 +441,7 @@ bool CefSimpleMenuModelImpl::GetAccelerator(int command_id,
ctrl_pressed, alt_pressed); ctrl_pressed, alt_pressed);
} }
bool CefSimpleMenuModelImpl::GetAcceleratorAt(int index, bool CefSimpleMenuModelImpl::GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
@ -510,8 +513,8 @@ bool CefSimpleMenuModelImpl::VerifyContext() {
return true; return true;
} }
bool CefSimpleMenuModelImpl::ValidIndex(int index) { bool CefSimpleMenuModelImpl::ValidIndex(size_t index) {
return index > kInvalidIndex && index < model_->GetItemCount(); return index < model_->GetItemCount();
} }
CefRefPtr<CefSimpleMenuModelImpl> CefSimpleMenuModelImpl::CreateNewSubMenu( CefRefPtr<CefSimpleMenuModelImpl> CefSimpleMenuModelImpl::CreateNewSubMenu(

54
libcef/browser/simple_menu_model_impl.h
View File

@ -49,7 +49,7 @@ class CefSimpleMenuModelImpl : public CefMenuModel {
// CefMenuModel methods. // CefMenuModel methods.
bool IsSubMenu() override; bool IsSubMenu() override;
bool Clear() override; bool Clear() override;
int GetCount() override; size_t GetCount() override;
bool AddSeparator() override; bool AddSeparator() override;
bool AddItem(int command_id, const CefString& label) override; bool AddItem(int command_id, const CefString& label) override;
bool AddCheckItem(int command_id, const CefString& label) override; bool AddCheckItem(int command_id, const CefString& label) override;
@ -58,67 +58,69 @@ class CefSimpleMenuModelImpl : public CefMenuModel {
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> AddSubMenu(int command_id, CefRefPtr<CefMenuModel> AddSubMenu(int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertSeparatorAt(int index) override; bool InsertSeparatorAt(size_t index) override;
bool InsertItemAt(int index, int command_id, const CefString& label) override; bool InsertItemAt(size_t index,
bool InsertCheckItemAt(int index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertRadioItemAt(int index, bool InsertCheckItemAt(size_t index,
int command_id,
const CefString& label) override;
bool InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> InsertSubMenuAt(int index, CefRefPtr<CefMenuModel> InsertSubMenuAt(size_t index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool Remove(int command_id) override; bool Remove(int command_id) override;
bool RemoveAt(int index) override; bool RemoveAt(size_t index) override;
int GetIndexOf(int command_id) override; int GetIndexOf(int command_id) override;
int GetCommandIdAt(int index) override; int GetCommandIdAt(size_t index) override;
bool SetCommandIdAt(int index, int command_id) override; bool SetCommandIdAt(size_t index, int command_id) override;
CefString GetLabel(int command_id) override; CefString GetLabel(int command_id) override;
CefString GetLabelAt(int index) override; CefString GetLabelAt(size_t index) override;
bool SetLabel(int command_id, const CefString& label) override; bool SetLabel(int command_id, const CefString& label) override;
bool SetLabelAt(int index, const CefString& label) override; bool SetLabelAt(size_t index, const CefString& label) override;
MenuItemType GetType(int command_id) override; MenuItemType GetType(int command_id) override;
MenuItemType GetTypeAt(int index) override; MenuItemType GetTypeAt(size_t index) override;
int GetGroupId(int command_id) override; int GetGroupId(int command_id) override;
int GetGroupIdAt(int index) override; int GetGroupIdAt(size_t index) override;
bool SetGroupId(int command_id, int group_id) override; bool SetGroupId(int command_id, int group_id) override;
bool SetGroupIdAt(int index, int group_id) override; bool SetGroupIdAt(size_t index, int group_id) override;
CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override; CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override;
CefRefPtr<CefMenuModel> GetSubMenuAt(int index) override; CefRefPtr<CefMenuModel> GetSubMenuAt(size_t index) override;
bool IsVisible(int command_id) override; bool IsVisible(int command_id) override;
bool IsVisibleAt(int index) override; bool IsVisibleAt(size_t index) override;
bool SetVisible(int command_id, bool visible) override; bool SetVisible(int command_id, bool visible) override;
bool SetVisibleAt(int index, bool visible) override; bool SetVisibleAt(size_t index, bool visible) override;
bool IsEnabled(int command_id) override; bool IsEnabled(int command_id) override;
bool IsEnabledAt(int index) override; bool IsEnabledAt(size_t index) override;
bool SetEnabled(int command_id, bool enabled) override; bool SetEnabled(int command_id, bool enabled) override;
bool SetEnabledAt(int index, bool enabled) override; bool SetEnabledAt(size_t index, bool enabled) override;
bool IsChecked(int command_id) override; bool IsChecked(int command_id) override;
bool IsCheckedAt(int index) override; bool IsCheckedAt(size_t index) override;
bool SetChecked(int command_id, bool checked) override; bool SetChecked(int command_id, bool checked) override;
bool SetCheckedAt(int index, bool checked) override; bool SetCheckedAt(size_t index, bool checked) override;
bool HasAccelerator(int command_id) override; bool HasAccelerator(int command_id) override;
bool HasAcceleratorAt(int index) override; bool HasAcceleratorAt(size_t index) override;
bool SetAccelerator(int command_id, bool SetAccelerator(int command_id,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool SetAcceleratorAt(int index, bool SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool RemoveAccelerator(int command_id) override; bool RemoveAccelerator(int command_id) override;
bool RemoveAcceleratorAt(int index) override; bool RemoveAcceleratorAt(size_t index) override;
bool GetAccelerator(int command_id, bool GetAccelerator(int command_id,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
bool& alt_pressed) override; bool& alt_pressed) override;
bool GetAcceleratorAt(int index, bool GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
@ -146,7 +148,7 @@ class CefSimpleMenuModelImpl : public CefMenuModel {
bool VerifyContext(); bool VerifyContext();
// Returns true if |index| is valid. // Returns true if |index| is valid.
bool ValidIndex(int index); bool ValidIndex(size_t index);
CefRefPtr<CefSimpleMenuModelImpl> CreateNewSubMenu( CefRefPtr<CefSimpleMenuModelImpl> CreateNewSubMenu(
ui::SimpleMenuModel* model); ui::SimpleMenuModel* model);

7
libcef/common/alloy/alloy_main_delegate.cc
View File

@ -89,11 +89,12 @@ AlloyMainDelegate::AlloyMainDelegate(CefMainRunnerHandler* runner,
AlloyMainDelegate::~AlloyMainDelegate() {} AlloyMainDelegate::~AlloyMainDelegate() {}
void AlloyMainDelegate::PreBrowserMain() { absl::optional<int> AlloyMainDelegate::PreBrowserMain() {
runner_->PreBrowserMain(); runner_->PreBrowserMain();
return absl::nullopt;
} }
bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) { absl::optional<int> AlloyMainDelegate::BasicStartupComplete() {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
std::string process_type = std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType); command_line->GetSwitchValueASCII(switches::kProcessType);
@ -346,7 +347,7 @@ bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) {
util_mac::BasicStartupComplete(); util_mac::BasicStartupComplete();
#endif #endif
return false; return absl::nullopt;
} }
void AlloyMainDelegate::PreSandboxStartup() { void AlloyMainDelegate::PreSandboxStartup() {

4
libcef/common/alloy/alloy_main_delegate.h
View File

@ -42,8 +42,8 @@ class AlloyMainDelegate : public content::ContentMainDelegate,
~AlloyMainDelegate() override; ~AlloyMainDelegate() override;
// content::ContentMainDelegate overrides. // content::ContentMainDelegate overrides.
void PreBrowserMain() override; absl::optional<int> PreBrowserMain() override;
bool BasicStartupComplete(int* exit_code) override; absl::optional<int> BasicStartupComplete() override;
void PreSandboxStartup() override; void PreSandboxStartup() override;
absl::variant<int, content::MainFunctionParams> RunProcess( absl::variant<int, content::MainFunctionParams> RunProcess(
const std::string& process_type, const std::string& process_type,

13
libcef/common/chrome/chrome_main_delegate_cef.cc
View File

@ -55,11 +55,11 @@ ChromeMainDelegateCef::ChromeMainDelegateCef(CefMainRunnerHandler* runner,
ChromeMainDelegateCef::~ChromeMainDelegateCef() = default; ChromeMainDelegateCef::~ChromeMainDelegateCef() = default;
bool ChromeMainDelegateCef::BasicStartupComplete(int* exit_code) { absl::optional<int> ChromeMainDelegateCef::BasicStartupComplete() {
// Returns false if startup should proceed. // Returns false if startup should proceed.
bool result = ChromeMainDelegate::BasicStartupComplete(exit_code); auto result = ChromeMainDelegate::BasicStartupComplete();
if (result) if (result.has_value())
return true; return result;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@ -139,7 +139,7 @@ bool ChromeMainDelegateCef::BasicStartupComplete(int* exit_code) {
util_mac::BasicStartupComplete(); util_mac::BasicStartupComplete();
#endif #endif
return false; return absl::nullopt;
} }
void ChromeMainDelegateCef::PreSandboxStartup() { void ChromeMainDelegateCef::PreSandboxStartup() {
@ -169,11 +169,12 @@ void ChromeMainDelegateCef::PreSandboxStartup() {
crash_reporting::PreSandboxStartup(*command_line, process_type); crash_reporting::PreSandboxStartup(*command_line, process_type);
} }
void ChromeMainDelegateCef::PreBrowserMain() { absl::optional<int> ChromeMainDelegateCef::PreBrowserMain() {
// The parent ChromeMainDelegate implementation creates the NSApplication // The parent ChromeMainDelegate implementation creates the NSApplication
// instance on macOS, and we intentionally don't want to do that here. // instance on macOS, and we intentionally don't want to do that here.
// TODO(macos): Do we need l10n_util::OverrideLocaleWithCocoaLocale()? // TODO(macos): Do we need l10n_util::OverrideLocaleWithCocoaLocale()?
runner_->PreBrowserMain(); runner_->PreBrowserMain();
return absl::nullopt;
} }
absl::variant<int, content::MainFunctionParams> absl::variant<int, content::MainFunctionParams>

4
libcef/common/chrome/chrome_main_delegate_cef.h
View File

@ -36,9 +36,9 @@ class ChromeMainDelegateCef : public ChromeMainDelegate,
~ChromeMainDelegateCef() override; ~ChromeMainDelegateCef() override;
// ChromeMainDelegate overrides. // ChromeMainDelegate overrides.
bool BasicStartupComplete(int* exit_code) override; absl::optional<int> BasicStartupComplete() override;
void PreSandboxStartup() override; void PreSandboxStartup() override;
void PreBrowserMain() override; absl::optional<int> PreBrowserMain() override;
absl::variant<int, content::MainFunctionParams> RunProcess( absl::variant<int, content::MainFunctionParams> RunProcess(
const std::string& process_type, const std::string& process_type,
content::MainFunctionParams main_function_params) override; content::MainFunctionParams main_function_params) override;

5
libcef/common/net_service/net_service_util.cc
View File

@ -29,14 +29,15 @@ namespace net_service {
namespace { namespace {
// Determine the cookie domain to use for setting the specified cookie. // Determine the cookie domain to use for setting the specified cookie.
// From net/cookies/cookie_store.cc. // From net/cookies/canonical_cookie.cc.
bool GetCookieDomain(const GURL& url, bool GetCookieDomain(const GURL& url,
const net::ParsedCookie& pc, const net::ParsedCookie& pc,
std::string* result) { std::string* result) {
std::string domain_string; std::string domain_string;
if (pc.HasDomain()) if (pc.HasDomain())
domain_string = pc.Domain(); domain_string = pc.Domain();
return net::cookie_util::GetCookieDomainWithString(url, domain_string, net::CookieInclusionStatus status;
return net::cookie_util::GetCookieDomainWithString(url, domain_string, status,
result); result);
} }

8
libcef/common/values_impl.cc
View File

@ -190,7 +190,7 @@ bool CefValueImpl::IsEqual(CefRefPtr<CefValue> that) {
if (!value_) // Invalid types are equal. if (!value_) // Invalid types are equal.
return true; return true;
return value_->Equals(impl->value_.get()); return *value_ == *(impl->value_.get());
} }
CefRefPtr<CefValue> CefValueImpl::Copy() { CefRefPtr<CefValue> CefValueImpl::Copy() {
@ -486,7 +486,7 @@ bool CefBinaryValueImpl::IsSameValue(const base::Value* that) {
bool CefBinaryValueImpl::IsEqualValue(const base::Value* that) { bool CefBinaryValueImpl::IsEqualValue(const base::Value* that) {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().Equals(that); return const_value() == *that;
} }
base::Value* CefBinaryValueImpl::GetValueUnsafe() { base::Value* CefBinaryValueImpl::GetValueUnsafe() {
@ -629,7 +629,7 @@ bool CefDictionaryValueImpl::IsSameValue(const base::DictionaryValue* that) {
bool CefDictionaryValueImpl::IsEqualValue(const base::DictionaryValue* that) { bool CefDictionaryValueImpl::IsEqualValue(const base::DictionaryValue* that) {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().Equals(that); return const_value() == *that;
} }
base::DictionaryValue* CefDictionaryValueImpl::GetValueUnsafe() { base::DictionaryValue* CefDictionaryValueImpl::GetValueUnsafe() {
@ -1054,7 +1054,7 @@ bool CefListValueImpl::IsSameValue(const base::ListValue* that) {
bool CefListValueImpl::IsEqualValue(const base::ListValue* that) { bool CefListValueImpl::IsEqualValue(const base::ListValue* that) {
CEF_VALUE_VERIFY_RETURN(false, false); CEF_VALUE_VERIFY_RETURN(false, false);
return const_value().Equals(that); return const_value() == *that;
} }
base::ListValue* CefListValueImpl::GetValueUnsafe() { base::ListValue* CefListValueImpl::GetValueUnsafe() {

11
libcef/renderer/alloy/alloy_content_renderer_client.cc
View File

@ -236,14 +236,16 @@ void AlloyContentRendererClient::ExposeInterfacesToBrowser(
mojo::BinderMap* binders) { mojo::BinderMap* binders) {
auto task_runner = base::SequencedTaskRunnerHandle::Get(); auto task_runner = base::SequencedTaskRunnerHandle::Get();
binders->Add(base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver, binders->Add<web_cache::mojom::WebCache>(
base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver,
base::Unretained(web_cache_impl_.get())), base::Unretained(web_cache_impl_.get())),
task_runner); task_runner);
binders->Add(visited_link_slave_->GetBindCallback(), task_runner); binders->Add<visitedlink::mojom::VisitedLinkNotificationSink>(
visited_link_slave_->GetBindCallback(), task_runner);
if (spellcheck_) { if (spellcheck_) {
binders->Add( binders->Add<spellcheck::mojom::SpellChecker>(
base::BindRepeating( base::BindRepeating(
[](SpellCheck* spellcheck, [](SpellCheck* spellcheck,
mojo::PendingReceiver<spellcheck::mojom::SpellChecker> mojo::PendingReceiver<spellcheck::mojom::SpellChecker>
@ -299,7 +301,8 @@ void AlloyContentRendererClient::RenderFrameCreated(
} }
} }
void AlloyContentRendererClient::WebViewCreated(blink::WebView* web_view) { void AlloyContentRendererClient::WebViewCreated(blink::WebView* web_view,
bool was_created_by_renderer) {
bool browser_created; bool browser_created;
absl::optional<bool> is_windowless; absl::optional<bool> is_windowless;
render_manager_->WebViewCreated(web_view, browser_created, is_windowless); render_manager_->WebViewCreated(web_view, browser_created, is_windowless);

3
libcef/renderer/alloy/alloy_content_renderer_client.h
View File

@ -81,7 +81,8 @@ class AlloyContentRendererClient
void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override; void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
void RenderThreadConnected() override; void RenderThreadConnected() override;
void RenderFrameCreated(content::RenderFrame* render_frame) override; void RenderFrameCreated(content::RenderFrame* render_frame) override;
void WebViewCreated(blink::WebView* web_view) override; void WebViewCreated(blink::WebView* web_view,
bool was_created_by_renderer) override;
bool IsPluginHandledExternally(content::RenderFrame* render_frame, bool IsPluginHandledExternally(content::RenderFrame* render_frame,
const blink::WebElement& plugin_element, const blink::WebElement& plugin_element,
const GURL& original_url, const GURL& original_url,

7
libcef/renderer/chrome/chrome_content_renderer_client_cef.cc
View File

@ -53,8 +53,11 @@ void ChromeContentRendererClientCef::RenderFrameCreated(
} }
} }
void ChromeContentRendererClientCef::WebViewCreated(blink::WebView* web_view) { void ChromeContentRendererClientCef::WebViewCreated(
ChromeContentRendererClient::WebViewCreated(web_view); blink::WebView* web_view,
bool was_created_by_renderer) {
ChromeContentRendererClient::WebViewCreated(web_view,
was_created_by_renderer);
bool browser_created; bool browser_created;
absl::optional<bool> is_windowless; absl::optional<bool> is_windowless;

3
libcef/renderer/chrome/chrome_content_renderer_client_cef.h
View File

@ -39,7 +39,8 @@ class ChromeContentRendererClientCef : public ChromeContentRendererClient {
void RenderThreadStarted() override; void RenderThreadStarted() override;
void RenderThreadConnected() override; void RenderThreadConnected() override;
void RenderFrameCreated(content::RenderFrame* render_frame) override; void RenderFrameCreated(content::RenderFrame* render_frame) override;
void WebViewCreated(blink::WebView* web_view) override; void WebViewCreated(blink::WebView* web_view,
bool was_created_by_renderer) override;
void DevToolsAgentAttached() override; void DevToolsAgentAttached() override;
void DevToolsAgentDetached() override; void DevToolsAgentDetached() override;
void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override; void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;

2
libcef/renderer/render_manager.cc
View File

@ -142,7 +142,7 @@ void CefRenderManager::DevToolsAgentDetached() {
void CefRenderManager::ExposeInterfacesToBrowser(mojo::BinderMap* binders) { void CefRenderManager::ExposeInterfacesToBrowser(mojo::BinderMap* binders) {
auto task_runner = base::SequencedTaskRunnerHandle::Get(); auto task_runner = base::SequencedTaskRunnerHandle::Get();
binders->Add( binders->Add<cef::mojom::RenderManager>(
base::BindRepeating( base::BindRepeating(
[](CefRenderManager* render_manager, [](CefRenderManager* render_manager,
mojo::PendingReceiver<cef::mojom::RenderManager> receiver) { mojo::PendingReceiver<cef::mojom::RenderManager> receiver) {

54
libcef_dll/cpptoc/menu_model_cpptoc.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory // implementations. See the translator.README.txt file in the tools directory
// for more information. // for more information.
// //
// $hash=587be50ef3aefc00fadcf6fec431ebecc305b3eb$ // $hash=35aefc41633fb28f0514698177709a0416d3226c$
// //
#include "libcef_dll/cpptoc/menu_model_cpptoc.h" #include "libcef_dll/cpptoc/menu_model_cpptoc.h"
@ -73,7 +73,7 @@ int CEF_CALLBACK menu_model_clear(struct _cef_menu_model_t* self) {
return _retval; return _retval;
} }
int CEF_CALLBACK menu_model_get_count(struct _cef_menu_model_t* self) { size_t CEF_CALLBACK menu_model_get_count(struct _cef_menu_model_t* self) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -83,7 +83,7 @@ int CEF_CALLBACK menu_model_get_count(struct _cef_menu_model_t* self) {
return 0; return 0;
// Execute // Execute
int _retval = CefMenuModelCppToC::Get(self)->GetCount(); size_t _retval = CefMenuModelCppToC::Get(self)->GetCount();
// Return type: simple // Return type: simple
return _retval; return _retval;
@ -200,7 +200,7 @@ menu_model_add_sub_menu(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_insert_separator_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_insert_separator_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -217,7 +217,7 @@ int CEF_CALLBACK menu_model_insert_separator_at(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_insert_item_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_insert_item_at(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label) { const cef_string_t* label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -241,7 +241,7 @@ int CEF_CALLBACK menu_model_insert_item_at(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_insert_check_item_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_insert_check_item_at(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label) { const cef_string_t* label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -265,7 +265,7 @@ int CEF_CALLBACK menu_model_insert_check_item_at(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_insert_radio_item_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_insert_radio_item_at(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label, const cef_string_t* label,
int group_id) { int group_id) {
@ -291,7 +291,7 @@ int CEF_CALLBACK menu_model_insert_radio_item_at(struct _cef_menu_model_t* self,
struct _cef_menu_model_t* CEF_CALLBACK struct _cef_menu_model_t* CEF_CALLBACK
menu_model_insert_sub_menu_at(struct _cef_menu_model_t* self, menu_model_insert_sub_menu_at(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id, int command_id,
const cef_string_t* label) { const cef_string_t* label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -333,7 +333,7 @@ int CEF_CALLBACK menu_model_remove(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_remove_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_remove_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -367,7 +367,7 @@ int CEF_CALLBACK menu_model_get_index_of(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_get_command_id_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_get_command_id_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -384,7 +384,7 @@ int CEF_CALLBACK menu_model_get_command_id_at(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_command_id_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_command_id_at(struct _cef_menu_model_t* self,
int index, size_t index,
int command_id) { int command_id) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -420,7 +420,7 @@ menu_model_get_label(struct _cef_menu_model_t* self, int command_id) {
} }
cef_string_userfree_t CEF_CALLBACK cef_string_userfree_t CEF_CALLBACK
menu_model_get_label_at(struct _cef_menu_model_t* self, int index) { menu_model_get_label_at(struct _cef_menu_model_t* self, size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -460,7 +460,7 @@ int CEF_CALLBACK menu_model_set_label(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_label_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_label_at(struct _cef_menu_model_t* self,
int index, size_t index,
const cef_string_t* label) { const cef_string_t* label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -501,7 +501,7 @@ menu_model_get_type(struct _cef_menu_model_t* self, int command_id) {
} }
cef_menu_item_type_t CEF_CALLBACK cef_menu_item_type_t CEF_CALLBACK
menu_model_get_type_at(struct _cef_menu_model_t* self, int index) { menu_model_get_type_at(struct _cef_menu_model_t* self, size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -536,7 +536,7 @@ int CEF_CALLBACK menu_model_get_group_id(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_get_group_id_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_get_group_id_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -572,7 +572,7 @@ int CEF_CALLBACK menu_model_set_group_id(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_group_id_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_group_id_at(struct _cef_menu_model_t* self,
int index, size_t index,
int group_id) { int group_id) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -608,7 +608,7 @@ menu_model_get_sub_menu(struct _cef_menu_model_t* self, int command_id) {
} }
struct _cef_menu_model_t* CEF_CALLBACK struct _cef_menu_model_t* CEF_CALLBACK
menu_model_get_sub_menu_at(struct _cef_menu_model_t* self, int index) { menu_model_get_sub_menu_at(struct _cef_menu_model_t* self, size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -643,7 +643,7 @@ int CEF_CALLBACK menu_model_is_visible(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_is_visible_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_is_visible_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -679,7 +679,7 @@ int CEF_CALLBACK menu_model_set_visible(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_visible_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_visible_at(struct _cef_menu_model_t* self,
int index, size_t index,
int visible) { int visible) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -715,7 +715,7 @@ int CEF_CALLBACK menu_model_is_enabled(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_is_enabled_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_is_enabled_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -751,7 +751,7 @@ int CEF_CALLBACK menu_model_set_enabled(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_enabled_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_enabled_at(struct _cef_menu_model_t* self,
int index, size_t index,
int enabled) { int enabled) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -787,7 +787,7 @@ int CEF_CALLBACK menu_model_is_checked(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_is_checked_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_is_checked_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -823,7 +823,7 @@ int CEF_CALLBACK menu_model_set_checked(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_checked_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_checked_at(struct _cef_menu_model_t* self,
int index, size_t index,
int checked) { int checked) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -859,7 +859,7 @@ int CEF_CALLBACK menu_model_has_accelerator(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_has_accelerator_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_has_accelerator_at(struct _cef_menu_model_t* self,
int index) { size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -899,7 +899,7 @@ int CEF_CALLBACK menu_model_set_accelerator(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_set_accelerator_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_set_accelerator_at(struct _cef_menu_model_t* self,
int index, size_t index,
int key_code, int key_code,
int shift_pressed, int shift_pressed,
int ctrl_pressed, int ctrl_pressed,
@ -939,7 +939,7 @@ int CEF_CALLBACK menu_model_remove_accelerator(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK int CEF_CALLBACK
menu_model_remove_accelerator_at(struct _cef_menu_model_t* self, int index) { menu_model_remove_accelerator_at(struct _cef_menu_model_t* self, size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@ -1017,7 +1017,7 @@ int CEF_CALLBACK menu_model_get_accelerator(struct _cef_menu_model_t* self,
} }
int CEF_CALLBACK menu_model_get_accelerator_at(struct _cef_menu_model_t* self, int CEF_CALLBACK menu_model_get_accelerator_at(struct _cef_menu_model_t* self,
int index, size_t index,
int* key_code, int* key_code,
int* shift_pressed, int* shift_pressed,
int* ctrl_pressed, int* ctrl_pressed,

57
libcef_dll/ctocpp/menu_model_ctocpp.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory // implementations. See the translator.README.txt file in the tools directory
// for more information. // for more information.
// //
// $hash=16bf2696e26746eddb06f7c6003eec81d3fc1c23$ // $hash=699207639d879f4e553aa60f88f1ce89f2441142$
// //
#include "libcef_dll/ctocpp/menu_model_ctocpp.h" #include "libcef_dll/ctocpp/menu_model_ctocpp.h"
@ -72,7 +72,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::Clear() {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetCount() { NO_SANITIZE("cfi-icall") size_t CefMenuModelCToCpp::GetCount() {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -82,7 +82,7 @@ NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetCount() {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute // Execute
int _retval = _struct->get_count(_struct); size_t _retval = _struct->get_count(_struct);
// Return type: simple // Return type: simple
return _retval; return _retval;
@ -197,7 +197,8 @@ CefRefPtr<CefMenuModel> CefMenuModelCToCpp::AddSubMenu(int command_id,
return CefMenuModelCToCpp::Wrap(_retval); return CefMenuModelCToCpp::Wrap(_retval);
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::InsertSeparatorAt(int index) { NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::InsertSeparatorAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -214,7 +215,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::InsertSeparatorAt(int index) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::InsertItemAt(int index, bool CefMenuModelCToCpp::InsertItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -239,7 +240,7 @@ bool CefMenuModelCToCpp::InsertItemAt(int index,
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::InsertCheckItemAt(int index, bool CefMenuModelCToCpp::InsertCheckItemAt(size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -264,7 +265,7 @@ bool CefMenuModelCToCpp::InsertCheckItemAt(int index,
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::InsertRadioItemAt(int index, bool CefMenuModelCToCpp::InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) { int group_id) {
@ -291,7 +292,7 @@ bool CefMenuModelCToCpp::InsertRadioItemAt(int index,
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
CefRefPtr<CefMenuModel> CefMenuModelCToCpp::InsertSubMenuAt( CefRefPtr<CefMenuModel> CefMenuModelCToCpp::InsertSubMenuAt(
int index, size_t index,
int command_id, int command_id,
const CefString& label) { const CefString& label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
@ -331,7 +332,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::Remove(int command_id) {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::RemoveAt(int index) { NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::RemoveAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -363,7 +364,7 @@ NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetIndexOf(int command_id) {
return _retval; return _retval;
} }
NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetCommandIdAt(int index) { NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetCommandIdAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -380,7 +381,7 @@ NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetCommandIdAt(int index) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetCommandIdAt(int index, int command_id) { bool CefMenuModelCToCpp::SetCommandIdAt(size_t index, int command_id) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -415,7 +416,8 @@ CefString CefMenuModelCToCpp::GetLabel(int command_id) {
return _retvalStr; return _retvalStr;
} }
NO_SANITIZE("cfi-icall") CefString CefMenuModelCToCpp::GetLabelAt(int index) { NO_SANITIZE("cfi-icall")
CefString CefMenuModelCToCpp::GetLabelAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -456,7 +458,7 @@ bool CefMenuModelCToCpp::SetLabel(int command_id, const CefString& label) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetLabelAt(int index, const CefString& label) { bool CefMenuModelCToCpp::SetLabelAt(size_t index, const CefString& label) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -495,7 +497,7 @@ CefMenuModel::MenuItemType CefMenuModelCToCpp::GetType(int command_id) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
CefMenuModel::MenuItemType CefMenuModelCToCpp::GetTypeAt(int index) { CefMenuModel::MenuItemType CefMenuModelCToCpp::GetTypeAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -527,7 +529,7 @@ NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetGroupId(int command_id) {
return _retval; return _retval;
} }
NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetGroupIdAt(int index) { NO_SANITIZE("cfi-icall") int CefMenuModelCToCpp::GetGroupIdAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -561,7 +563,7 @@ bool CefMenuModelCToCpp::SetGroupId(int command_id, int group_id) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetGroupIdAt(int index, int group_id) { bool CefMenuModelCToCpp::SetGroupIdAt(size_t index, int group_id) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -595,7 +597,7 @@ CefRefPtr<CefMenuModel> CefMenuModelCToCpp::GetSubMenu(int command_id) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
CefRefPtr<CefMenuModel> CefMenuModelCToCpp::GetSubMenuAt(int index) { CefRefPtr<CefMenuModel> CefMenuModelCToCpp::GetSubMenuAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -627,7 +629,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsVisible(int command_id) {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsVisibleAt(int index) { NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsVisibleAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -661,7 +663,7 @@ bool CefMenuModelCToCpp::SetVisible(int command_id, bool visible) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetVisibleAt(int index, bool visible) { bool CefMenuModelCToCpp::SetVisibleAt(size_t index, bool visible) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -693,7 +695,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsEnabled(int command_id) {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsEnabledAt(int index) { NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsEnabledAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -727,7 +729,7 @@ bool CefMenuModelCToCpp::SetEnabled(int command_id, bool enabled) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetEnabledAt(int index, bool enabled) { bool CefMenuModelCToCpp::SetEnabledAt(size_t index, bool enabled) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -759,7 +761,7 @@ NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsChecked(int command_id) {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsCheckedAt(int index) { NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::IsCheckedAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -793,7 +795,7 @@ bool CefMenuModelCToCpp::SetChecked(int command_id, bool checked) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetCheckedAt(int index, bool checked) { bool CefMenuModelCToCpp::SetCheckedAt(size_t index, bool checked) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -826,7 +828,8 @@ bool CefMenuModelCToCpp::HasAccelerator(int command_id) {
return _retval ? true : false; return _retval ? true : false;
} }
NO_SANITIZE("cfi-icall") bool CefMenuModelCToCpp::HasAcceleratorAt(int index) { NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::HasAcceleratorAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -865,7 +868,7 @@ bool CefMenuModelCToCpp::SetAccelerator(int command_id,
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::SetAcceleratorAt(int index, bool CefMenuModelCToCpp::SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
@ -904,7 +907,7 @@ bool CefMenuModelCToCpp::RemoveAccelerator(int command_id) {
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::RemoveAcceleratorAt(int index) { bool CefMenuModelCToCpp::RemoveAcceleratorAt(size_t index) {
shutdown_checker::AssertNotShutdown(); shutdown_checker::AssertNotShutdown();
cef_menu_model_t* _struct = GetStruct(); cef_menu_model_t* _struct = GetStruct();
@ -958,7 +961,7 @@ bool CefMenuModelCToCpp::GetAccelerator(int command_id,
} }
NO_SANITIZE("cfi-icall") NO_SANITIZE("cfi-icall")
bool CefMenuModelCToCpp::GetAcceleratorAt(int index, bool CefMenuModelCToCpp::GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,

54
libcef_dll/ctocpp/menu_model_ctocpp.h
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory // implementations. See the translator.README.txt file in the tools directory
// for more information. // for more information.
// //
// $hash=4cb6a46bc1c8fa0d912c04d58a07afddd250d9b9$ // $hash=d1fc5e01c9f9a4908cd5de4983f5b1c1cfdceccc$
// //
#ifndef CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_ #ifndef CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_
@ -36,7 +36,7 @@ class CefMenuModelCToCpp : public CefCToCppRefCounted<CefMenuModelCToCpp,
// CefMenuModel methods. // CefMenuModel methods.
bool IsSubMenu() override; bool IsSubMenu() override;
bool Clear() override; bool Clear() override;
int GetCount() override; size_t GetCount() override;
bool AddSeparator() override; bool AddSeparator() override;
bool AddItem(int command_id, const CefString& label) override; bool AddItem(int command_id, const CefString& label) override;
bool AddCheckItem(int command_id, const CefString& label) override; bool AddCheckItem(int command_id, const CefString& label) override;
@ -45,67 +45,69 @@ class CefMenuModelCToCpp : public CefCToCppRefCounted<CefMenuModelCToCpp,
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> AddSubMenu(int command_id, CefRefPtr<CefMenuModel> AddSubMenu(int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertSeparatorAt(int index) override; bool InsertSeparatorAt(size_t index) override;
bool InsertItemAt(int index, int command_id, const CefString& label) override; bool InsertItemAt(size_t index,
bool InsertCheckItemAt(int index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool InsertRadioItemAt(int index, bool InsertCheckItemAt(size_t index,
int command_id,
const CefString& label) override;
bool InsertRadioItemAt(size_t index,
int command_id, int command_id,
const CefString& label, const CefString& label,
int group_id) override; int group_id) override;
CefRefPtr<CefMenuModel> InsertSubMenuAt(int index, CefRefPtr<CefMenuModel> InsertSubMenuAt(size_t index,
int command_id, int command_id,
const CefString& label) override; const CefString& label) override;
bool Remove(int command_id) override; bool Remove(int command_id) override;
bool RemoveAt(int index) override; bool RemoveAt(size_t index) override;
int GetIndexOf(int command_id) override; int GetIndexOf(int command_id) override;
int GetCommandIdAt(int index) override; int GetCommandIdAt(size_t index) override;
bool SetCommandIdAt(int index, int command_id) override; bool SetCommandIdAt(size_t index, int command_id) override;
CefString GetLabel(int command_id) override; CefString GetLabel(int command_id) override;
CefString GetLabelAt(int index) override; CefString GetLabelAt(size_t index) override;
bool SetLabel(int command_id, const CefString& label) override; bool SetLabel(int command_id, const CefString& label) override;
bool SetLabelAt(int index, const CefString& label) override; bool SetLabelAt(size_t index, const CefString& label) override;
MenuItemType GetType(int command_id) override; MenuItemType GetType(int command_id) override;
MenuItemType GetTypeAt(int index) override; MenuItemType GetTypeAt(size_t index) override;
int GetGroupId(int command_id) override; int GetGroupId(int command_id) override;
int GetGroupIdAt(int index) override; int GetGroupIdAt(size_t index) override;
bool SetGroupId(int command_id, int group_id) override; bool SetGroupId(int command_id, int group_id) override;
bool SetGroupIdAt(int index, int group_id) override; bool SetGroupIdAt(size_t index, int group_id) override;
CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override; CefRefPtr<CefMenuModel> GetSubMenu(int command_id) override;
CefRefPtr<CefMenuModel> GetSubMenuAt(int index) override; CefRefPtr<CefMenuModel> GetSubMenuAt(size_t index) override;
bool IsVisible(int command_id) override; bool IsVisible(int command_id) override;
bool IsVisibleAt(int index) override; bool IsVisibleAt(size_t index) override;
bool SetVisible(int command_id, bool visible) override; bool SetVisible(int command_id, bool visible) override;
bool SetVisibleAt(int index, bool visible) override; bool SetVisibleAt(size_t index, bool visible) override;
bool IsEnabled(int command_id) override; bool IsEnabled(int command_id) override;
bool IsEnabledAt(int index) override; bool IsEnabledAt(size_t index) override;
bool SetEnabled(int command_id, bool enabled) override; bool SetEnabled(int command_id, bool enabled) override;
bool SetEnabledAt(int index, bool enabled) override; bool SetEnabledAt(size_t index, bool enabled) override;
bool IsChecked(int command_id) override; bool IsChecked(int command_id) override;
bool IsCheckedAt(int index) override; bool IsCheckedAt(size_t index) override;
bool SetChecked(int command_id, bool checked) override; bool SetChecked(int command_id, bool checked) override;
bool SetCheckedAt(int index, bool checked) override; bool SetCheckedAt(size_t index, bool checked) override;
bool HasAccelerator(int command_id) override; bool HasAccelerator(int command_id) override;
bool HasAcceleratorAt(int index) override; bool HasAcceleratorAt(size_t index) override;
bool SetAccelerator(int command_id, bool SetAccelerator(int command_id,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool SetAcceleratorAt(int index, bool SetAcceleratorAt(size_t index,
int key_code, int key_code,
bool shift_pressed, bool shift_pressed,
bool ctrl_pressed, bool ctrl_pressed,
bool alt_pressed) override; bool alt_pressed) override;
bool RemoveAccelerator(int command_id) override; bool RemoveAccelerator(int command_id) override;
bool RemoveAcceleratorAt(int index) override; bool RemoveAcceleratorAt(size_t index) override;
bool GetAccelerator(int command_id, bool GetAccelerator(int command_id,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,
bool& alt_pressed) override; bool& alt_pressed) override;
bool GetAcceleratorAt(int index, bool GetAcceleratorAt(size_t index,
int& key_code, int& key_code,
bool& shift_pressed, bool& shift_pressed,
bool& ctrl_pressed, bool& ctrl_pressed,

7
patch/patch.cfg
View File

@ -589,12 +589,7 @@ patches = [
{ {
# Linux: Support chaining of PrintingContextLinux callbacks. # Linux: Support chaining of PrintingContextLinux callbacks.
# https://bitbucket.org/chromiumembedded/cef/issues/3314 # https://bitbucket.org/chromiumembedded/cef/issues/3314
# Also reverts the changes from https://crrev.com/db245883e1
'name': 'linux_printing_context', 'name': 'linux_printing_context',
},
{
# Windows: Add LAZY_INSTANCE_INITIALIZER where necessary to fix official
# cef_sandbox build.
# https://chromium-review.googlesource.com/c/chromium/src/+/3773637
'name': 'base_metrics_3773637',
} }
] ]

13
patch/patches/base_metrics_3773637.patch
View File

@ -1,13 +0,0 @@
diff --git base/metrics/statistics_recorder.cc base/metrics/statistics_recorder.cc
index 1f808cac46bc0..8ca2df9cfc5b9 100644
--- base/metrics/statistics_recorder.cc
+++ base/metrics/statistics_recorder.cc
@@ -32,7 +32,7 @@ bool HistogramNameLesser(const base::HistogramBase* a,
} // namespace
// static
-LazyInstance<Lock>::Leaky StatisticsRecorder::lock_;
+LazyInstance<Lock>::Leaky StatisticsRecorder::lock_ = LAZY_INSTANCE_INITIALIZER;
// static
StatisticsRecorder* StatisticsRecorder::top_ = nullptr;

6
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn diff --git base/BUILD.gn base/BUILD.gn
index d6f08e8d0149c..8a9d77fee5029 100644 index 9fc667eaa2bcf..00b36b452ccfa 100644
--- base/BUILD.gn --- base/BUILD.gn
+++ base/BUILD.gn +++ base/BUILD.gn
@@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -37,6 +37,7 @@ import("//build/nocompile.gni")
@ -10,7 +10,7 @@ index d6f08e8d0149c..8a9d77fee5029 100644
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni") import("//testing/test.gni")
@@ -1910,7 +1911,11 @@ mixed_component("base") { @@ -1923,7 +1924,11 @@ mixed_component("base") {
"hash/md5_constexpr_internal.h", "hash/md5_constexpr_internal.h",
"hash/sha1.h", "hash/sha1.h",
] ]
@ -23,7 +23,7 @@ index d6f08e8d0149c..8a9d77fee5029 100644
sources += [ sources += [
"hash/md5_nacl.cc", "hash/md5_nacl.cc",
"hash/md5_nacl.h", "hash/md5_nacl.h",
@@ -2063,6 +2068,12 @@ mixed_component("base") { @@ -2076,6 +2081,12 @@ mixed_component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
} }

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index d254be9911f39..76e28fe22d988 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API // 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 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index 8afc757188c41..d43e81d736fc4 100644 index 8dd5c0827940d..7487edfbc3827 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
@@ -6373,6 +6373,14 @@ std::pair<url::Origin, std::string> NavigationRequest:: @@ -6413,6 +6413,14 @@ std::pair<url::Origin, std::string> NavigationRequest::
origin_and_debug_info.second += ", error"; origin_and_debug_info.second += ", error";
} }
@ -38,7 +38,7 @@ index 8afc757188c41..d43e81d736fc4 100644
if (use_opaque_origin) { if (use_opaque_origin) {
origin_and_debug_info = origin_and_debug_info =
std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(), std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(),
@@ -6400,6 +6408,15 @@ std::pair<url::Origin, std::string> NavigationRequest:: @@ -6440,6 +6448,15 @@ std::pair<url::Origin, std::string> NavigationRequest::
GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo( GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo(
SandboxFlagsToCommit()); SandboxFlagsToCommit());

4
patch/patches/build.patch
View File

@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index cab8b77aaa86b..7e88abd41bf1d 100644 index b6aaae9b69576..e2bcfb0684e9b 100644
--- build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -1850,8 +1850,6 @@ config("thin_archive") { @@ -1844,8 +1844,6 @@ config("thin_archive") {
# confuses lldb. # confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ] arflags = [ "-T" ]

4
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 99b370a07c1df..85bec5adc723a 100644 index ef07cd4a80a95..a30eab3a7cc52 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@ -10,7 +10,7 @@ index 99b370a07c1df..85bec5adc723a 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
@@ -1959,6 +1960,7 @@ static_library("browser") { @@ -1957,6 +1958,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags", "//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags", "//build/config/compiler:compiler_buildflags",
"//cc", "//cc",

58
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 3285e422f76c1..5f35b91897b75 100644
return false; return false;
} }
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 6f504d1acba5d..0e242d1612fc2 100644 index 7612f95eed78e..e6da8824627b2 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/compiler/compiler.gni") @@ -10,6 +10,7 @@ import("//build/config/compiler/compiler.gni")
@ -24,7 +24,7 @@ index 6f504d1acba5d..0e242d1612fc2 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni") import("//chromeos/ash/components/assistant/assistant.gni")
@@ -364,6 +365,10 @@ static_library("ui") { @@ -362,6 +363,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wexit_time_destructors",
] ]
@ -35,7 +35,7 @@ index 6f504d1acba5d..0e242d1612fc2 100644
# Since browser and browser_ui actually depend on each other, # Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser. # we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less # However, this means browser_ui and browser should more or less
@@ -387,6 +392,7 @@ static_library("ui") { @@ -385,6 +390,7 @@ static_library("ui") {
"//build:chromeos_buildflags", "//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags", "//build/config/chromebox_for_meetings:buildflags",
"//cc/paint", "//cc/paint",
@ -43,7 +43,7 @@ index 6f504d1acba5d..0e242d1612fc2 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -5505,6 +5511,7 @@ static_library("ui") { @@ -5528,6 +5534,7 @@ static_library("ui") {
if (enable_basic_printing) { if (enable_basic_printing) {
deps += [ deps += [
"//components/printing/browser", "//components/printing/browser",
@ -52,10 +52,10 @@ index 6f504d1acba5d..0e242d1612fc2 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 ce86697e47437..4600d6a9ab701 100644 index 3aa1e336d8da2..2826a41485deb 100644
--- chrome/browser/ui/browser.cc --- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc
@@ -262,6 +262,25 @@ @@ -264,6 +264,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h" #include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif #endif
@ -81,7 +81,7 @@ index ce86697e47437..4600d6a9ab701 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h" #include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif #endif
@@ -511,6 +530,13 @@ Browser::Browser(const CreateParams& params) @@ -513,6 +532,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this); tab_strip_model_->AddObserver(this);
@ -95,7 +95,7 @@ index ce86697e47437..4600d6a9ab701 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>( location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars); location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1322,6 +1348,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( @@ -1342,6 +1368,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event)) if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED; return content::KeyboardEventProcessingResult::HANDLED;
@ -110,7 +110,7 @@ index ce86697e47437..4600d6a9ab701 100644
return window()->PreHandleKeyboardEvent(event); return window()->PreHandleKeyboardEvent(event);
} }
@@ -1329,8 +1363,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, @@ -1349,8 +1383,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) { const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window = DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source); DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -131,7 +131,7 @@ index ce86697e47437..4600d6a9ab701 100644
} }
bool Browser::TabsNeedBeforeUnloadFired() { bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1537,6 +1581,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, @@ -1564,6 +1608,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params); return window->OpenURLFromTab(source, params);
} }
@ -146,7 +146,7 @@ index ce86697e47437..4600d6a9ab701 100644
NavigateParams nav_params(this, params.url, params.transition); NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source; nav_params.source_contents = source;
@@ -1666,6 +1718,15 @@ void Browser::AddNewContents(WebContents* source, @@ -1693,6 +1745,15 @@ void Browser::AddNewContents(WebContents* source,
return; return;
} }
@ -162,7 +162,7 @@ index ce86697e47437..4600d6a9ab701 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url, chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect, window_action); disposition, initial_rect, window_action);
} }
@@ -1684,6 +1745,8 @@ void Browser::LoadingStateChanged(WebContents* source, @@ -1711,6 +1772,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) { bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -171,7 +171,7 @@ index ce86697e47437..4600d6a9ab701 100644
} }
void Browser::CloseContents(WebContents* source) { void Browser::CloseContents(WebContents* source) {
@@ -1711,6 +1774,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { @@ -1738,6 +1801,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
} }
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -180,7 +180,7 @@ index ce86697e47437..4600d6a9ab701 100644
if (!GetStatusBubble()) if (!GetStatusBubble())
return; return;
@@ -1718,6 +1783,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -1745,6 +1810,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url); GetStatusBubble()->SetURL(url);
} }
@ -198,7 +198,7 @@ index ce86697e47437..4600d6a9ab701 100644
void Browser::ContentsMouseEvent(WebContents* source, void Browser::ContentsMouseEvent(WebContents* source,
bool motion, bool motion,
bool exited) { bool exited) {
@@ -1742,6 +1818,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { @@ -1769,6 +1845,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false; return false;
} }
@ -218,7 +218,7 @@ index ce86697e47437..4600d6a9ab701 100644
void Browser::BeforeUnloadFired(WebContents* web_contents, void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed, bool proceed,
bool* proceed_to_fire_unload) { bool* proceed_to_fire_unload) {
@@ -1834,6 +1923,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, @@ -1861,6 +1950,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager. // Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents); task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -229,7 +229,7 @@ index ce86697e47437..4600d6a9ab701 100644
} }
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1878,6 +1971,8 @@ void Browser::RendererResponsive( @@ -1905,6 +1998,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) { void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents()) if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@ -238,7 +238,7 @@ index ce86697e47437..4600d6a9ab701 100644
} }
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1938,11 +2033,15 @@ void Browser::EnterFullscreenModeForTab( @@ -1965,11 +2060,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) { const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id); requesting_frame, options.display_id);
@ -254,7 +254,7 @@ index ce86697e47437..4600d6a9ab701 100644
} }
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2121,6 +2220,15 @@ void Browser::RequestMediaAccessPermission( @@ -2154,6 +2253,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents, content::WebContents* web_contents,
const content::MediaStreamRequest& request, const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) { content::MediaResponseCallback callback) {
@ -270,7 +270,7 @@ index ce86697e47437..4600d6a9ab701 100644
const extensions::Extension* extension = const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin); GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2658,13 +2766,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { @@ -2691,13 +2799,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private): // Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() { StatusBubble* Browser::GetStatusBubble() {
@ -292,7 +292,7 @@ index ce86697e47437..4600d6a9ab701 100644
return window_ ? window_->GetStatusBubble() : nullptr; return window_ ? window_->GetStatusBubble() : nullptr;
} }
@@ -2791,6 +2906,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { @@ -2824,6 +2939,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this); content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
} }
@ -302,7 +302,7 @@ index ce86697e47437..4600d6a9ab701 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents, void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 64eeec32ac70f..10039229b4d4f 100644 index c9e2f4c315d27..54cb88c98d72c 100644
--- chrome/browser/ui/browser.h --- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -336,8 +336,8 @@ index 64eeec32ac70f..10039229b4d4f 100644
private: private:
friend class Browser; friend class Browser;
friend class WindowSizerChromeOSTest; friend class WindowSizerChromeOSTest;
@@ -387,6 +397,13 @@ class Browser : public TabStripModelObserver, @@ -395,6 +405,13 @@ class Browser : public TabStripModelObserver,
return creation_source_ == CreationSource::kSessionRestore; force_skip_warning_user_on_close_ = force_skip_warning_user_on_close;
} }
+ // Return true if CEF will expose the toolbar to the client. This value is + // Return true if CEF will expose the toolbar to the client. This value is
@ -350,7 +350,7 @@ index 64eeec32ac70f..10039229b4d4f 100644
// Accessors //////////////////////////////////////////////////////////////// // Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; } const CreateParams& create_params() const { return create_params_; }
@@ -460,6 +477,12 @@ class Browser : public TabStripModelObserver, @@ -468,6 +485,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr(); base::WeakPtr<Browser> AsWeakPtr();
@ -363,7 +363,7 @@ index 64eeec32ac70f..10039229b4d4f 100644
// Get the FindBarController for this browser, creating it if it does not // Get the FindBarController for this browser, creating it if it does not
// yet exist. // yet exist.
FindBarController* GetFindBarController(); FindBarController* GetFindBarController();
@@ -829,11 +852,19 @@ class Browser : public TabStripModelObserver, @@ -837,11 +860,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source, void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override; const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -383,7 +383,7 @@ index 64eeec32ac70f..10039229b4d4f 100644
void BeforeUnloadFired(content::WebContents* source, void BeforeUnloadFired(content::WebContents* source,
bool proceed, bool proceed,
bool* proceed_to_fire_unload) override; bool* proceed_to_fire_unload) override;
@@ -1233,6 +1264,8 @@ class Browser : public TabStripModelObserver, @@ -1241,6 +1272,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_; const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_; bool initial_visible_on_all_workspaces_state_;
@ -392,7 +392,7 @@ index 64eeec32ac70f..10039229b4d4f 100644
CreationSource creation_source_ = CreationSource::kUnknown; CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_; UnloadController unload_controller_;
@@ -1301,6 +1334,10 @@ class Browser : public TabStripModelObserver, @@ -1312,6 +1345,10 @@ class Browser : public TabStripModelObserver,
std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_; std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_;
#endif #endif
@ -404,7 +404,7 @@ index 64eeec32ac70f..10039229b4d4f 100644
// The following factory is used for chrome update coalescing. // The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 3c01acfca74b0..11e298c8ed15b 100644 index 36244f0893bc6..3bbc1b68988f3 100644
--- chrome/browser/ui/browser_navigator.cc --- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc +++ chrome/browser/ui/browser_navigator.cc
@@ -563,6 +563,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents( @@ -563,6 +563,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(

22
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 374f3735584d9..3aff0aa1c21ca 100644 index 0dbc60e5bbd04..f8df1337b6c01 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
@@ -303,6 +303,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get(); return callback.get();
} }
@ -16,7 +16,7 @@ index 374f3735584d9..3aff0aa1c21ca 100644
enum class UmaEnumIdLookupType { enum class UmaEnumIdLookupType {
GeneralEnumId, GeneralEnumId,
ContextSpecificEnumId, ContextSpecificEnumId,
@@ -539,6 +546,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { @@ -543,6 +550,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id)) if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1; return 1;
@ -27,10 +27,10 @@ index 374f3735584d9..3aff0aa1c21ca 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);
@@ -729,6 +740,14 @@ RenderViewContextMenu::RenderViewContextMenu( @@ -737,6 +748,14 @@ RenderViewContextMenu::RenderViewContextMenu(
system_app_ = GetBrowser() && GetBrowser()->app_controller()
? GetBrowser()->app_controller()->system_app() ? GetBrowser()->app_controller()->system_app()
: nullptr; : nullptr;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+ +
+ auto* cb = GetMenuCreatedCallback(); + auto* cb = GetMenuCreatedCallback();
+ if (!cb->is_null()) { + if (!cb->is_null()) {
@ -42,7 +42,7 @@ index 374f3735584d9..3aff0aa1c21ca 100644
} }
RenderViewContextMenu::~RenderViewContextMenu() = default; RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1130,6 +1149,12 @@ void RenderViewContextMenu::InitMenu() { @@ -1143,6 +1162,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause // menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669). // it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems(); AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index 374f3735584d9..3aff0aa1c21ca 100644
} }
Profile* RenderViewContextMenu::GetProfile() const { Profile* RenderViewContextMenu::GetProfile() const {
@@ -2945,6 +2970,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( @@ -2981,6 +3006,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb); execute_plugin_action_callback_ = std::move(cb);
} }
@ -69,10 +69,10 @@ index 374f3735584d9..3aff0aa1c21ca 100644
RenderViewContextMenu::GetHandlersForLinkUrl() { RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = 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 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 5447107f392f5..ac79f549fcd8a 100644 index 51695cd6d98a8..dfaddfb337baa 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h --- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ 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*, base::OnceCallback<void(content::RenderFrameHost*,
blink::mojom::PluginActionType)> cb); blink::mojom::PluginActionType)> cb);
@ -85,7 +85,7 @@ index 5447107f392f5..ac79f549fcd8a 100644
protected: protected:
Profile* GetProfile() const; Profile* GetProfile() const;
@@ -347,6 +353,9 @@ class RenderViewContextMenu @@ -349,6 +355,9 @@ class RenderViewContextMenu
// built. // built.
bool is_protocol_submenu_valid_ = false; bool is_protocol_submenu_valid_ = false;
@ -110,7 +110,7 @@ index 13b73503a6a73..6e840062ff825 100644
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
switch (command_id) { 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 diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
index 92bf0cec02a26..b449960a9f5dd 100644 index 9600ae2f331f9..67096fd0671a7 100644
--- components/renderer_context_menu/render_view_context_menu_base.cc --- components/renderer_context_menu/render_view_context_menu_base.cc
+++ 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 { @@ -378,6 +378,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {

16
patch/patches/chrome_browser_dialogs_native.patch
View File

@ -173,10 +173,10 @@ index 2cf473c35b67a..e3552bd0f17d4 100644
raw_ptr<content::WebContents> source_contents_; raw_ptr<content::WebContents> source_contents_;
}; };
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
index 162dbc3aeb4ea..41b73a5a2f4e4 100644 index 024b691522a6d..22bc54db8e4aa 100644
--- ui/shell_dialogs/execute_select_file_win.cc --- ui/shell_dialogs/execute_select_file_win.cc
+++ ui/shell_dialogs/execute_select_file_win.cc +++ ui/shell_dialogs/execute_select_file_win.cc
@@ -290,9 +290,7 @@ bool ExecuteSelectSingleFile(HWND owner, @@ -286,9 +286,7 @@ bool ExecuteSelectSingleFile(HWND owner,
const std::vector<FileFilterSpec>& filter, const std::vector<FileFilterSpec>& filter,
int* filter_index, int* filter_index,
std::vector<base::FilePath>* paths) { std::vector<base::FilePath>* paths) {
@ -187,7 +187,7 @@ index 162dbc3aeb4ea..41b73a5a2f4e4 100644
default_path, filter, 0, filter_index, paths); default_path, filter, 0, filter_index, paths);
} }
@@ -304,14 +302,13 @@ bool ExecuteSelectMultipleFile(HWND owner, @@ -300,14 +298,13 @@ bool ExecuteSelectMultipleFile(HWND owner,
std::vector<base::FilePath>* paths) { std::vector<base::FilePath>* paths) {
DWORD dialog_options = FOS_ALLOWMULTISELECT; DWORD dialog_options = FOS_ALLOWMULTISELECT;
@ -204,7 +204,7 @@ index 162dbc3aeb4ea..41b73a5a2f4e4 100644
const base::FilePath& default_path, const base::FilePath& default_path,
const std::vector<FileFilterSpec>& filter, const std::vector<FileFilterSpec>& filter,
const std::wstring& def_ext, const std::wstring& def_ext,
@@ -324,9 +321,7 @@ bool ExecuteSaveFile(HWND owner, @@ -320,9 +317,7 @@ bool ExecuteSaveFile(HWND owner,
DWORD dialog_options = FOS_OVERWRITEPROMPT; DWORD dialog_options = FOS_OVERWRITEPROMPT;
@ -215,7 +215,7 @@ index 162dbc3aeb4ea..41b73a5a2f4e4 100644
dialog_options, def_ext, filter_index, path); dialog_options, def_ext, filter_index, path);
} }
@@ -418,7 +413,7 @@ void ExecuteSelectFile( @@ -347,7 +342,7 @@ void ExecuteSelectFile(
break; break;
case SelectFileDialog::SELECT_SAVEAS_FILE: { case SelectFileDialog::SELECT_SAVEAS_FILE: {
base::FilePath path; base::FilePath path;
@ -242,7 +242,7 @@ index a622d465ab9e9..b5c11c3117738 100644
return CreateSelectFileDialog(listener, std::move(policy)); return CreateSelectFileDialog(listener, std::move(policy));
} }
diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h
index 8a417fc43a7e4..6d7b065b5b192 100644 index 957ef752be4ba..061a415fd5c36 100644
--- ui/shell_dialogs/select_file_dialog.h --- ui/shell_dialogs/select_file_dialog.h
+++ ui/shell_dialogs/select_file_dialog.h +++ ui/shell_dialogs/select_file_dialog.h
@@ -111,7 +111,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog @@ -111,7 +111,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
@ -325,10 +325,10 @@ index 605c2278407ce..26ca067d32720 100644
std::make_unique<remote_cocoa::SelectFileDialogBridge>(ns_window), std::make_unique<remote_cocoa::SelectFileDialogBridge>(ns_window),
std::move(receiver)); std::move(receiver));
diff --git ui/shell_dialogs/select_file_dialog_win.cc ui/shell_dialogs/select_file_dialog_win.cc diff --git ui/shell_dialogs/select_file_dialog_win.cc ui/shell_dialogs/select_file_dialog_win.cc
index e2959960598a2..477992b18730b 100644 index cf1fee6c8b770..287e9b3ace7cd 100644
--- ui/shell_dialogs/select_file_dialog_win.cc --- ui/shell_dialogs/select_file_dialog_win.cc
+++ ui/shell_dialogs/select_file_dialog_win.cc +++ ui/shell_dialogs/select_file_dialog_win.cc
@@ -248,6 +248,8 @@ void SelectFileDialogImpl::SelectFileImpl( @@ -250,6 +250,8 @@ void SelectFileDialogImpl::SelectFileImpl(
HWND owner = owning_window && owning_window->GetRootWindow() HWND owner = owning_window && owning_window->GetRootWindow()
? owning_window->GetHost()->GetAcceleratedWidget() ? owning_window->GetHost()->GetAcceleratedWidget()
: nullptr; : nullptr;

6
patch/patches/chrome_browser_extensions.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 2fa911da87bcd..45c5268b60d5c 100644 index d1fa9bc7e5494..940756da82704 100644
--- chrome/browser/extensions/api/chrome_extensions_api_client.cc --- chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
@ -10,7 +10,7 @@ index 2fa911da87bcd..45c5268b60d5c 100644
#include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.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/chrome_device_permissions_prompt.h"
#include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h"
@@ -74,6 +75,10 @@ @@ -78,6 +79,10 @@
#include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h" #include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h"
#endif #endif
@ -21,7 +21,7 @@ index 2fa911da87bcd..45c5268b60d5c 100644
#if BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(ENABLE_PDF)
#include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h" #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
#include "components/pdf/browser/pdf_web_contents_helper.h" #include "components/pdf/browser/pdf_web_contents_helper.h"
@@ -294,6 +299,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate( @@ -298,6 +303,9 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
std::unique_ptr<MimeHandlerViewGuestDelegate> std::unique_ptr<MimeHandlerViewGuestDelegate>
ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate( ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
MimeHandlerViewGuest* guest) const { MimeHandlerViewGuest* guest) const {

12
patch/patches/chrome_browser_permission_prompt.patch
View File

@ -61,12 +61,12 @@ index c2836d15eba30..0c03c2b4666a6 100644
// Factory function to create permission prompts for chrome. // Factory function to create permission prompts for chrome.
std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt( std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt(
content::WebContents* web_contents, content::WebContents* web_contents,
diff --git chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc diff --git chrome/browser/ui/views/permissions/permission_prompt_factory.cc chrome/browser/ui/views/permissions/permission_prompt_factory.cc
index c92ad8917ec7f..96643e5904dc5 100644 index eff04a21a7109..daefe93035789 100644
--- chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc --- chrome/browser/ui/views/permissions/permission_prompt_factory.cc
+++ chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc +++ chrome/browser/ui/views/permissions/permission_prompt_factory.cc
@@ -100,11 +100,28 @@ bool ShouldBubbleStartOpen(permissions::PermissionPrompt::Delegate* delegate) { @@ -141,11 +141,28 @@ std::unique_ptr<permissions::PermissionPrompt> CreateQuietPrompt(
return false; }
} }
+CreatePermissionPromptFunctionPtr g_create_permission_prompt_ptr = nullptr; +CreatePermissionPromptFunctionPtr g_create_permission_prompt_ptr = nullptr;

14
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 diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
index 342e29775ddc4..4c4630a2e74d5 100644 index 53643797815c1..35adfd8a39668 100644
--- chrome/browser/profiles/off_the_record_profile_impl.cc --- chrome/browser/profiles/off_the_record_profile_impl.cc
+++ chrome/browser/profiles/off_the_record_profile_impl.cc +++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -646,7 +646,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile( @@ -644,7 +644,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
#endif #endif
if (!profile) if (!profile)
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id); profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@ -14,7 +14,7 @@ index 342e29775ddc4..4c4630a2e74d5 100644
} }
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
index 02a724e47ba2e..4fa0dbefeecbc 100644 index 03dbc7190157c..655979345399f 100644
--- chrome/browser/profiles/profile.cc --- chrome/browser/profiles/profile.cc
+++ chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc
@@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky @@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@ -85,7 +85,7 @@ index ca2561e412621..febd52df6c971 100644
virtual bool IsSignedIn() = 0; virtual bool IsSignedIn() = 0;
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index e4af92bd90459..435fabe79453b 100644 index b1a3fc0249f3f..381d15ff852ef 100644
--- chrome/browser/profiles/profile_impl.cc --- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc
@@ -1002,7 +1002,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -1002,7 +1002,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@ -100,10 +100,10 @@ index e4af92bd90459..435fabe79453b 100644
return raw_otr_profile; return raw_otr_profile;
} }
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 3952344f9cb23..6868beece799d 100644 index ad4a05611f40c..51bd4e39c689a 100644
--- chrome/browser/profiles/profile_manager.cc --- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc
@@ -529,7 +529,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -528,7 +528,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
base::Unretained(this))); base::Unretained(this)));
#endif #endif
@ -113,7 +113,7 @@ index 3952344f9cb23..6868beece799d 100644
zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this, zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index f3c58cfa9b0f8..745bff6a12b66 100644 index 0f3e28ba7dd6e..1a114b4039e47 100644
--- chrome/browser/profiles/profile_manager.h --- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h
@@ -153,7 +153,7 @@ class ProfileManager : public Profile::Delegate { @@ -153,7 +153,7 @@ class ProfileManager : public Profile::Delegate {

4
patch/patches/chrome_browser_safe_browsing.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index 9d43a724104d8..7d8d05cb15c19 100644 index b0476227efb01..c9473a320abd1 100644
--- chrome/browser/safe_browsing/BUILD.gn --- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn
@@ -28,6 +28,7 @@ static_library("safe_browsing") { @@ -29,6 +29,7 @@ static_library("safe_browsing") {
"//components/browser_sync", "//components/browser_sync",
"//components/enterprise:enterprise", "//components/enterprise:enterprise",
"//components/enterprise/common:strings", "//components/enterprise/common:strings",

16
patch/patches/chrome_browser_themes.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index 66acda8e42829..28970c4c98863 100644 index 8ff7b6d7eb813..cdbaff6e4760b 100644
--- chrome/browser/themes/theme_service.cc --- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc +++ chrome/browser/themes/theme_service.cc
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@ -11,8 +11,8 @@ index 66acda8e42829..28970c4c98863 100644
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h" #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
@@ -67,6 +68,10 @@ @@ -67,6 +68,10 @@
#include "ui/color/color_id.h"
#include "ui/color/color_provider.h" #include "ui/color/color_provider.h"
#include "ui/native_theme/native_theme.h"
+#if BUILDFLAG(ENABLE_CEF) +#if BUILDFLAG(ENABLE_CEF)
+#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/extensions/extensions_util.h"
@ -21,7 +21,7 @@ index 66acda8e42829..28970c4c98863 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/scoped_observation.h" #include "base/scoped_observation.h"
#include "extensions/browser/extension_registry_observer.h" #include "extensions/browser/extension_registry_observer.h"
@@ -274,11 +279,19 @@ void ThemeService::Init() { @@ -269,11 +274,19 @@ void ThemeService::Init() {
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be // OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
// constructed in time to observe the corresponding events. // constructed in time to observe the corresponding events.
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
@ -42,7 +42,7 @@ index 66acda8e42829..28970c4c98863 100644
theme_syncable_service_ = theme_syncable_service_ =
std::make_unique<ThemeSyncableService>(profile_, this); std::make_unique<ThemeSyncableService>(profile_, this);
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
index db3162c7ef194..f80a5755876ee 100644 index 47184cef4deff..d68e769f71232 100644
--- chrome/browser/themes/theme_service_factory.cc --- chrome/browser/themes/theme_service_factory.cc
+++ chrome/browser/themes/theme_service_factory.cc +++ chrome/browser/themes/theme_service_factory.cc
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@ -53,8 +53,8 @@ index db3162c7ef194..f80a5755876ee 100644
#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
@@ -30,6 +31,10 @@ @@ -33,6 +34,10 @@
#include "ui/views/linux_ui/linux_ui.h" #include "ui/linux/linux_ui.h"
#endif #endif
+#if BUILDFLAG(ENABLE_CEF) +#if BUILDFLAG(ENABLE_CEF)
@ -64,7 +64,7 @@ index db3162c7ef194..f80a5755876ee 100644
namespace { namespace {
const ThemeHelper& GetThemeHelper() { const ThemeHelper& GetThemeHelper() {
@@ -73,7 +78,15 @@ ThemeServiceFactory::ThemeServiceFactory() @@ -76,7 +81,15 @@ ThemeServiceFactory::ThemeServiceFactory()
BrowserContextDependencyManager::GetInstance()) { BrowserContextDependencyManager::GetInstance()) {
DependsOn(extensions::ExtensionRegistryFactory::GetInstance()); DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
DependsOn(extensions::ExtensionPrefsFactory::GetInstance()); DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
@ -79,4 +79,4 @@ index db3162c7ef194..f80a5755876ee 100644
+ } + }
} }
ThemeServiceFactory::~ThemeServiceFactory() {} ThemeServiceFactory::~ThemeServiceFactory() = default;

12
patch/patches/chrome_plugins.patch
View File

@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644
// that the X-Frame-Options protection mechanism is set to either DENY or // that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN. // SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 8449f4bf57c16..dc68ffc03e817 100644 index f068771f2bd11..320b50a510cd3 100644
--- chrome/renderer/chrome_content_renderer_client.cc --- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc
@@ -949,6 +949,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -948,6 +948,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized || if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) && status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 8449f4bf57c16..dc68ffc03e817 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed( content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) { identifier)) {
status = chrome::mojom::PluginStatus::kAllowed; status = chrome::mojom::PluginStatus::kAllowed;
@@ -1150,7 +1151,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -1149,7 +1150,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface( render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver()); plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 8449f4bf57c16..dc68ffc03e817 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlocked: { case chrome::mojom::PluginStatus::kBlocked: {
@@ -1159,7 +1161,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -1158,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading(); placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -156,7 +156,7 @@ index 8449f4bf57c16..dc68ffc03e817 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlockedByPolicy: { case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1169,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -1168,7 +1171,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name)); group_name));
RenderThread::Get()->RecordAction( RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy")); UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 8449f4bf57c16..dc68ffc03e817 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlockedNoLoading: { case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1177,7 +1181,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -1176,7 +1180,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML, IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name)); group_name));

56
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 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 46ba13e861155..ddc0829036146 100644 index fdf437fb166e3..0f8c198cd5f0e 100644
--- chrome/app/chrome_main_delegate.cc --- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc
@@ -39,6 +39,7 @@ @@ -38,6 +38,7 @@
#include "base/trace_event/trace_event_impl.h" #include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "build/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
@ -10,7 +10,7 @@ index 46ba13e861155..ddc0829036146 100644
#include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h" #include "chrome/browser/chrome_resource_bundle_helper.h"
#include "chrome/browser/defaults.h" #include "chrome/browser/defaults.h"
@@ -447,6 +448,8 @@ struct MainFunction { @@ -449,6 +450,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState(). // Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) { void InitializeUserDataDir(base::CommandLine* command_line) {
@ -19,7 +19,7 @@ index 46ba13e861155..ddc0829036146 100644
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
// Reach out to chrome_elf for the truth on the user data directory. // Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs. // Note that in tests, this links to chrome_elf_test_stubs.
@@ -765,7 +768,9 @@ void ChromeMainDelegate::CommonEarlyInitialization() { @@ -769,7 +772,9 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
} }
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
@ -29,7 +29,7 @@ index 46ba13e861155..ddc0829036146 100644
base::sequence_manager::internal::ThreadControllerPowerMonitor:: base::sequence_manager::internal::ThreadControllerPowerMonitor::
InitializeOnMainThread(); InitializeOnMainThread();
base::InitializePlatformThreadFeatures(); base::InitializePlatformThreadFeatures();
@@ -1097,6 +1102,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1089,6 +1094,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type = std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType); command_line.GetSwitchValueASCII(switches::kProcessType);
@ -37,7 +37,7 @@ index 46ba13e861155..ddc0829036146 100644
crash_reporter::InitializeCrashKeys(); crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_POSIX)
@@ -1107,6 +1113,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1099,6 +1105,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type); InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line); SetUpInstallerPreferences(command_line);
#endif #endif
@ -45,15 +45,15 @@ index 46ba13e861155..ddc0829036146 100644
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
child_process_logging::Init(); child_process_logging::Init();
@@ -1299,6 +1306,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1291,6 +1298,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale; CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
} }
+ if (!cef::IsChromeRuntimeEnabled()) { + if (!cef::IsChromeRuntimeEnabled()) {
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote(). // Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) { if (process_type != switches::kZygoteProcess) {
@@ -1338,6 +1346,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1330,6 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command // After all the platform Breakpads have been initialized, store the command
// line for crash reporting. // line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line); crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -61,7 +61,7 @@ index 46ba13e861155..ddc0829036146 100644
#if BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData(); MaybePatchGdiGetFontData();
@@ -1423,6 +1432,7 @@ void ChromeMainDelegate::ZygoteForked() { @@ -1414,6 +1423,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler(); SetUpProfilingShutdownHandler();
} }
@ -69,7 +69,7 @@ index 46ba13e861155..ddc0829036146 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner. // this up for the browser process in a different manner.
const base::CommandLine* command_line = const base::CommandLine* command_line =
@@ -1439,6 +1449,7 @@ void ChromeMainDelegate::ZygoteForked() { @@ -1430,6 +1440,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process. // Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -78,7 +78,7 @@ index 46ba13e861155..ddc0829036146 100644
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index e1eb07ce9243e..e65781274781b 100644 index b6edac8c3aacf..055f7a10de804 100644
--- chrome/browser/chrome_browser_main.cc --- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
@ -174,10 +174,10 @@ index 7ef669d52b306..8edc1aaeaff6a 100644
+#endif +#endif
} }
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 7082a0c230557..d8e383af3195e 100644 index d4afb0ff30f1a..30f789021b912 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -30,6 +30,7 @@ @@ -31,6 +31,7 @@
#include "base/values.h" #include "base/values.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "build/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
@ -185,7 +185,7 @@ index 7082a0c230557..d8e383af3195e 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/after_startup_task_utils.h"
@@ -1296,6 +1297,8 @@ bool IsTopChromeWebUIURL(const GURL& url) { @@ -1314,6 +1315,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
} // namespace } // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() { ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -194,7 +194,7 @@ index 7082a0c230557..d8e383af3195e 100644
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif #endif
@@ -1321,6 +1324,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { @@ -1339,6 +1342,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear(); extra_parts_.clear();
} }
@ -206,7 +206,7 @@ index 7082a0c230557..d8e383af3195e 100644
// static // static
void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) { PrefRegistrySimple* registry) {
@@ -3842,9 +3850,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( @@ -3871,9 +3879,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite); &search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@ -218,7 +218,7 @@ index 7082a0c230557..d8e383af3195e 100644
} }
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5511,7 +5521,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( @@ -5545,7 +5555,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service); network_service);
} }
@ -227,7 +227,7 @@ index 7082a0c230557..d8e383af3195e 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -5529,6 +5539,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( @@ -5563,6 +5573,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale(); network_context_params->accept_language = GetApplicationLocale();
} }
@ -236,7 +236,7 @@ index 7082a0c230557..d8e383af3195e 100644
} }
std::vector<base::FilePath> std::vector<base::FilePath>
@@ -6395,10 +6407,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( @@ -6415,10 +6427,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context); const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -249,7 +249,7 @@ index 7082a0c230557..d8e383af3195e 100644
FROM_HERE, keepalive_deadline_ - now, FROM_HERE, keepalive_deadline_ - now,
base::BindOnce( base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired, &ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6417,7 +6429,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { @@ -6437,7 +6449,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_; --num_keepalive_requests_;
if (num_keepalive_requests_ == 0) { if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer"; DVLOG(1) << "Stopping the keepalive timer";
@ -259,7 +259,7 @@ index 7082a0c230557..d8e383af3195e 100644
// This deletes the keep alive handle attached to the timer function and // This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence. // unblock the shutdown sequence.
} }
@@ -6542,7 +6555,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( @@ -6562,7 +6575,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_; const auto then = keepalive_deadline_;
if (now < then) { if (now < then) {
@ -269,10 +269,10 @@ index 7082a0c230557..d8e383af3195e 100644
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 0e7fd68eb1775..b2d1f9a5d9671 100644 index 00a4d7e9818c9..3691b1e5d929f 100644
--- chrome/browser/chrome_content_browser_client.h --- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h
@@ -119,6 +119,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
~ChromeContentBrowserClient() override; ~ChromeContentBrowserClient() override;
@ -281,7 +281,7 @@ index 0e7fd68eb1775..b2d1f9a5d9671 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out // 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 // 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. // functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -579,7 +581,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -578,7 +580,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override; override;
void OnNetworkServiceCreated( void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override; network::mojom::NetworkService* network_service) override;
@ -290,7 +290,7 @@ index 0e7fd68eb1775..b2d1f9a5d9671 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -928,7 +930,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -922,7 +924,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0; uint64_t num_keepalive_requests_ = 0;
@ -300,7 +300,7 @@ index 0e7fd68eb1775..b2d1f9a5d9671 100644
#endif #endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 346d0636aad58..969f6e42371fa 100644 index b5c7f1d328446..50a676519853c 100644
--- chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -322,7 +322,7 @@ index 346d0636aad58..969f6e42371fa 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1351,6 +1356,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1355,6 +1360,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry); SessionDataService::RegisterProfilePrefs(registry);
#endif #endif

52
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 diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 4013ab3ce380b..3ea8492f4c977 100644 index 20fcf6172c577..d34843570fa35 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
@@ -415,8 +415,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -412,8 +412,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// CommandUpdaterDelegate and CommandUpdater declare this function so we // CommandUpdaterDelegate and CommandUpdater declare this function so we
// choose to not implement CommandUpdaterDelegate inside this class and // choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set). // therefore command_updater_ doesn't have the delegate set).
@ -14,7 +14,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
// No commands are enabled if there is not yet any selected tab. // No commands are enabled if there is not yet any selected tab.
// TODO(pkasting): It seems like we should not need this, because either // TODO(pkasting): It seems like we should not need this, because either
@@ -431,6 +433,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -428,6 +430,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id)) DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id; << "Invalid/disabled command " << id;
@ -28,7 +28,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
// The order of commands in this switch statement must match the function // The order of commands in this switch statement must match the function
// declaration order in browser.h! // declaration order in browser.h!
switch (id) { switch (id) {
@@ -1076,11 +1085,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( @@ -1073,11 +1082,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private: // BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() { bool BrowserCommandController::IsShowingMainUI() {
@ -45,7 +45,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const { bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 95d3053a5af11..b726ea28700de 100644 index f3cc4af3bdae4..442eb363709d2 100644
--- chrome/browser/ui/views/frame/browser_frame.cc --- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) { @@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@ -180,10 +180,10 @@ index 9bd586697dece..80ef1f08cb463 100644
BrowserFrame(const BrowserFrame&) = delete; BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(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 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index a6f5515c7259d..51da31a2afe91 100644 index 4d7516e88120d..fe0d815b0764a 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
@@ -302,11 +302,10 @@ using content::NativeWebKeyboardEvent; @@ -304,11 +304,10 @@ using content::NativeWebKeyboardEvent;
using content::WebContents; using content::WebContents;
using web_modal::WebContentsModalDialogHost; using web_modal::WebContentsModalDialogHost;
@ -198,7 +198,7 @@ index a6f5515c7259d..51da31a2afe91 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation. // UMA histograms that record animation smoothness for tab loading animation.
@@ -793,11 +792,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver { @@ -799,11 +798,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// BrowserView, public: // BrowserView, public:
@ -222,7 +222,7 @@ index a6f5515c7259d..51da31a2afe91 100644
SetShowIcon( SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay())); ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -839,7 +849,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -845,7 +855,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
} }
browser_->tab_strip_model()->AddObserver(this); browser_->tab_strip_model()->AddObserver(this);
@ -230,7 +230,7 @@ index a6f5515c7259d..51da31a2afe91 100644
// Top container holds tab strip region and toolbar and lives at the front of // Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy. // the view hierarchy.
@@ -882,8 +891,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -890,8 +899,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>( contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_)); devtools_web_view_, contents_web_view_));
@ -248,7 +248,7 @@ index a6f5515c7259d..51da31a2afe91 100644
contents_separator_ = contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>()); top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1785,6 +1801,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { @@ -1802,6 +1818,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled()) if (immersive_mode_controller_->IsEnabled())
return false; return false;
@ -257,7 +257,7 @@ index a6f5515c7259d..51da31a2afe91 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
} }
@@ -3037,7 +3055,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { @@ -3064,7 +3082,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
} }
void BrowserView::ReparentTopContainerForEndOfImmersive() { void BrowserView::ReparentTopContainerForEndOfImmersive() {
@ -267,7 +267,7 @@ index a6f5515c7259d..51da31a2afe91 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -3549,8 +3568,10 @@ void BrowserView::Layout() { @@ -3576,8 +3595,10 @@ void BrowserView::Layout() {
// 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(
@ -280,7 +280,7 @@ index a6f5515c7259d..51da31a2afe91 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.
@@ -3616,6 +3637,11 @@ void BrowserView::AddedToWidget() { @@ -3643,6 +3664,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@ -292,7 +292,7 @@ index a6f5515c7259d..51da31a2afe91 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button // TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3677,13 +3703,9 @@ void BrowserView::AddedToWidget() { @@ -3704,13 +3730,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();
@ -308,7 +308,7 @@ index a6f5515c7259d..51da31a2afe91 100644
using_native_frame_ = frame_->ShouldUseNativeFrame(); using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
@@ -4091,7 +4113,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, @@ -4118,7 +4140,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// 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);
@ -318,7 +318,7 @@ index a6f5515c7259d..51da31a2afe91 100644
} }
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4406,6 +4429,8 @@ Profile* BrowserView::GetProfile() { @@ -4433,6 +4456,8 @@ Profile* BrowserView::GetProfile() {
} }
void BrowserView::UpdateUIForTabFullscreen() { void BrowserView::UpdateUIForTabFullscreen() {
@ -327,7 +327,7 @@ index a6f5515c7259d..51da31a2afe91 100644
frame()->GetFrameView()->UpdateFullscreenTopUI(); frame()->GetFrameView()->UpdateFullscreenTopUI();
} }
@@ -4428,6 +4453,8 @@ void BrowserView::HideDownloadShelf() { @@ -4455,6 +4480,8 @@ void BrowserView::HideDownloadShelf() {
} }
bool BrowserView::CanUserExitFullscreen() const { bool BrowserView::CanUserExitFullscreen() const {
@ -337,7 +337,7 @@ index a6f5515c7259d..51da31a2afe91 100644
} }
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 0fad4aa723c84..077df40dc4762 100644 index fb4fa467f9d2a..cbf3d48166d8f 100644
--- chrome/browser/ui/views/frame/browser_view.h --- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h
@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow, @@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
@ -357,7 +357,7 @@ index 0fad4aa723c84..077df40dc4762 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; } void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; } BrowserFrame* frame() const { return frame_; }
@@ -742,6 +747,12 @@ class BrowserView : public BrowserWindow, @@ -747,6 +752,12 @@ class BrowserView : public BrowserWindow,
// aligned side panels. // aligned side panels.
void RightAlignedSidePanelWasClosed(); void RightAlignedSidePanelWasClosed();
@ -371,10 +371,10 @@ index 0fad4aa723c84..077df40dc4762 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable. // 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 diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index 1db5f517e7bfb..981b4321f6aa9 100644 index 432a9f31b6558..0bb23e8caa77c 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc --- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc +++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -42,6 +42,10 @@ @@ -45,6 +45,10 @@
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
#include "ui/views/window/client_view.h" #include "ui/views/window/client_view.h"
@ -385,7 +385,7 @@ index 1db5f517e7bfb..981b4321f6aa9 100644
using views::View; using views::View;
using web_modal::WebContentsModalDialogHost; using web_modal::WebContentsModalDialogHost;
using web_modal::ModalDialogHostObserver; using web_modal::ModalDialogHostObserver;
@@ -463,6 +467,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { @@ -466,6 +470,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
int BrowserViewLayout::LayoutToolbar(int top) { int BrowserViewLayout::LayoutToolbar(int top) {
TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar"); TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar");
@ -414,10 +414,10 @@ index bc047256f110a..b6bc9dfc0eee5 100644
ContentsWebView::~ContentsWebView() { ContentsWebView::~ContentsWebView() {
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 5a7767fc35042..681171bc557ba 100644 index 4ce6220af8f31..5ffe7ee08f2bb 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
@@ -552,33 +552,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( @@ -558,33 +558,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
} }
bool BrowserTabStripController::IsFrameCondensed() const { bool BrowserTabStripController::IsFrameCondensed() const {
@ -466,7 +466,7 @@ index 5a7767fc35042..681171bc557ba 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 55fc13d5d929d..236eaebed8d1b 100644 index ef34f041219b5..79e83f9214a36 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
@@ -169,12 +169,13 @@ auto& GetViewCommandMap() { @@ -169,12 +169,13 @@ auto& GetViewCommandMap() {

8
patch/patches/component_build.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index efea37465c849..340bd6b9b03ba 100644 index 89885a692db37..de0dff6608a6e 100644
--- content/browser/devtools/devtools_instrumentation.h --- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h +++ content/browser/devtools/devtools_instrumentation.h
@@ -97,7 +97,7 @@ bool ApplyUserAgentMetadataOverrides( @@ -97,7 +97,7 @@ bool ApplyUserAgentMetadataOverrides(
@ -55,12 +55,12 @@ index 3f0f719a192db..5fb3754cced7e 100644
explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host); explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h
index 57072bf1263ae..0a93446e4d21c 100644 index 47eb7528594fc..dbb486a323c1c 100644
--- content/common/content_switches_internal.h --- content/common/content_switches_internal.h
+++ content/common/content_switches_internal.h +++ content/common/content_switches_internal.h
@@ -15,7 +15,7 @@ class CommandLine; @@ -17,7 +17,7 @@ namespace content {
namespace content { extern const char kFirstRendererProcess[];
-bool IsPinchToZoomEnabled(); -bool IsPinchToZoomEnabled();
+CONTENT_EXPORT bool IsPinchToZoomEnabled(); +CONTENT_EXPORT bool IsPinchToZoomEnabled();

34
patch/patches/content_2015.patch
View File

@ -12,7 +12,7 @@ index b75e19e7946b0..a92a7da426081 100644
GetContentClient()->browser()->GetUserAgent()); GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING); 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 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 7e8b016df5234..97196faf4c41e 100644 index 4f8967e57bbc3..281af1ce0c1cd 100644
--- content/browser/loader/navigation_url_loader_impl.cc --- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -718,6 +718,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( @@ -718,6 +718,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@ -34,19 +34,19 @@ index 7e8b016df5234..97196faf4c41e 100644
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>( factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory)); std::move(loader_factory));
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index b4e2e5d8a5e96..8f90190b7c5e6 100644 index 5f50e84d4539c..5a0fc87d70ac2 100644
--- content/public/browser/content_browser_client.cc --- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
// declarations instead of including more headers. If that is infeasible, adjust // declarations instead of including more headers. If that is infeasible, adjust
// the limit. For more info, see // the limit. For more info, see
// https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
-#pragma clang max_tokens_here 1050000 -#pragma clang max_tokens_here 1110000
+// #pragma clang max_tokens_here 1050000 +// #pragma clang max_tokens_here 1110000
#include <utility> #include <utility>
@@ -937,7 +937,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( @@ -938,7 +938,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated( void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {} network::mojom::NetworkService* network_service) {}
@ -55,7 +55,7 @@ index b4e2e5d8a5e96..8f90190b7c5e6 100644
BrowserContext* context, BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -946,6 +946,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( @@ -947,6 +947,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) { cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en"; network_context_params->accept_language = "en-us,en";
@ -64,7 +64,7 @@ index b4e2e5d8a5e96..8f90190b7c5e6 100644
std::vector<base::FilePath> std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index b374d6b28aea8..6587b5edf60fa 100644 index 614766cd642ef..650bf1d5010f8 100644
--- content/public/browser/content_browser_client.h --- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
@ -75,7 +75,7 @@ index b374d6b28aea8..6587b5edf60fa 100644
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h" #include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
#include "content/public/common/page_visibility_state.h" #include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h" #include "content/public/common/window_container_type.mojom-forward.h"
@@ -1715,7 +1716,7 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1720,7 +1721,7 @@ class CONTENT_EXPORT ContentBrowserClient {
// //
// If |relative_partition_path| is the empty string, it means this needs to // If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext. // create the default NetworkContext for the BrowserContext.
@ -84,7 +84,7 @@ index b374d6b28aea8..6587b5edf60fa 100644
BrowserContext* context, BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -1922,6 +1923,19 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1927,6 +1928,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document, RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory); mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -104,7 +104,7 @@ index b374d6b28aea8..6587b5edf60fa 100644
// Creates an OverlayWindow to be used for video or document // Creates an OverlayWindow to be used for video or document
// Picture-in-Picture respectively. This window will house the content shown // Picture-in-Picture respectively. This window will house the content shown
// when in Picture-in-Picture mode. This will return a new OverlayWindow. // when in Picture-in-Picture mode. This will return a new OverlayWindow.
@@ -1977,6 +1991,10 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1982,6 +1996,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string. // Used as part of the user agent string.
virtual std::string GetProduct(); virtual std::string GetProduct();
@ -116,7 +116,7 @@ index b374d6b28aea8..6587b5edf60fa 100644
// on blink::features::kUserAgentReduction. Content may cache this value. // on blink::features::kUserAgentReduction. Content may cache this value.
virtual std::string GetUserAgent(); virtual std::string GetUserAgent();
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index 1dfe162dc69f4..93ece5d24f60f 100644 index d1fa110e7ccdc..9059f32dcc59e 100644
--- content/public/renderer/content_renderer_client.h --- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h
@@ -92,6 +92,9 @@ class CONTENT_EXPORT ContentRendererClient { @@ -92,6 +92,9 @@ class CONTENT_EXPORT ContentRendererClient {
@ -141,10 +141,10 @@ index 1dfe162dc69f4..93ece5d24f60f 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 2f86fff71f363..2ac7ab2a9a096 100644 index 914ecfff4bcec..e15a5729c275f 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -608,6 +608,8 @@ void RenderThreadImpl::Init() { @@ -610,6 +610,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider( GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame); blink::URLLoaderThrottleProviderType::kFrame);
@ -154,10 +154,10 @@ index 2f86fff71f363..2ac7ab2a9a096 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index a5f2807bfa3bd..0f03da05909ff 100644 index e6ed59bb367c2..9d22273c1d87c 100644
--- content/renderer/renderer_blink_platform_impl.cc --- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc
@@ -1053,6 +1053,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { @@ -1017,6 +1017,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -174,10 +174,10 @@ index a5f2807bfa3bd..0f03da05909ff 100644
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() { RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
return std::make_unique<V8ValueConverterImpl>(); return std::make_unique<V8ValueConverterImpl>();
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 40146f89d1d94..4aaecc4e319bf 100644 index 62370f36f8b19..634a062bc453c 100644
--- content/renderer/renderer_blink_platform_impl.h --- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h
@@ -238,6 +238,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -228,6 +228,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override; blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
base::PlatformThreadId GetIOThreadId() const override; base::PlatformThreadId GetIOThreadId() const override;

4
patch/patches/content_main_654986.patch
View File

@ -105,7 +105,7 @@ index b54d534b4d408..3c3bd4a62a799 100644
} }
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 88e46d8d05c0b..c026c09415512 100644 index ed19f7f1a283d..9c2deb8d0ff66 100644
--- content/app/content_main_runner_impl.cc --- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc +++ content/app/content_main_runner_impl.cc
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
@ -116,7 +116,7 @@ index 88e46d8d05c0b..c026c09415512 100644
#include "base/time/time.h" #include "base/time/time.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "build/build_config.h" #include "build/build_config.h"
@@ -1219,6 +1220,12 @@ void ContentMainRunnerImpl::Shutdown() { @@ -1227,6 +1228,12 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true; is_shutdown_ = true;
} }

46
patch/patches/crashpad_1995.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
index da34cf911b74d..d5c8ca11be3fc 100644 index 9d96774f5f3de..51c1d85178604 100644
--- chrome/chrome_elf/BUILD.gn --- chrome/chrome_elf/BUILD.gn
+++ chrome/chrome_elf/BUILD.gn +++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@ -20,7 +20,7 @@ index da34cf911b74d..d5c8ca11be3fc 100644
"crash/crash_helper.cc", "crash/crash_helper.cc",
"crash/crash_helper.h", "crash/crash_helper.h",
] ]
@@ -116,6 +114,7 @@ static_library("crash") { @@ -117,6 +115,7 @@ static_library("crash") {
":hook_util", ":hook_util",
"//base", # This needs to go. DEP of app, crash_keys, client. "//base", # This needs to go. DEP of app, crash_keys, client.
"//base:base_static", # pe_image "//base:base_static", # pe_image
@ -28,7 +28,7 @@ index da34cf911b74d..d5c8ca11be3fc 100644
"//chrome/install_static:install_static_util", "//chrome/install_static:install_static_util",
"//components/crash/core/app", "//components/crash/core/app",
"//components/crash/core/common", # crash_keys "//components/crash/core/common", # crash_keys
@@ -123,6 +122,17 @@ static_library("crash") { @@ -124,6 +123,17 @@ static_library("crash") {
"//content/public/common:result_codes", "//content/public/common:result_codes",
"//third_party/crashpad/crashpad/client", # DumpWithoutCrash "//third_party/crashpad/crashpad/client", # DumpWithoutCrash
] ]
@ -136,10 +136,10 @@ index e2d53ac83dde0..6ac76e407a748 100644
// on the given |command_line|. // on the given |command_line|.
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line); void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
index 82b7f241e2618..525f1efe5aa6a 100644 index 463f92a6e5470..99e70307f180e 100644
--- components/crash/core/app/crash_reporter_client.cc --- components/crash/core/app/crash_reporter_client.cc
+++ components/crash/core/app/crash_reporter_client.cc +++ components/crash/core/app/crash_reporter_client.cc
@@ -89,7 +89,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() { @@ -93,7 +93,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
} }
#endif #endif
@ -148,7 +148,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
void CrashReporterClient::GetProductNameAndVersion(const char** product_name, void CrashReporterClient::GetProductNameAndVersion(const char** product_name,
const char** version) { const char** version) {
} }
@@ -98,6 +98,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name, @@ -102,6 +102,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
std::string* version, std::string* version,
std::string* channel) {} std::string* channel) {}
@ -156,7 +156,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
base::FilePath CrashReporterClient::GetReporterLogFilename() { base::FilePath CrashReporterClient::GetReporterLogFilename() {
return base::FilePath(); return base::FilePath();
} }
@@ -107,6 +108,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename, @@ -111,6 +112,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
return false; return false;
} }
#endif #endif
@ -164,7 +164,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
bool CrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) { bool CrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
@@ -141,6 +143,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) { @@ -145,6 +147,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
return false; return false;
} }
@ -193,7 +193,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
unsigned int CrashReporterClient::GetCrashDumpPercentage() { unsigned int CrashReporterClient::GetCrashDumpPercentage() {
return 100; return 100;
@@ -203,9 +227,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() { @@ -207,9 +231,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
return false; return false;
} }
@ -204,7 +204,7 @@ index 82b7f241e2618..525f1efe5aa6a 100644
- -
} // namespace crash_reporter } // namespace crash_reporter
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
index 24e53fa62c2c4..ffc72f79d67b0 100644 index 2532e99f00b39..c39256296c50d 100644
--- components/crash/core/app/crash_reporter_client.h --- components/crash/core/app/crash_reporter_client.h
+++ components/crash/core/app/crash_reporter_client.h +++ components/crash/core/app/crash_reporter_client.h
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
@ -217,7 +217,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
#include "build/build_config.h" #include "build/build_config.h"
@@ -89,7 +91,7 @@ class CrashReporterClient { @@ -94,7 +96,7 @@ class CrashReporterClient {
virtual bool GetShouldDumpLargerDumps(); virtual bool GetShouldDumpLargerDumps();
#endif #endif
@ -226,7 +226,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
// Returns a textual description of the product type and version to include // Returns a textual description of the product type and version to include
// in the crash report. Neither out parameter should be set to NULL. // in the crash report. Neither out parameter should be set to NULL.
// TODO(jperaza): Remove the 2-parameter overload of this method once all // TODO(jperaza): Remove the 2-parameter overload of this method once all
@@ -100,6 +102,7 @@ class CrashReporterClient { @@ -105,6 +107,7 @@ class CrashReporterClient {
std::string* version, std::string* version,
std::string* channel); std::string* channel);
@ -234,7 +234,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
virtual base::FilePath GetReporterLogFilename(); virtual base::FilePath GetReporterLogFilename();
// Custom crash minidump handler after the minidump is generated. // Custom crash minidump handler after the minidump is generated.
@@ -109,6 +112,7 @@ class CrashReporterClient { @@ -114,6 +117,7 @@ class CrashReporterClient {
// libc nor allocate memory normally. // libc nor allocate memory normally.
virtual bool HandleCrashDump(const char* crashdump_filename, virtual bool HandleCrashDump(const char* crashdump_filename,
uint64_t crash_pid); uint64_t crash_pid);
@ -242,7 +242,7 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
#endif #endif
// The location where minidump files should be written. Returns true if // The location where minidump files should be written. Returns true if
@@ -206,6 +210,20 @@ class CrashReporterClient { @@ -211,6 +215,20 @@ class CrashReporterClient {
// Returns true if breakpad should run in the given process type. // Returns true if breakpad should run in the given process type.
virtual bool EnableBreakpadForProcess(const std::string& process_type); virtual bool EnableBreakpadForProcess(const std::string& process_type);
@ -264,10 +264,10 @@ index 24e53fa62c2c4..ffc72f79d67b0 100644
} // namespace crash_reporter } // namespace crash_reporter
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index 9058d56e8bda7..6a62596c03a52 100644 index 34abee33b74b7..1a67519bb305b 100644
--- components/crash/core/app/crashpad.cc --- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc +++ components/crash/core/app/crashpad.cc
@@ -154,7 +154,8 @@ bool InitializeCrashpadImpl(bool initial_client, @@ -157,7 +157,8 @@ bool InitializeCrashpadImpl(bool initial_client,
// fallback. Forwarding is turned off for debug-mode builds even for the // fallback. Forwarding is turned off for debug-mode builds even for the
// browser process, because the system's crash reporter can take a very long // browser process, because the system's crash reporter can take a very long
// time to chew on symbols. // time to chew on symbols.
@ -454,10 +454,10 @@ index dc041c43371fd..1d060ae55c586 100644
handler_path, *database_path, metrics_path, url, handler_path, *database_path, metrics_path, url,
GetProcessSimpleAnnotations(), arguments, true, false); GetProcessSimpleAnnotations(), arguments, true, false);
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
index 80f33dc5e2f2e..277c336a90668 100644 index ad401a7711cef..0b10f904549bb 100644
--- components/crash/core/app/crashpad_win.cc --- components/crash/core/app/crashpad_win.cc
+++ components/crash/core/app/crashpad_win.cc +++ components/crash/core/app/crashpad_win.cc
@@ -35,8 +35,8 @@ void GetPlatformCrashpadAnnotations( @@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
std::wstring product_name, version, special_build, channel_name; std::wstring product_name, version, special_build, channel_name;
crash_reporter_client->GetProductNameAndVersion( crash_reporter_client->GetProductNameAndVersion(
exe_file, &product_name, &version, &special_build, &channel_name); exe_file, &product_name, &version, &special_build, &channel_name);
@ -468,7 +468,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Empty means stable. // Empty means stable.
const bool allow_empty_channel = true; const bool allow_empty_channel = true;
@@ -53,9 +53,11 @@ void GetPlatformCrashpadAnnotations( @@ -54,9 +54,11 @@ void GetPlatformCrashpadAnnotations(
if (!special_build.empty()) if (!special_build.empty())
(*annotations)["special"] = base::WideToUTF8(special_build); (*annotations)["special"] = base::WideToUTF8(special_build);
#if defined(ARCH_CPU_X86) #if defined(ARCH_CPU_X86)
@ -482,7 +482,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
#endif #endif
} }
@@ -70,7 +72,9 @@ bool PlatformCrashpadInitialization( @@ -71,7 +73,9 @@ bool PlatformCrashpadInitialization(
base::FilePath metrics_path; // Only valid in the browser process. base::FilePath metrics_path; // Only valid in the browser process.
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME"; const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
@ -492,7 +492,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
std::unique_ptr<base::Environment> env(base::Environment::Create()); std::unique_ptr<base::Environment> env(base::Environment::Create());
CrashReporterClient* crash_reporter_client = GetCrashReporterClient(); CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -93,9 +97,11 @@ bool PlatformCrashpadInitialization( @@ -94,9 +98,11 @@ bool PlatformCrashpadInitialization(
std::string url = crash_reporter_client->GetUploadUrl(); std::string url = crash_reporter_client->GetUploadUrl();
@ -504,7 +504,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
base::FilePath exe_file(exe_path); base::FilePath exe_file(exe_path);
if (exe_file.empty()) { if (exe_file.empty()) {
@@ -106,13 +112,14 @@ bool PlatformCrashpadInitialization( @@ -107,13 +113,14 @@ bool PlatformCrashpadInitialization(
exe_file = base::FilePath(exe_file_path); exe_file = base::FilePath(exe_file_path);
} }
@ -524,7 +524,7 @@ index 80f33dc5e2f2e..277c336a90668 100644
if (!user_data_dir.empty()) { if (!user_data_dir.empty()) {
start_arguments.push_back(std::string("--user-data-dir=") + start_arguments.push_back(std::string("--user-data-dir=") +
user_data_dir); user_data_dir);
@@ -123,9 +130,12 @@ bool PlatformCrashpadInitialization( @@ -124,9 +131,12 @@ bool PlatformCrashpadInitialization(
start_arguments.push_back("/prefetch:7"); start_arguments.push_back("/prefetch:7");
} else { } else {
base::FilePath exe_dir = exe_file.DirName(); base::FilePath exe_dir = exe_file.DirName();

6
patch/patches/crashpad_tp_1995.patch
View File

@ -130,10 +130,10 @@ index eef24f71495fd..d3a273d369097 100644
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
FileHandle file, FileHandle file,
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
index 8ad8a2b16f648..adaede06e8b86 100644 index e4a5cedc43854..56becc7d57530 100644
--- third_party/crashpad/crashpad/client/settings.h --- third_party/crashpad/crashpad/client/settings.h
+++ third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h
@@ -120,6 +120,11 @@ class Settings { @@ -128,6 +128,11 @@ class Settings {
//! error logged. //! error logged.
bool SetLastUploadAttemptTime(time_t time); bool SetLastUploadAttemptTime(time_t time);
@ -184,7 +184,7 @@ index e79f4719b3dd0..22a20aede8100 100644
if (crashpad_is_win) { if (crashpad_is_win) {
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
index 138cf80026c98..d4af1f0c38d76 100644 index 4d1548dbf88d8..59e41b79c5de9 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( @@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(

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 diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index fd99a0b94d9ef..2be6208db60ba 100644 index 6eb4847667c19..2cb4e822e9864 100644
--- components/embedder_support/user_agent_utils.cc --- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
@ -10,7 +10,7 @@ index fd99a0b94d9ef..2be6208db60ba 100644
#include "components/embedder_support/pref_names.h" #include "components/embedder_support/pref_names.h"
#include "components/embedder_support/switches.h" #include "components/embedder_support/switches.h"
#include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_pref_names.h"
@@ -344,6 +345,12 @@ std::string GetMajorVersionForUserAgentString( @@ -358,6 +359,12 @@ std::string GetMajorVersionForUserAgentString(
std::string GetProductAndVersion( std::string GetProductAndVersion(
ForceMajorVersionToMinorPosition force_major_to_minor, ForceMajorVersionToMinorPosition force_major_to_minor,
UserAgentReductionEnterprisePolicyState user_agent_reduction) { UserAgentReductionEnterprisePolicyState user_agent_reduction) {

4
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 diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 2f5f7a7645103..9ab6fc1d4a654 100644 index b2095ffc3fc11..371d5030de6e0 100644
--- chrome/browser/extensions/api/streams_private/streams_private_api.cc --- chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
@ -8,7 +8,7 @@ index 2f5f7a7645103..9ab6fc1d4a654 100644
+#include "cef/libcef/features/runtime.h" +#include "cef/libcef/features/runtime.h"
#include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h" #include "chrome/browser/preloading/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_contents.h" #include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
@@ -18,6 +19,10 @@ @@ -18,6 +19,10 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"

4
patch/patches/gn_config.patch
View File

@ -12,7 +12,7 @@ index 7d538f812d72e..9eec79395aeec 100644
# https://crbug.com/474506. # https://crbug.com/474506.
"//clank/java/BUILD.gn", "//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn diff --git BUILD.gn BUILD.gn
index d62cd5190001b..b99513183df7a 100644 index 4efccb3390c72..dd3a250ac89e5 100644
--- BUILD.gn --- BUILD.gn
+++ BUILD.gn +++ BUILD.gn
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni") @@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -80,7 +80,7 @@ index 839144aa1e9bd..29c8ab32398a7 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+ +
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index ba559fa404ca3..4aafa07ba5ba7 100644 index 5691ef5e9c7e5..cb3ebcf03151c 100644
--- chrome/chrome_paks.gni --- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni +++ chrome/chrome_paks.gni
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni") @@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")

4
patch/patches/gritsettings.patch
View File

@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index 1c50dbb9503e7..a181ad353e81a 100644 index 70c5134c185bf..7f102a2538687 100644
--- tools/gritsettings/resource_ids.spec --- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec
@@ -970,6 +970,15 @@ @@ -974,6 +974,15 @@
# END "everything else" section. # END "everything else" section.
# Everything but chrome/, components/, content/, and ios/ # Everything but chrome/, components/, content/, and ios/

2
patch/patches/linux_bluetooth_1319006.patch
View File

@ -1,5 +1,5 @@
diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
index cff62632e8b48..7213089279251 100644 index d559b5c6c3d67..7a4fd1c877b81 100644
--- device/bluetooth/BUILD.gn --- device/bluetooth/BUILD.gn
+++ device/bluetooth/BUILD.gn +++ device/bluetooth/BUILD.gn
@@ -45,13 +45,6 @@ source_set("deprecated_experimental_mojo") { @@ -45,13 +45,6 @@ source_set("deprecated_experimental_mojo") {

174
patch/patches/linux_printing_context.patch
View File

@ -1,31 +1,175 @@
diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc
index 805156b4d7b70..2fbf7fecef01f 100644 index c8673eaee484b..d7026cd38df11 100644
--- printing/printing_context_linux.cc --- printing/printing_context_linux.cc
+++ printing/printing_context_linux.cc +++ printing/printing_context_linux.cc
@@ -48,9 +48,11 @@ PrintingContextLinux::~PrintingContextLinux() { @@ -25,6 +25,12 @@
}
namespace printing {
+namespace {
+
+static PrintingContextLinuxDelegate* g_delegate = nullptr;
+
+} // namespace
+
// static // static
-void PrintingContextLinuxDelegate::SetInstance( std::unique_ptr<PrintingContext> PrintingContext::CreateImpl(
+PrintingContextLinuxDelegate* PrintingContextLinuxDelegate::SetInstance( Delegate* delegate,
PrintingContextLinuxDelegate* delegate) { @@ -47,6 +53,14 @@ PrintingContextLinux::~PrintingContextLinux() {
+ auto old_delegate = g_delegate; print_dialog_->ReleaseDialog();
g_delegate = delegate;
+ return old_delegate;
} }
+// static
+PrintingContextLinuxDelegate* PrintingContextLinuxDelegate::SetInstance(
+ PrintingContextLinuxDelegate* delegate) {
+ auto old_delegate = g_delegate;
+ g_delegate = delegate;
+ return old_delegate;
+}
+
void PrintingContextLinux::AskUserForSettings(int max_pages, void PrintingContextLinux::AskUserForSettings(int max_pages,
bool has_selection,
bool is_scripted,
@@ -68,23 +82,19 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
ResetSettings();
-#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!g_delegate)
return mojom::ResultCode::kSuccess;
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = g_delegate->CreatePrintDialog(this);
print_dialog_->UseDefaultSettings();
-#endif
return mojom::ResultCode::kSuccess;
}
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
-#if BUILDFLAG(IS_LINUX)
- if (ui::LinuxUi::instance())
- return ui::LinuxUi::instance()->GetPdfPaperSize(this);
-#endif
+ if (g_delegate)
+ return g_delegate->GetPdfPaperSize(this);
return gfx::Size();
}
@@ -94,18 +104,16 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
DCHECK(!printer_settings.show_system_dialog);
DCHECK(!in_print_job_);
-#if BUILDFLAG(IS_LINUX)
- if (!ui::LinuxUi::instance())
+ if (!g_delegate)
return mojom::ResultCode::kSuccess;
if (!print_dialog_)
- print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
+ print_dialog_ = g_delegate->CreatePrintDialog(this);
// PrintDialogGtk::UpdateSettings() calls InitWithSettings() so settings_ will
// remain non-null after this line.
print_dialog_->UpdateSettings(std::move(settings_));
DCHECK(settings_);
-#endif
return mojom::ResultCode::kSuccess;
}
diff --git printing/printing_context_linux.h printing/printing_context_linux.h diff --git printing/printing_context_linux.h printing/printing_context_linux.h
index dfe49bc00adea..3faa2a3dff79d 100644 index 0e2f451ac050f..3faa2a3dff79d 100644
--- printing/printing_context_linux.h --- printing/printing_context_linux.h
+++ printing/printing_context_linux.h +++ printing/printing_context_linux.h
@@ -27,7 +27,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextLinuxDelegate { @@ -16,6 +16,20 @@ namespace printing {
virtual gfx::Size GetPdfPaperSize(PrintingContextLinux* context) = 0; class MetafilePlayer;
class PrintDialogLinuxInterface;
- static void SetInstance(PrintingContextLinuxDelegate* delegate); +class PrintingContextLinux;
+
+class COMPONENT_EXPORT(PRINTING) PrintingContextLinuxDelegate {
+ public:
+ virtual ~PrintingContextLinuxDelegate() = default;
+
+ virtual PrintDialogLinuxInterface* CreatePrintDialog(
+ PrintingContextLinux* context) = 0;
+
+ virtual gfx::Size GetPdfPaperSize(PrintingContextLinux* context) = 0;
+
+ static PrintingContextLinuxDelegate* SetInstance( + static PrintingContextLinuxDelegate* SetInstance(
+ PrintingContextLinuxDelegate* delegate); + PrintingContextLinuxDelegate* delegate);
}; +};
// PrintingContext with optional native UI for print dialog and pdf_paper_size. // PrintingContext with optional native UI for print dialog and pdf_paper_size.
class COMPONENT_EXPORT(PRINTING) PrintingContextLinux : public PrintingContext {
diff --git ui/linux/BUILD.gn ui/linux/BUILD.gn
index 48b78fe4b8b68..063131c2cb782 100644
--- ui/linux/BUILD.gn
+++ ui/linux/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/linux/gtk/gtk.gni")
+import("//printing/buildflags/buildflags.gni")
import("//ui/qt/qt.gni")
assert(is_linux)
diff --git ui/linux/linux_ui.cc ui/linux/linux_ui.cc
index bae51eec69a8d..8675048b9117f 100644
--- ui/linux/linux_ui.cc
+++ ui/linux/linux_ui.cc
@@ -29,6 +29,9 @@ namespace ui {
std::unique_ptr<LinuxUi> LinuxUi::SetInstance(
std::unique_ptr<LinuxUi> instance) {
gfx::AnimationSettingsProviderLinux::SetInstance(instance.get());
+#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING)
+ printing::PrintingContextLinuxDelegate::SetInstance(instance.get());
+#endif
return std::exchange(GetLinuxUiInstance(), std::move(instance));
}
diff --git ui/linux/linux_ui.h ui/linux/linux_ui.h
index e8be3f2e60182..8c7bddd4a3d2d 100644
--- ui/linux/linux_ui.h
+++ ui/linux/linux_ui.h
@@ -20,6 +20,10 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/animation/animation_settings_provider_linux.h"
+#if BUILDFLAG(ENABLE_PRINTING)
+#include "printing/printing_context_linux.h" // nogncheck
+#endif
+
// The main entrypoint into Linux toolkit specific code. GTK/QT code should only
// be executed behind this interface.
@@ -60,7 +64,11 @@ class WindowFrameProvider;
// Adapter class with targets to render like different toolkits. Set by any
// project that wants to do linux desktop native rendering.
class COMPONENT_EXPORT(LINUX_UI) LinuxUi
- : public gfx::AnimationSettingsProviderLinux {
+ : public gfx::AnimationSettingsProviderLinux
+#if BUILDFLAG(ENABLE_PRINTING)
+ , public printing::PrintingContextLinuxDelegate
+#endif
+{
public:
using UseSystemThemeCallback =
base::RepeatingCallback<bool(aura::Window* window)>;
@@ -181,14 +189,6 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi
// Returns a map of KeyboardEvent code to KeyboardEvent key values.
virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;
-#if BUILDFLAG(ENABLE_PRINTING)
- virtual printing::PrintDialogLinuxInterface* CreatePrintDialog(
- printing::PrintingContextLinux* context) = 0;
-
- virtual gfx::Size GetPdfPaperSize(
- printing::PrintingContextLinux* context) = 0;
-#endif
-
// Returns a native file selection dialog. `listener` is of type
// SelectFileDialog::Listener. TODO(thomasanderson): Move
// SelectFileDialog::Listener to SelectFileDialogListener so that it can be

4
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@ -12,7 +12,7 @@ index 17f203b11ce39..0a5277b686d61 100644
virtual ~WebContentsView() = default; 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 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 9fa230c1cd95f..fb49251a52d11 100644 index 55a78179723f1..2f5e3dbe810be 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
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -225,6 +225,8 @@ void MimeHandlerViewGuest::CreateWebContents( @@ -225,6 +225,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@ -48,7 +48,7 @@ index 9fa230c1cd95f..fb49251a52d11 100644
WebContents* source, WebContents* source,
const content::OpenURLParams& params) { const content::OpenURLParams& params) {
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index ef6faf317dd41..8675c305d489c 100644 index af1cf98c17916..7655fedab36ea 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -143,6 +143,7 @@ class MimeHandlerViewGuest @@ -143,6 +143,7 @@ class MimeHandlerViewGuest

8
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. +// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17) +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 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index 1975492c29ae0..0ec7ddefe932b 100644 index ccb8fa896702b..c475abb49bf67 100644
--- net/url_request/url_request_http_job.cc --- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc
@@ -1770,7 +1770,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { @@ -1737,7 +1737,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode // Read cookies whenever allow_credentials() is true, even if the PrivacyMode
// is being overridden by NetworkDelegate and will eventually block them, as // is being overridden by NetworkDelegate and will eventually block them, as
// blocked cookies still need to be logged in that case. // blocked cookies still need to be logged in that case.
@ -24,10 +24,10 @@ index 1975492c29ae0..0ec7ddefe932b 100644
bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const { bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const {
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
index c8e468f41930d..8ac0d37be3c93 100644 index 7e02d8c952d22..6251c2e611826 100644
--- services/network/public/cpp/resource_request.cc --- services/network/public/cpp/resource_request.cc
+++ services/network/public/cpp/resource_request.cc +++ services/network/public/cpp/resource_request.cc
@@ -263,7 +263,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const { @@ -264,7 +264,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
} }
bool ResourceRequest::SendsCookies() const { bool ResourceRequest::SendsCookies() const {

6
patch/patches/osr_fling_2745.patch
View File

@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
} // namespace content } // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index 4b4a91a3fb615..4be300f14cae4 100644 index 3c934fe49b745..26519883dcbfb 100644
--- content/browser/renderer_host/render_widget_host_impl.cc --- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3123,6 +3123,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { @@ -3137,6 +3137,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
} }
@ -57,7 +57,7 @@ index 4b4a91a3fb615..4be300f14cae4 100644
const WebInputEvent& event) { const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled( if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index f63c1aa3007fa..5257801bf8aee 100644 index 4c568e15eaf82..caa91fb8325ed 100644
--- content/browser/renderer_host/render_widget_host_impl.h --- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h
@@ -781,6 +781,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl @@ -781,6 +781,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl

6
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 diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
index 38132463c9216..42f67b33eed7a 100644 index d2259c3e9c845..5d2819a2cada3 100644
--- chrome/browser/download/download_prefs.cc --- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@ -34,7 +34,7 @@ index 38132463c9216..42f67b33eed7a 100644
} }
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
index 01df55a728098..0c11458c9a5bb 100644 index 226de9e8e4546..cdedf67c94d01 100644
--- chrome/browser/printing/print_preview_dialog_controller.cc --- chrome/browser/printing/print_preview_dialog_controller.cc
+++ chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
@ -118,7 +118,7 @@ index 7a3fbc44629e6..578422e85320a 100644
} }
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 2ac094eb3a9be..0656515221072 100644 index 8e55c46cdf29a..40957f570aba5 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@

4
patch/patches/printing_context_2196.patch
View File

@ -11,7 +11,7 @@ index d9ae000f13485..ba53cde62f3ac 100644
PrintJobWorker::~PrintJobWorker() { PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h diff --git printing/printing_context.h printing/printing_context.h
index 58fcf619add50..0df47b93afd05 100644 index 0e6dd8092f602..4a173fcbc2e89 100644
--- printing/printing_context.h --- printing/printing_context.h
+++ printing/printing_context.h +++ printing/printing_context.h
@@ -173,6 +173,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { @@ -173,6 +173,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@ -28,7 +28,7 @@ index 58fcf619add50..0df47b93afd05 100644
protected: protected:
explicit PrintingContext(Delegate* delegate); explicit PrintingContext(Delegate* delegate);
@@ -217,6 +224,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { @@ -219,6 +226,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active. // The job id for the current job. The value is 0 if no jobs are active.
int job_id_; int job_id_;

4
patch/patches/renderer_host_1070713.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 1f6d9be104324..f377ecfac504c 100644 index 261e1dda1e128..6d27cd8f297c1 100644
--- content/browser/renderer_host/render_view_host_impl.cc --- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -662,6 +662,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const { @@ -663,6 +663,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
} }
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

2
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 f709beca890c4..80ae5fee83cac 100644 index 02ce81f80d522..16f2bb293684e 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
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@

8
patch/patches/services_network_2622.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index ab9be2c237cad..5bf06645fcc6a 100644 index 5f13af8dd54be..3a2ca5e918889 100644
--- chrome/browser/net/profile_network_context_service.cc --- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -123,10 +123,10 @@ index 77c0984d364c6..df7ff7d7355b5 100644
void CookieManager::SetForceKeepSessionState() { void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc diff --git services/network/network_context.cc services/network/network_context.cc
index 1bd4dda6aaa55..af2385b2e4fbf 100644 index cb42918d0c5c1..e050d858e8d7d 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -2364,17 +2364,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2372,17 +2372,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator()); network_service_->network_quality_estimator());
} }
@ -157,7 +157,7 @@ index 1bd4dda6aaa55..af2385b2e4fbf 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>(); trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 0a376689aeb81..18da84986021d 100644 index 99cd0107ab918..ed204a2b3e74c 100644
--- services/network/public/mojom/network_context.mojom --- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom
@@ -336,6 +336,9 @@ struct NetworkContextParams { @@ -336,6 +336,9 @@ struct NetworkContextParams {

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 diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index e165c450e96d1..33699e033a989 100644 index 4aeaaf7b665f3..02caf981232f8 100644
--- content/browser/storage_partition_impl.cc --- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc
@@ -488,10 +488,6 @@ class LoginHandlerDelegate { @@ -489,10 +489,6 @@ class LoginHandlerDelegate {
} }
WebContents* web_contents = web_contents_getter_.Run(); WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index e165c450e96d1..33699e033a989 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled. // WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true; creating_login_delegate_ = true;
@@ -543,12 +539,6 @@ void OnAuthRequiredContinuation( @@ -544,12 +540,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder> mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder, auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) { base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index e165c450e96d1..33699e033a989 100644
new LoginHandlerDelegate( new LoginHandlerDelegate(
std::move(auth_challenge_responder), std::move(web_contents_getter), std::move(auth_challenge_responder), std::move(web_contents_getter),
auth_info, is_request_for_primary_main_frame, process_id, request_id, url, auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
@@ -2832,8 +2822,12 @@ void StoragePartitionImpl::GetQuotaSettings( @@ -2844,8 +2834,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return; return;
} }
@ -40,7 +40,7 @@ index e165c450e96d1..33699e033a989 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback)); storage::GetDefaultDeviceInfoHelper(), std::move(callback));
} }
@@ -2843,9 +2837,12 @@ void StoragePartitionImpl::InitNetworkContext() { @@ -2855,9 +2849,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params = cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New(); cert_verifier::mojom::CertVerifierCreationParams::New();

56
patch/patches/views_1749_2102_3330.patch
View File

@ -1,5 +1,5 @@
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
index 11f1421cc79c1..c5dbc643ae7c8 100644 index 016a06e5187ec..4eccdef738f00 100644
--- ui/base/models/menu_model.h --- ui/base/models/menu_model.h
+++ ui/base/models/menu_model.h +++ ui/base/models/menu_model.h
@@ -15,8 +15,11 @@ @@ -15,8 +15,11 @@
@ -16,7 +16,7 @@ index 11f1421cc79c1..c5dbc643ae7c8 100644
namespace ui { namespace ui {
@@ -147,6 +150,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel @@ -147,6 +150,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel
// |event_flags| is a bit mask of ui::EventFlags. // |event_flags| is a bit mask of ui::EventFlags.
virtual void ActivatedAt(int index, int event_flags); virtual void ActivatedAt(size_t index, int event_flags);
+ // Called when the user moves the mouse outside the menu and over the owning + // Called when the user moves the mouse outside the menu and over the owning
+ // window. + // window.
@ -30,11 +30,11 @@ index 11f1421cc79c1..c5dbc643ae7c8 100644
+ // Override the text/background color of a given menu item dependent on the + // Override the text/background color of a given menu item dependent on the
+ // |index| and its |is_hovered| state. |is_minor| will be true for accelerator + // |index| and its |is_hovered| state. |is_minor| will be true for accelerator
+ // text. Returns true if it chooses to override the color. + // text. Returns true if it chooses to override the color.
+ virtual bool GetTextColor(int index, + virtual bool GetTextColor(size_t index,
+ bool is_minor, + bool is_minor,
+ bool is_hovered, + bool is_hovered,
+ SkColor* override_color) const { return false; } + SkColor* override_color) const { return false; }
+ virtual bool GetBackgroundColor(int index, + virtual bool GetBackgroundColor(size_t index,
+ bool is_hovered, + bool is_hovered,
+ SkColor* override_color) const + SkColor* override_color) const
+ { return false; } + { return false; }
@ -43,10 +43,10 @@ index 11f1421cc79c1..c5dbc643ae7c8 100644
virtual void MenuWillShow() {} virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 9db4aaff7094b..a4baf119986a7 100644 index 69ee0aee2d5b4..3c55be29261a7 100644
--- ui/gfx/render_text.cc --- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc +++ ui/gfx/render_text.cc
@@ -665,6 +665,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) { @@ -671,6 +671,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
} }
} }
@ -61,7 +61,7 @@ index 9db4aaff7094b..a4baf119986a7 100644
void RenderText::SetDisplayRect(const Rect& r) { void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) { if (r != display_rect_) {
display_rect_ = r; display_rect_ = r;
@@ -1995,6 +2003,19 @@ void RenderText::OnTextAttributeChanged() { @@ -2001,6 +2009,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false; layout_text_up_to_date_ = false;
@ -150,7 +150,7 @@ index 4f173056ba875..7b746c84c63cf 100644
ImageView* image() const { return image_; } ImageView* image() const { return image_; }
Label* label() const { return label_; } Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index c748b7ed1a958..c93898b041aff 100644 index 176c65978c279..387b092a45561 100644
--- ui/views/controls/label.cc --- ui/views/controls/label.cc
+++ ui/views/controls/label.cc +++ ui/views/controls/label.cc
@@ -52,12 +52,27 @@ enum LabelPropertyKey { @@ -52,12 +52,27 @@ enum LabelPropertyKey {
@ -197,7 +197,7 @@ index c748b7ed1a958..c93898b041aff 100644
std::u16string Label::GetTooltipText() const { std::u16string Label::GetTooltipText() const {
return tooltip_text_; return tooltip_text_;
} }
@@ -721,6 +745,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const { @@ -724,6 +748,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SelectRange(stored_selection_range_); render_text->SelectRange(stored_selection_range_);
} }
@ -215,7 +215,7 @@ index c748b7ed1a958..c93898b041aff 100644
} }
diff --git ui/views/controls/label.h ui/views/controls/label.h diff --git ui/views/controls/label.h ui/views/controls/label.h
index 912c7d20eb07c..26beda47cd4ce 100644 index 27eb3a455e185..6579f0129eef3 100644
--- ui/views/controls/label.h --- ui/views/controls/label.h
+++ ui/views/controls/label.h +++ ui/views/controls/label.h
@@ -234,6 +234,10 @@ class VIEWS_EXPORT Label : public View, @@ -234,6 +234,10 @@ class VIEWS_EXPORT Label : public View,
@ -238,10 +238,10 @@ index 912c7d20eb07c..26beda47cd4ce 100644
std::unique_ptr<SelectionController> selection_controller_; std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 1f1ea9ec4b51a..e3c77de886185 100644 index 146a825f6f55a..bcb5b73773922 100644
--- ui/views/controls/menu/menu_controller.cc --- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc
@@ -473,7 +473,8 @@ void MenuController::Run(Widget* parent, @@ -474,7 +474,8 @@ void MenuController::Run(Widget* parent,
MenuAnchorPosition position, MenuAnchorPosition position,
bool context_menu, bool context_menu,
bool is_nested_drag, bool is_nested_drag,
@ -251,7 +251,7 @@ index 1f1ea9ec4b51a..e3c77de886185 100644
exit_type_ = ExitType::kNone; exit_type_ = ExitType::kNone;
possible_drag_ = false; possible_drag_ = false;
drag_in_progress_ = false; drag_in_progress_ = false;
@@ -520,6 +521,7 @@ void MenuController::Run(Widget* parent, @@ -521,6 +522,7 @@ void MenuController::Run(Widget* parent,
owner_->AddObserver(this); owner_->AddObserver(this);
native_view_for_gestures_ = native_view_for_gestures; native_view_for_gestures_ = native_view_for_gestures;
@ -259,7 +259,7 @@ index 1f1ea9ec4b51a..e3c77de886185 100644
// Only create a MenuPreTargetHandler for non-nested menus. Nested menus // Only create a MenuPreTargetHandler for non-nested menus. Nested menus
// will use the existing one. // will use the existing one.
@@ -2177,6 +2179,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) { @@ -2178,6 +2180,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
params.do_capture = do_capture; params.do_capture = do_capture;
params.native_view_for_gestures = native_view_for_gestures_; params.native_view_for_gestures = native_view_for_gestures_;
params.owned_window_anchor = anchor; params.owned_window_anchor = anchor;
@ -267,7 +267,7 @@ index 1f1ea9ec4b51a..e3c77de886185 100644
if (item->GetParentMenuItem()) { if (item->GetParentMenuItem()) {
params.context = state_.item->GetWidget(); params.context = state_.item->GetWidget();
@@ -2879,8 +2882,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -2864,8 +2867,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item; MenuItemView* item = pending_state_.item;
@ -282,7 +282,7 @@ index 1f1ea9ec4b51a..e3c77de886185 100644
MenuItemView* to_select = nullptr; MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty()) if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2899,8 +2907,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { @@ -2884,8 +2892,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() { void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item; MenuItemView* item = state_.item;
DCHECK(item); DCHECK(item);
@ -295,7 +295,7 @@ index 1f1ea9ec4b51a..e3c77de886185 100644
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY); SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
else if (item->GetParentMenuItem()->GetParentMenuItem()) else if (item->GetParentMenuItem()->GetParentMenuItem())
diff --git ui/views/controls/menu/menu_controller.h ui/views/controls/menu/menu_controller.h diff --git ui/views/controls/menu/menu_controller.h ui/views/controls/menu/menu_controller.h
index a4958eb424441..0e1ebb20af2da 100644 index ed374eab8e481..8853e45d32e17 100644
--- ui/views/controls/menu/menu_controller.h --- ui/views/controls/menu/menu_controller.h
+++ ui/views/controls/menu/menu_controller.h +++ ui/views/controls/menu/menu_controller.h
@@ -105,7 +105,9 @@ class VIEWS_EXPORT MenuController @@ -105,7 +105,9 @@ class VIEWS_EXPORT MenuController
@ -309,7 +309,7 @@ index a4958eb424441..0e1ebb20af2da 100644
bool for_drop() const { return for_drop_; } bool for_drop() const { return for_drop_; }
@@ -720,6 +722,8 @@ class VIEWS_EXPORT MenuController @@ -711,6 +713,8 @@ class VIEWS_EXPORT MenuController
// RunType::SEND_GESTURE_EVENTS_TO_OWNER is set. // RunType::SEND_GESTURE_EVENTS_TO_OWNER is set.
gfx::NativeView native_view_for_gestures_ = nullptr; gfx::NativeView native_view_for_gestures_ = nullptr;
@ -394,10 +394,10 @@ index 9c8c5de34d064..b054688cca148 100644
explicit MenuHost(SubmenuView* submenu); explicit MenuHost(SubmenuView* submenu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 538829ec598b6..042728512ea26 100644 index 854398921a3b9..435790a289d8a 100644
--- ui/views/controls/menu/menu_item_view.cc --- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc
@@ -1084,6 +1084,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -1094,6 +1094,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_); spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_); spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags); canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@ -413,7 +413,7 @@ index 538829ec598b6..042728512ea26 100644
} else if (paint_as_selected) { } else if (paint_as_selected) {
gfx::Rect item_bounds = GetLocalBounds(); gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) { if (type_ == Type::kActionableSubMenu) {
@@ -1150,6 +1159,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) { @@ -1160,6 +1169,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
} }
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const { SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -428,10 +428,10 @@ index 538829ec598b6..042728512ea26 100644
GetMenuController() && GetMenuController()->use_ash_system_ui_layout() GetMenuController() && GetMenuController()->use_ash_system_ui_layout()
? style::CONTEXT_TOUCH_MENU ? style::CONTEXT_TOUCH_MENU
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
index fb5d5e6a79a3f..a336b5a74d6a1 100644 index 285e4a829ed6f..e120cac8876b7 100644
--- ui/views/controls/menu/menu_model_adapter.cc --- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc +++ ui/views/controls/menu/menu_model_adapter.cc
@@ -245,6 +245,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { @@ -243,6 +243,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
return false; return false;
} }
@ -483,7 +483,7 @@ index fb5d5e6a79a3f..a336b5a74d6a1 100644
+ bool is_hovered, + bool is_hovered,
+ SkColor* override_color) const { + SkColor* override_color) const {
+ ui::MenuModel* model = menu_model_; + ui::MenuModel* model = menu_model_;
+ int index = 0; + size_t index = 0;
+ if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index)) + if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index))
+ return model->GetTextColor(index, is_minor, is_hovered, override_color); + return model->GetTextColor(index, is_minor, is_hovered, override_color);
+ +
@ -498,7 +498,7 @@ index fb5d5e6a79a3f..a336b5a74d6a1 100644
+ return menu_model_->GetBackgroundColor(-1, is_hovered, override_color); + return menu_model_->GetBackgroundColor(-1, is_hovered, override_color);
+ +
+ ui::MenuModel* model = menu_model_; + ui::MenuModel* model = menu_model_;
+ int index = 0; + size_t index = 0;
+ if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index)) + if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index))
+ return model->GetBackgroundColor(index, is_hovered, override_color); + return model->GetBackgroundColor(index, is_hovered, override_color);
+ +
@ -510,7 +510,7 @@ index fb5d5e6a79a3f..a336b5a74d6a1 100644
// Look up the menu model for this menu. // Look up the menu model for this menu.
const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator = const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
index b7c7474fb5910..ce3e14071f0c6 100644 index ebbc36a305ade..a6c9e80430cf3 100644
--- ui/views/controls/menu/menu_model_adapter.h --- ui/views/controls/menu/menu_model_adapter.h
+++ ui/views/controls/menu/menu_model_adapter.h +++ ui/views/controls/menu/menu_model_adapter.h
@@ -88,6 +88,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate, @@ -88,6 +88,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
@ -655,7 +655,7 @@ index 27bc7381ba22c..5d13b85fcc5cf 100644
base::TimeTicks GetClosingEventTime() const override; base::TimeTicks GetClosingEventTime() const override;
diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
index 6f92eb0c4f6f9..dba3c63e59b4b 100644 index 46722c10e531c..b6c2df197ba2e 100644
--- ui/views/controls/menu/menu_runner_impl_cocoa.mm --- ui/views/controls/menu/menu_runner_impl_cocoa.mm
+++ ui/views/controls/menu/menu_runner_impl_cocoa.mm +++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
@@ -511,7 +511,8 @@ void MenuRunnerImplCocoa::RunMenuAt(Widget* parent, @@ -511,7 +511,8 @@ void MenuRunnerImplCocoa::RunMenuAt(Widget* parent,
@ -724,7 +724,7 @@ index a364780eb8203..4671969f5597c 100644
if (root_location != root_current_location && if (root_location != root_current_location &&
ozone_ui_controls_test_helper_->ButtonDownMask() == 0 && ozone_ui_controls_test_helper_->ButtonDownMask() == 0 &&
diff --git ui/views/view.h ui/views/view.h diff --git ui/views/view.h ui/views/view.h
index 29b0bed42c74d..c6dd795c13094 100644 index f80f61fdfc5ef..13df1a7aa074e 100644
--- ui/views/view.h --- ui/views/view.h
+++ ui/views/view.h +++ ui/views/view.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@

20
patch/patches/views_widget.patch
View File

@ -18,7 +18,7 @@ index eefdd87f1f85a..4f4c68e53676d 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 912a21280fdd5..fa535d68368fe 100644 index 4174581cda568..34cc936cbc305 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
@@ -67,6 +67,7 @@ class CursorManager; @@ -67,6 +67,7 @@ class CursorManager;
@ -49,7 +49,7 @@ index 912a21280fdd5..fa535d68368fe 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_|
@@ -417,6 +424,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { @@ -425,6 +432,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
const gfx::Rect& bounds, const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0; const gfx::Rect& anchor_rect) = 0;
@ -62,7 +62,7 @@ index 912a21280fdd5..fa535d68368fe 100644
// Sets the cursor for this view to the one associated with the specified // Sets the cursor for this view to the one associated with the specified
// cursor_type. // cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0; virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -659,6 +672,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { @@ -667,6 +680,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
// to all displays. // to all displays.
gfx::Size system_cursor_size_; gfx::Size system_cursor_size_;
@ -73,7 +73,7 @@ index 912a21280fdd5..fa535d68368fe 100644
private: private:
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest, BrowserSideFlingBrowserTest,
@@ -680,10 +697,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { @@ -688,10 +705,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
void SynchronizeVisualProperties(); void SynchronizeVisualProperties();
@ -179,7 +179,7 @@ index 87a4458f9fbfc..bc3edd88fac7f 100644
return host ? host->GetAcceleratedWidget() : nullptr; 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 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 d8d30be7adeb2..6728c41c9cc2e 100644 index 5cb499fa35436..38659ad852b10 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -164,6 +164,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop( @@ -164,6 +164,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@ -243,10 +243,10 @@ index e6842b0848c74..d214247587d41 100644
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this}; 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 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 f6d94f2376d28..d0a8b16ae9a33 100644 index fdead2a571396..3d3ecd92341bf 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -261,8 +261,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) { @@ -271,8 +271,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
if (properties.parent_widget) { if (properties.parent_widget) {
window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget( window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
properties.parent_widget); properties.parent_widget);
@ -309,7 +309,7 @@ index 0aae49ec83b88..ab61925742ed7 100644
// a reference. // a reference.
raw_ptr<corewm::TooltipWin> tooltip_; raw_ptr<corewm::TooltipWin> tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 046d3cf77f70e..f730142c7d554 100644 index 2cb71ae39fa7b..dcb03c59fde50 100644
--- ui/views/widget/widget.cc --- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc +++ ui/views/widget/widget.cc
@@ -338,7 +338,8 @@ void Widget::Init(InitParams params) { @@ -338,7 +338,8 @@ void Widget::Init(InitParams params) {
@ -363,7 +363,7 @@ index 046d3cf77f70e..f730142c7d554 100644
} }
diff --git ui/views/widget/widget.h ui/views/widget/widget.h diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 1091647c5096a..4829519b2a029 100644 index 6e8a17f9452fb..0e45f3c72b3c2 100644
--- ui/views/widget/widget.h --- ui/views/widget/widget.h
+++ ui/views/widget/widget.h +++ ui/views/widget/widget.h
@@ -337,6 +337,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, @@ -337,6 +337,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -404,7 +404,7 @@ index b3a3efd0e526f..8590a98eaf0b2 100644
if (native_widget_delegate->IsDialogBox()) { if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME; *style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 1e6326a2f36f5..8df413cd539ee 100644 index 1208238fbfb50..c65237163f4ca 100644
--- ui/views/win/hwnd_message_handler.cc --- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc
@@ -824,7 +824,11 @@ bool HWNDMessageHandler::IsVisible() const { @@ -824,7 +824,11 @@ bool HWNDMessageHandler::IsVisible() const {

2
patch/patches/viz_osr_2575.patch
View File

@ -222,7 +222,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
+ Draw(gfx.mojom.Rect damage_rect) => (); + Draw(gfx.mojom.Rect damage_rect) => ();
}; };
diff --git ui/compositor/compositor.h ui/compositor/compositor.h diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index e0345f5903a48..31a118fc3b375 100644 index 5dee5932ce9ca..c25e5f5b4e069 100644
--- ui/compositor/compositor.h --- ui/compositor/compositor.h
+++ ui/compositor/compositor.h +++ ui/compositor/compositor.h
@@ -31,7 +31,9 @@ @@ -31,7 +31,9 @@

20
patch/patches/web_contents_1257_1565.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 8a0b6e41eb3f1..9e6ba43dc912d 100644 index 860e52ddb3db1..3c7ce1be61f80 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -3059,6 +3059,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3066,6 +3066,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation, site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOpener(), primary_main_frame_policy); params.main_frame_name, GetOpener(), primary_main_frame_policy);
@ -15,7 +15,7 @@ index 8a0b6e41eb3f1..9e6ba43dc912d 100644
std::unique_ptr<WebContentsViewDelegate> delegate = std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3069,6 +3075,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3076,6 +3082,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate), view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }
@ -23,7 +23,7 @@ index 8a0b6e41eb3f1..9e6ba43dc912d 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3247,6 +3254,9 @@ void WebContentsImpl::RenderWidgetCreated( @@ -3254,6 +3261,9 @@ void WebContentsImpl::RenderWidgetCreated(
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
"render_widget_host", render_widget_host); "render_widget_host", render_widget_host);
created_widgets_.insert(render_widget_host); created_widgets_.insert(render_widget_host);
@ -33,7 +33,7 @@ index 8a0b6e41eb3f1..9e6ba43dc912d 100644
} }
void WebContentsImpl::RenderWidgetDeleted( void WebContentsImpl::RenderWidgetDeleted(
@@ -3973,6 +3983,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -3980,6 +3990,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
params.pip_options->lock_aspect_ratio; params.pip_options->lock_aspect_ratio;
} }
@ -49,7 +49,7 @@ index 8a0b6e41eb3f1..9e6ba43dc912d 100644
std::unique_ptr<WebContentsImpl> new_contents; std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -7857,6 +7876,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -7874,6 +7893,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames). // frames).
SetFocusedFrameTree(node->frame_tree()); SetFocusedFrameTree(node->frame_tree());
} }
@ -60,10 +60,10 @@ index 8a0b6e41eb3f1..9e6ba43dc912d 100644
void WebContentsImpl::DidCallFocus() { void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index f1b8dee6699c0..6e13569cfdeac 100644 index 5c710ded76711..c86aff1c770e9 100644
--- content/public/browser/web_contents.h --- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h +++ content/public/browser/web_contents.h
@@ -93,10 +93,12 @@ class BrowserContext; @@ -94,10 +94,12 @@ class BrowserContext;
class BrowserPluginGuestDelegate; class BrowserPluginGuestDelegate;
class RenderFrameHost; class RenderFrameHost;
class RenderViewHost; class RenderViewHost;
@ -76,7 +76,7 @@ index f1b8dee6699c0..6e13569cfdeac 100644
class WebUI; class WebUI;
struct DropData; struct DropData;
struct MHTMLGenerationParams; struct MHTMLGenerationParams;
@@ -234,6 +236,10 @@ class WebContents : public PageNavigator, @@ -236,6 +238,10 @@ class WebContents : public PageNavigator,
network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags starting_sandbox_flags =
network::mojom::WebSandboxFlags::kNone; network::mojom::WebSandboxFlags::kNone;
@ -88,7 +88,7 @@ index f1b8dee6699c0..6e13569cfdeac 100644
// the value that'll be returned by GetLastActiveTime(). If this is left // the value that'll be returned by GetLastActiveTime(). If this is left
// default initialized then the value is not passed on to the WebContents // 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 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index 348dcde05d71e..871f0e0e22eb6 100644 index b088cb3010033..b1936ce2f3a58 100644
--- content/public/browser/web_contents_delegate.h --- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h
@@ -57,9 +57,11 @@ class EyeDropperListener; @@ -57,9 +57,11 @@ class EyeDropperListener;

4
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 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index a9ba1b0ec765e..5d5d80fe8e999 100644 index b3845ea362068..c6d4f44d7d22b 100644
--- third_party/blink/public/platform/platform.h --- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h
@@ -812,6 +812,11 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -775,6 +775,11 @@ class BLINK_PLATFORM_EXPORT Platform {
const WebURL& url, const WebURL& url,
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {} blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {}

10
patch/patches/webkit_popups.patch
View File

@ -1,5 +1,5 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index 99f0ceb45972d..8b5f6726efcf1 100644 index b01562ebe042b..93ad664fb2922 100644
--- third_party/blink/public/web/web_view.h --- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h +++ third_party/blink/public/web/web_view.h
@@ -333,6 +333,7 @@ class WebView { @@ -333,6 +333,7 @@ class WebView {
@ -11,7 +11,7 @@ index 99f0ceb45972d..8b5f6726efcf1 100644
// Cancels and hides the current popup (datetime, select...) if any. // Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0; 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 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 071481b1b47da..8f033a73481f7 100644 index 390e47422a0a1..07ba7bfc6a1a8 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -246,8 +246,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -246,8 +246,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@ -39,7 +39,7 @@ index 071481b1b47da..8f033a73481f7 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)), fullscreen_controller_(std::make_unique<FullscreenController>(this)),
page_base_background_color_( 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 diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 6a36275fdd7ac..8837177386f91 100644 index ce3a483a4c06d..834cbe13415d0 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h --- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -133,7 +133,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -133,7 +133,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -62,10 +62,10 @@ index 6a36275fdd7ac..8837177386f91 100644
TransformationMatrix device_emulation_transform_; 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 diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 70fab6032767a..e0f3fd02da1cc 100644 index c3efeb47aec53..9927b7709134d 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc --- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -919,7 +919,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { @@ -913,7 +913,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) { HTMLSelectElement& select) {
NotifyPopupOpeningObservers(); NotifyPopupOpeningObservers();

4
patch/patches/win_sandbox_3210.patch
View File

@ -1,8 +1,8 @@
diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
index f7b0de8ca8cab..6788ef40416a1 100644 index 7246e7e12247f..735876a13ce06 100644
--- sandbox/policy/win/sandbox_win.cc --- sandbox/policy/win/sandbox_win.cc
+++ sandbox/policy/win/sandbox_win.cc +++ sandbox/policy/win/sandbox_win.cc
@@ -1132,6 +1132,13 @@ ResultCode SandboxWin::StartSandboxedProcess( @@ -1127,6 +1127,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
const base::HandlesToInheritVector& handles_to_inherit, const base::HandlesToInheritVector& handles_to_inherit,
SandboxDelegate* delegate, SandboxDelegate* delegate,
base::Process* process) { base::Process* process) {

2
tests/cefclient/browser/client_handler.cc
View File

@ -1424,7 +1424,7 @@ void ClientHandler::SetOfflineState(CefRefPtr<CefBrowser> browser,
void ClientHandler::FilterMenuModel(CefRefPtr<CefMenuModel> model) { void ClientHandler::FilterMenuModel(CefRefPtr<CefMenuModel> model) {
// Evaluate from the bottom to the top because we'll be removing menu items. // Evaluate from the bottom to the top because we'll be removing menu items.
for (int i = model->GetCount() - 1; i >= 0; --i) { for (size_t i = model->GetCount() - 1; i >= 0; --i) {
const auto type = model->GetTypeAt(i); const auto type = model->GetTypeAt(i);
if (type == MENUITEMTYPE_SUBMENU) { if (type == MENUITEMTYPE_SUBMENU) {
// Filter sub-menu and remove if empty. // Filter sub-menu and remove if empty.

2
tests/cefclient/browser/views_style.cc
View File

@ -100,7 +100,7 @@ void ApplyTo(CefRefPtr<CefMenuModel> menu_model) {
g_background_hover_color); g_background_hover_color);
// Recursively color sub-menus. // Recursively color sub-menus.
for (int i = 0; i < menu_model->GetCount(); ++i) { for (size_t i = 0; i < menu_model->GetCount(); ++i) {
if (menu_model->GetTypeAt(i) == MENUITEMTYPE_SUBMENU) if (menu_model->GetTypeAt(i) == MENUITEMTYPE_SUBMENU)
ApplyTo(menu_model->GetSubMenuAt(i)); ApplyTo(menu_model->GetSubMenuAt(i));
} }