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

Update to Chromium version 93.0.4577.0 (#902210)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-07-23 12:40:13 -04:00
parent 1ffa5528b3
commit b4ea0496e7
141 changed files with 1188 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
patch/patches/views_1749_2102.patch
View File

@@ -43,10 +43,10 @@ index 279be87a33e9e..f295fdac67165 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index fbefbf0072674..159fad0893fdb 100644
index 988159e708dcc..3d957f7ea966e 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -621,6 +621,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
@@ -650,6 +650,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
}
}
@@ -61,7 +61,7 @@ index fbefbf0072674..159fad0893fdb 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -2007,6 +2015,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -2036,6 +2044,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false;
@@ -106,7 +106,7 @@ index 36811695d23a5..db6b5f8bb08a4 100644
} // namespace gfx
diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
index ac018b1298052..090b4949625ae 100644
index bd0975b485de4..6e853e7018e9b 100644
--- ui/views/animation/ink_drop_host_view.h
+++ ui/views/animation/ink_drop_host_view.h
@@ -184,6 +184,8 @@ class VIEWS_EXPORT InkDropHost {
@@ -119,10 +119,10 @@ index ac018b1298052..090b4949625ae 100644
friend class test::InkDropHostTestApi;
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index 86ddd3569f4eb..7a9dbe264225a 100644
index 9d12e8a9f7487..442f45617e275 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -500,6 +500,12 @@ void LabelButton::OnThemeChanged() {
@@ -509,6 +509,12 @@ void LabelButton::OnThemeChanged() {
SchedulePaint();
}
@@ -136,10 +136,10 @@ index 86ddd3569f4eb..7a9dbe264225a 100644
Button::StateChanged(old_state);
ResetLabelEnabledColor();
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
index a3b83cbd72090..a1ff21bc5cc20 100644
index 9b5389139c2fb..6111c18533564 100644
--- ui/views/controls/button/label_button.h
+++ ui/views/controls/button/label_button.h
@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -134,6 +134,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
ui::NativeTheme::State GetForegroundThemeState(
ui::NativeTheme::ExtraParams* params) const override;
@@ -150,10 +150,10 @@ index a3b83cbd72090..a1ff21bc5cc20 100644
ImageView* image() const { return image_; }
Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 70d319e79c6f7..1cd58d7bb0b13 100644
index 79a26da93a4eb..e755a11efc658 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -51,12 +51,27 @@ enum LabelPropertyKey {
@@ -52,12 +52,27 @@ enum LabelPropertyKey {
kLabelLineHeight,
kLabelObscured,
kLabelAllowCharacterBreak,
@@ -181,7 +181,7 @@ index 70d319e79c6f7..1cd58d7bb0b13 100644
} // namespace
namespace views {
@@ -413,6 +428,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
@@ -421,6 +436,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
}
@@ -197,7 +197,7 @@ index 70d319e79c6f7..1cd58d7bb0b13 100644
std::u16string Label::GetTooltipText() const {
return tooltip_text_;
}
@@ -709,6 +733,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
@@ -717,6 +741,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SelectRange(stored_selection_range_);
}
@@ -215,10 +215,10 @@ index 70d319e79c6f7..1cd58d7bb0b13 100644
}
diff --git ui/views/controls/label.h ui/views/controls/label.h
index 0e8b88dc404f0..2f50228d3b804 100644
index 5bad0a8cd8cbc..da57021f0cefa 100644
--- ui/views/controls/label.h
+++ ui/views/controls/label.h
@@ -225,6 +225,10 @@ class VIEWS_EXPORT Label : public View,
@@ -230,6 +230,10 @@ class VIEWS_EXPORT Label : public View,
gfx::ElideBehavior GetElideBehavior() const;
void SetElideBehavior(gfx::ElideBehavior elide_behavior);
@@ -229,7 +229,7 @@ index 0e8b88dc404f0..2f50228d3b804 100644
// Gets/Sets the tooltip text. Default behavior for a label (single-line) is
// to show the full text if it is wider than its bounds. Calling this
// overrides the default behavior and lets you set a custom tooltip. To
@@ -471,6 +475,7 @@ class VIEWS_EXPORT Label : public View,
@@ -476,6 +480,7 @@ class VIEWS_EXPORT Label : public View,
int max_width_ = 0;
// This is used in single-line mode.
int max_width_single_line_ = 0;
@@ -238,10 +238,10 @@ index 0e8b88dc404f0..2f50228d3b804 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index e9edd19929aa2..5ffcbe7374ba9 100644
index 8ba686c398002..7842a7c8936cb 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2760,8 +2760,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2795,8 +2795,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@@ -256,7 +256,7 @@ index e9edd19929aa2..5ffcbe7374ba9 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2780,8 +2785,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2815,8 +2820,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@@ -269,10 +269,10 @@ index e9edd19929aa2..5ffcbe7374ba9 100644
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
else if (item->GetParentMenuItem()->GetParentMenuItem())
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
index a280e9d74016e..59a8eda9b1d84 100644
index b47a61998daaa..e6f1b862838b9 100644
--- ui/views/controls/menu/menu_delegate.h
+++ ui/views/controls/menu/menu_delegate.h
@@ -79,6 +79,22 @@ class VIEWS_EXPORT MenuDelegate {
@@ -80,6 +80,22 @@ class VIEWS_EXPORT MenuDelegate {
// parts of |style| or leave it unmodified.
virtual void GetLabelStyle(int id, LabelStyle* style) const;
@@ -295,7 +295,7 @@ index a280e9d74016e..59a8eda9b1d84 100644
// The tooltip shown for the menu item. This is invoked when the user
// hovers over the item, and no tooltip text has been set for that item.
virtual std::u16string GetTooltipText(int id,
@@ -207,6 +223,11 @@ class VIEWS_EXPORT MenuDelegate {
@@ -218,6 +234,11 @@ class VIEWS_EXPORT MenuDelegate {
bool* has_mnemonics,
MenuButton** button);
@@ -308,10 +308,10 @@ index a280e9d74016e..59a8eda9b1d84 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 3232a9147d8da..b4431a6a0503e 100644
index 039cbc90f0eed..09f16763f7581 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1071,6 +1071,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -1080,6 +1080,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@@ -327,7 +327,7 @@ index 3232a9147d8da..b4431a6a0503e 100644
} else if (render_selection) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1139,6 +1148,13 @@ void MenuItemView::PaintMinorIconAndText(
@@ -1148,6 +1157,13 @@ void MenuItemView::PaintMinorIconAndText(
}
SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {
@@ -342,10 +342,10 @@ index 3232a9147d8da..b4431a6a0503e 100644
GetMenuController() && GetMenuController()->use_touchable_layout()
? style::CONTEXT_TOUCH_MENU
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
index 6dcbba931eb9a..b5d21864b7384 100644
index 895745cf0f7e5..28c24b1b007c9 100644
--- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc
@@ -244,6 +244,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
@@ -246,6 +246,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
return false;
}
@@ -424,7 +424,7 @@ index 6dcbba931eb9a..b5d21864b7384 100644
// Look up the menu model for this menu.
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
index c7aaf7286b74d..2ba3a9c10fe03 100644
index 76a9001061649..c5026f9241334 100644
--- ui/views/controls/menu/menu_model_adapter.h
+++ ui/views/controls/menu/menu_model_adapter.h
@@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
@@ -449,10 +449,10 @@ index c7aaf7286b74d..2ba3a9c10fe03 100644
void WillHideMenu(MenuItemView* menu) override;
void OnMenuClosed(MenuItemView* menu) override;
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
index 8522b0b4bb779..58f44f4f766c7 100644
index 979682ad5d7aa..a819da9125eb7 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -234,6 +234,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -239,6 +239,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
scroll_down_button_ =
AddChildView(std::make_unique<MenuScrollButton>(content_view, false));
@@ -480,7 +480,7 @@ index 64e09ff4359a8..714e8e9ff6610 100644
x11_ui_controls_test_helper_.ButtonDownMask() == 0) {
// Move the cursor because EnterNotify/LeaveNotify are generated with the
diff --git ui/views/view.h ui/views/view.h
index cd9069a34ec6a..317bca771298d 100644
index 2c7cbb21185ab..304a1b0e5df97 100644
--- ui/views/view.h
+++ ui/views/view.h
@@ -20,6 +20,7 @@