mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 86.0.4240.0 (#800218)
- CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214).
This commit is contained in:
@ -49,7 +49,7 @@ CEF_BUTTON_IMPL_T class CefButtonImpl : public CEF_VIEW_IMPL_D {
|
||||
|
||||
CEF_BUTTON_IMPL_T void CEF_BUTTON_IMPL_D::SetState(cef_button_state_t state) {
|
||||
CEF_REQUIRE_VALID_RETURN_VOID();
|
||||
views::Button::ButtonState old_state = ParentClass::root_view()->state();
|
||||
views::Button::ButtonState old_state = ParentClass::root_view()->GetState();
|
||||
views::Button::ButtonState new_state =
|
||||
static_cast<views::Button::ButtonState>(state);
|
||||
|
||||
@ -72,7 +72,7 @@ CEF_BUTTON_IMPL_T void CEF_BUTTON_IMPL_D::SetState(cef_button_state_t state) {
|
||||
|
||||
CEF_BUTTON_IMPL_T cef_button_state_t CEF_BUTTON_IMPL_D::GetState() {
|
||||
CEF_REQUIRE_VALID_RETURN(CEF_BUTTON_STATE_NORMAL);
|
||||
return static_cast<cef_button_state_t>(ParentClass::root_view()->state());
|
||||
return static_cast<cef_button_state_t>(ParentClass::root_view()->GetState());
|
||||
}
|
||||
|
||||
CEF_BUTTON_IMPL_T void CEF_BUTTON_IMPL_D::SetInkDropEnabled(bool enabled) {
|
||||
|
@ -61,7 +61,7 @@ CEF_BUTTON_VIEW_T void CEF_BUTTON_VIEW_D::ButtonPressed(
|
||||
ParentClass::cef_delegate()->OnButtonPressed(GetCefButton());
|
||||
if (ParentClass::ink_drop_mode() != views::Button::InkDropMode::OFF &&
|
||||
!ParentClass::IsFocusable() &&
|
||||
ParentClass::state() != views::Button::STATE_PRESSED) {
|
||||
ParentClass::GetState() != views::Button::STATE_PRESSED) {
|
||||
// Ink drop state does not get reset properly on click when the button is
|
||||
// non-focusable. Reset the ink drop state here if the state has not been
|
||||
// explicitly set to pressed by the OnButtonPressed callback calling
|
||||
|
@ -18,7 +18,7 @@
|
||||
// CefButtonView template.
|
||||
class MenuButtonEx : public views::MenuButton, public views::ButtonListener {
|
||||
public:
|
||||
MenuButtonEx() : views::MenuButton(base::string16(), this) {
|
||||
MenuButtonEx() : views::MenuButton(this, base::string16()) {
|
||||
// TODO(cef): MenuButton should not use ButtonListener. See
|
||||
// http://crbug.com/585252 for details.
|
||||
Button::listener_ = this;
|
||||
|
@ -36,7 +36,11 @@ class ClientViewEx : public views::ClientView {
|
||||
DCHECK(window_delegate_);
|
||||
}
|
||||
|
||||
bool CanClose() override { return window_delegate_->CanWidgetClose(); }
|
||||
views::CloseRequestResult OnWindowCloseRequested() override {
|
||||
return window_delegate_->CanWidgetClose()
|
||||
? views::CloseRequestResult::kCanClose
|
||||
: views::CloseRequestResult::kCannotClose;
|
||||
}
|
||||
|
||||
private:
|
||||
CefWindowView::Delegate* window_delegate_; // Not owned by this object.
|
||||
@ -404,15 +408,15 @@ views::ClientView* CefWindowView::CreateClientView(views::Widget* widget) {
|
||||
return new ClientViewEx(widget, GetContentsView(), window_delegate_);
|
||||
}
|
||||
|
||||
views::NonClientFrameView* CefWindowView::CreateNonClientFrameView(
|
||||
views::Widget* widget) {
|
||||
std::unique_ptr<views::NonClientFrameView>
|
||||
CefWindowView::CreateNonClientFrameView(views::Widget* widget) {
|
||||
if (is_frameless_) {
|
||||
// Custom frame type that doesn't render a caption.
|
||||
return new CaptionlessFrameView(widget, this);
|
||||
return std::make_unique<CaptionlessFrameView>(widget, this);
|
||||
} else if (widget->ShouldUseNativeFrame()) {
|
||||
// DesktopNativeWidgetAura::CreateNonClientFrameView() returns
|
||||
// NativeFrameView by default. Extend that type.
|
||||
return new NativeFrameViewEx(widget, this);
|
||||
return std::make_unique<NativeFrameViewEx>(widget, this);
|
||||
}
|
||||
|
||||
// Use Chromium provided CustomFrameView. In case if we would like to
|
||||
|
@ -63,7 +63,7 @@ class CefWindowView
|
||||
void WindowClosing() override;
|
||||
views::View* GetContentsView() override;
|
||||
views::ClientView* CreateClientView(views::Widget* widget) override;
|
||||
views::NonClientFrameView* CreateNonClientFrameView(
|
||||
std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
|
||||
views::Widget* widget) override;
|
||||
bool ShouldDescendIntoChildForEventHandling(
|
||||
gfx::NativeView child,
|
||||
|
Reference in New Issue
Block a user