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 81.0.4044.0 (#737173)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-03-03 19:29:39 -05:00
parent a22b670a00
commit 9d9ee8b45f
135 changed files with 2602 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
patch/patches/views_1749_2102.patch
View File

@@ -39,10 +39,10 @@ index 5bcc6204c2b5..1bf18609d150 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index cb1a7976f6dc..d6360da8e69d 100644
index 6a97b1501d3d..3ac88ea133fc 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -713,6 +713,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
@@ -611,6 +611,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
}
}
@@ -57,7 +57,7 @@ index cb1a7976f6dc..d6360da8e69d 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -1904,6 +1912,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -1964,6 +1972,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false;
@@ -78,10 +78,10 @@ index cb1a7976f6dc..d6360da8e69d 100644
}
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index ee5748fa6f02..d4477f724d68 100644
index 892b32910b77..0d3c4ef5cafa 100644
--- ui/gfx/render_text.h
+++ ui/gfx/render_text.h
@@ -304,6 +304,10 @@ class GFX_EXPORT RenderText {
@@ -324,6 +324,10 @@ class GFX_EXPORT RenderText {
return whitespace_elision_;
}
@@ -92,9 +92,9 @@ index ee5748fa6f02..d4477f724d68 100644
const Rect& display_rect() const { return display_rect_; }
void SetDisplayRect(const Rect& r);
@@ -980,6 +984,8 @@ class GFX_EXPORT RenderText {
// Tell whether or not the layout break lists need an update.
bool layout_text_attributes_up_to_date_ = false;
@@ -1006,6 +1010,8 @@ class GFX_EXPORT RenderText {
// Tell whether or not the |layout_text_| needs an update or is up to date.
mutable bool layout_text_up_to_date_ = false;
+ int draw_strings_flags_ = 0;
+
@@ -102,12 +102,12 @@ index ee5748fa6f02..d4477f724d68 100644
};
diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
index 3b5bc508a0fd..262da51d50ac 100644
index 846a4a7f09de..aded39658834 100644
--- ui/views/animation/ink_drop_host_view.h
+++ ui/views/animation/ink_drop_host_view.h
@@ -132,6 +132,8 @@ class VIEWS_EXPORT InkDropHostView : public View {
// them.
void AnimateInkDrop(InkDropState state, const ui::LocatedEvent* event);
@@ -142,6 +142,8 @@ class VIEWS_EXPORT InkDropHostView : public View {
// this isn't necessary anymore.
virtual InkDrop* GetInkDrop();
+ InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
+
@@ -115,10 +115,10 @@ index 3b5bc508a0fd..262da51d50ac 100644
// Size used for the default SquareInkDropRipple.
static constexpr gfx::Size kDefaultInkDropSize = gfx::Size(24, 24);
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index f476f1725204..d2d30163abf3 100644
index 12c05efa8c12..eb9c49125501 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -484,6 +484,12 @@ void LabelButton::OnThemeChanged() {
@@ -494,6 +494,12 @@ void LabelButton::OnThemeChanged() {
SchedulePaint();
}
@@ -132,10 +132,10 @@ index f476f1725204..d2d30163abf3 100644
const gfx::Size previous_image_size(image_->GetPreferredSize());
UpdateImage();
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
index 1c8d5c27f928..90d7e7f004e4 100644
index ba9f5f8cd8c7..f1ab98728425 100644
--- ui/views/controls/button/label_button.h
+++ ui/views/controls/button/label_button.h
@@ -118,6 +118,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -123,6 +123,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
ui::NativeTheme::State GetForegroundThemeState(
ui::NativeTheme::ExtraParams* params) const override;
@@ -146,7 +146,7 @@ index 1c8d5c27f928..90d7e7f004e4 100644
ImageView* image() const { return image_; }
Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 21a8fa0fa8eb..55a2e57a2e6f 100644
index be8d8e8dddf9..6e5efacde451 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -53,6 +53,20 @@ bool IsOpaque(SkColor color) {
@@ -185,7 +185,7 @@ index 21a8fa0fa8eb..55a2e57a2e6f 100644
void Label::SetTooltipText(const base::string16& tooltip_text) {
DCHECK(handles_tooltips_);
if (tooltip_text_ == tooltip_text)
@@ -577,7 +599,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
@@ -583,7 +605,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SetFontList(font_list());
render_text->set_shadows(GetShadows());
render_text->SetCursorEnabled(false);
@@ -207,7 +207,7 @@ index 21a8fa0fa8eb..55a2e57a2e6f 100644
render_text->SetMultiline(multiline);
render_text->SetMaxLines(multiline ? GetMaxLines() : 0);
diff --git ui/views/controls/label.h ui/views/controls/label.h
index aea6bb5b7b13..9ce9947174d4 100644
index d6e1ad61e5e1..5abc861469c8 100644
--- ui/views/controls/label.h
+++ ui/views/controls/label.h
@@ -176,6 +176,10 @@ class VIEWS_EXPORT Label : public View,
@@ -221,7 +221,7 @@ index aea6bb5b7b13..9ce9947174d4 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
@@ -408,6 +412,7 @@ class VIEWS_EXPORT Label : public View,
@@ -412,6 +416,7 @@ class VIEWS_EXPORT Label : public View,
bool collapse_when_hidden_;
int fixed_width_;
int max_width_;
@@ -230,10 +230,10 @@ index aea6bb5b7b13..9ce9947174d4 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index bbb1cc387eb2..f1b64580a780 100644
index 36e7f97887fd..940fb3d8a338 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2643,8 +2643,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2646,8 +2646,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@@ -248,7 +248,7 @@ index bbb1cc387eb2..f1b64580a780 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2663,8 +2668,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2666,8 +2671,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@@ -300,10 +300,10 @@ index bdbd9c7e37b8..86138fd1d21c 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 e86941132ce8..035296ce4bc2 100644
index 07fc2153d8ad..f3fce1b3fd88 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1034,6 +1034,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -1035,6 +1035,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);
@@ -318,8 +318,8 @@ index e86941132ce8..035296ce4bc2 100644
+ canvas->DrawColor(override_color);
} else if (render_selection) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == ACTIONABLE_SUBMENU) {
@@ -1101,6 +1110,13 @@ void MenuItemView::PaintMinorIconAndText(
if (type_ == Type::kActionableSubMenu) {
@@ -1102,6 +1111,13 @@ void MenuItemView::PaintMinorIconAndText(
}
SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {
@@ -334,7 +334,7 @@ index e86941132ce8..035296ce4bc2 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 beac9986b2c6..f75e85ae6215 100644
index 792b864594b3..58015004ac44 100644
--- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc
@@ -229,6 +229,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
@@ -441,7 +441,7 @@ index 78f832fd3acf..cb030c991614 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 1a5af9db833f..60a61700a615 100644
index 2bd5d97fccea..996b94916a15 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -189,6 +189,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -472,7 +472,7 @@ index 6e69e4018a3b..f44fadcbb4c1 100644
// Move the cursor because EnterNotify/LeaveNotify are generated with the
// current mouse position as a result of XGrabPointer()
diff --git ui/views/view.h ui/views/view.h
index 4721462253e0..dd08911a0eaf 100644
index be4814ab5df3..dcddea54b813 100644
--- ui/views/view.h
+++ ui/views/view.h
@@ -22,6 +22,7 @@
@@ -483,13 +483,11 @@ index 4721462253e0..dd08911a0eaf 100644
#include "build/build_config.h"
#include "third_party/skia/include/core/SkPath.h"
#include "ui/accessibility/ax_enums.mojom-forward.h"
@@ -270,7 +271,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::EventTarget,
@@ -273,6 +274,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::EventHandler,
public ui::PropertyHandler,
- public views::metadata::MetaDataProvider {
+ public views::metadata::MetaDataProvider,
+ public base::SupportsUserData {
public metadata::MetaDataProvider,
+ public base::SupportsUserData,
public virtual WidgetGetter {
public:
using Views = std::vector<View*>;