diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 84a14910793b..3f948dfaebb4 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -761,10 +761,6 @@ void OffScreenRenderWidgetHostView::SetBeginFrameSource( cc::BeginFrameSource* source) { } -bool OffScreenRenderWidgetHostView::IsAutoResizeEnabled() const { - return render_widget_host_->auto_resize_enabled(); -} - #endif // !defined(OS_MACOSX) std::unique_ptr diff --git a/atom/browser/ui/views/submenu_button.cc b/atom/browser/ui/views/submenu_button.cc index f7f954824f7b..f8257b002749 100644 --- a/atom/browser/ui/views/submenu_button.cc +++ b/atom/browser/ui/views/submenu_button.cc @@ -49,7 +49,7 @@ SubmenuButton::SubmenuButton(const base::string16& title, gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_, &text_height_, 0, 0); - SetHasInkDrop(true); + SetInkDropMode(InkDropMode::ON); set_ink_drop_base_color( color_utils::BlendTowardOppositeLuma(background_color_, 0x61)); } diff --git a/script/lib/config.py b/script/lib/config.py index 65a772c94acf..87cb90aad56b 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -9,7 +9,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ - 'f1e9cdb45ec6e08fecc6f116661713e3e4d11a70' + 'a42d67f7c75e7efff14089af0b9277f8392970fb' PLATFORM = { 'cygwin': 'win32',