mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 76.0.3809.0 (#665002)
OSR tests will be fixed by a follow-up merge of Viz support (see issue #2575).
This commit is contained in:
committed by
Marshall Greenblatt
parent
5892ffc382
commit
cc0db5f166
@@ -123,9 +123,9 @@ static inline int MiddleY(const CefRect& rect) {
|
||||
struct CefIAccessible : public IAccessible {
|
||||
public:
|
||||
// Implement IUnknown
|
||||
STDMETHODIMP QueryInterface(REFIID riid, void** ppvObject);
|
||||
STDMETHODIMP_(ULONG) AddRef();
|
||||
STDMETHODIMP_(ULONG) Release();
|
||||
STDMETHODIMP QueryInterface(REFIID riid, void** ppvObject) override;
|
||||
STDMETHODIMP_(ULONG) AddRef() override;
|
||||
STDMETHODIMP_(ULONG) Release() override;
|
||||
|
||||
//
|
||||
// IAccessible methods.
|
||||
@@ -196,15 +196,15 @@ struct CefIAccessible : public IAccessible {
|
||||
STDMETHODIMP put_accName(VARIANT var_id, BSTR put_name) override;
|
||||
|
||||
// Implement IDispatch
|
||||
STDMETHODIMP GetTypeInfoCount(unsigned int FAR* pctinfo);
|
||||
STDMETHODIMP GetTypeInfoCount(unsigned int FAR* pctinfo) override;
|
||||
STDMETHODIMP GetTypeInfo(unsigned int iTInfo,
|
||||
LCID lcid,
|
||||
ITypeInfo FAR* FAR* ppTInfo);
|
||||
ITypeInfo FAR* FAR* ppTInfo) override;
|
||||
STDMETHODIMP GetIDsOfNames(REFIID riid,
|
||||
OLECHAR FAR* FAR* rgszNames,
|
||||
unsigned int cNames,
|
||||
LCID lcid,
|
||||
DISPID FAR* rgDispId);
|
||||
DISPID FAR* rgDispId) override;
|
||||
STDMETHODIMP Invoke(DISPID dispIdMember,
|
||||
REFIID riid,
|
||||
LCID lcid,
|
||||
@@ -212,7 +212,7 @@ struct CefIAccessible : public IAccessible {
|
||||
DISPPARAMS FAR* pDispParams,
|
||||
VARIANT FAR* pVarResult,
|
||||
EXCEPINFO FAR* pExcepInfo,
|
||||
unsigned int FAR* puArgErr);
|
||||
unsigned int FAR* puArgErr) override;
|
||||
|
||||
CefIAccessible(OsrAXNode* node) : ref_count_(0), node_(node) {}
|
||||
|
||||
|
@@ -76,7 +76,7 @@ CefRefPtr<CefMenuModel> ViewsMenuBar::CreateMenuModel(const CefString& label,
|
||||
|
||||
// Create the new MenuButton.
|
||||
CefRefPtr<CefMenuButton> button =
|
||||
CefMenuButton::CreateMenuButton(this, label, false);
|
||||
CefMenuButton::CreateMenuButton(this, label);
|
||||
button->SetID(new_menu_id);
|
||||
views_style::ApplyTo(button.get());
|
||||
button->SetInkDropEnabled(true);
|
||||
|
@@ -719,23 +719,13 @@ void ViewsWindow::CreateMenuModel() {
|
||||
CefRefPtr<CefLabelButton> ViewsWindow::CreateBrowseButton(
|
||||
const std::string& label,
|
||||
int id) {
|
||||
// The default framed button image resources (IDR_BUTTON_*) look pretty bad
|
||||
// with non-default background colors, so we'll use frameless buttons with
|
||||
// ink drop when a background color is specified.
|
||||
const bool with_frame = !views_style::IsSet();
|
||||
|
||||
CefRefPtr<CefLabelButton> button =
|
||||
CefLabelButton::CreateLabelButton(this, label, with_frame);
|
||||
CefLabelButton::CreateLabelButton(this, label);
|
||||
button->SetID(id);
|
||||
button->SetEnabled(false); // Disabled by default.
|
||||
button->SetFocusable(false); // Don't give focus to the button.
|
||||
|
||||
if (!with_frame) {
|
||||
views_style::ApplyTo(button);
|
||||
button->SetInkDropEnabled(true);
|
||||
button->SetHorizontalAlignment(CEF_HORIZONTAL_ALIGNMENT_CENTER);
|
||||
}
|
||||
|
||||
return button;
|
||||
}
|
||||
|
||||
@@ -762,7 +752,7 @@ void ViewsWindow::AddControls() {
|
||||
|
||||
// Create the menu button.
|
||||
CefRefPtr<CefMenuButton> menu_button =
|
||||
CefMenuButton::CreateMenuButton(this, CefString(), false);
|
||||
CefMenuButton::CreateMenuButton(this, CefString());
|
||||
menu_button->SetID(ID_MENU_BUTTON);
|
||||
menu_button->SetImage(
|
||||
CEF_BUTTON_STATE_NORMAL,
|
||||
@@ -907,7 +897,7 @@ void ViewsWindow::UpdateExtensionControls() {
|
||||
for (int id = ID_EXTENSION_BUTTON_FIRST;
|
||||
it != extensions_.end() && id <= ID_EXTENSION_BUTTON_LAST; ++id, ++it) {
|
||||
CefRefPtr<CefMenuButton> button =
|
||||
CefMenuButton::CreateMenuButton(this, CefString(), false);
|
||||
CefMenuButton::CreateMenuButton(this, CefString());
|
||||
button->SetID(id);
|
||||
button->SetImage(CEF_BUTTON_STATE_NORMAL, (*it).image_);
|
||||
views_style::ApplyTo(button.get());
|
||||
|
Reference in New Issue
Block a user