mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation errors for Linux

Browse source
This commit is contained in:
Cheng Zhao 2016-12-02 17:44:09 +09:00 committed by Birunthan Mohanathas
parent 93a27fd3a9
commit 88f6f5d1b2
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -761,10 +761,6 @@ void OffScreenRenderWidgetHostView::SetBeginFrameSource(
cc::BeginFrameSource* source) { cc::BeginFrameSource* source) {
} }
bool OffScreenRenderWidgetHostView::IsAutoResizeEnabled() const {
return render_widget_host_->auto_resize_enabled();
}
#endif // !defined(OS_MACOSX) #endif // !defined(OS_MACOSX)
std::unique_ptr<cc::SoftwareOutputDevice> std::unique_ptr<cc::SoftwareOutputDevice>

2
atom/browser/ui/views/submenu_button.cc
View file

@ -49,7 +49,7 @@ SubmenuButton::SubmenuButton(const base::string16& title,
gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_, gfx::Canvas::SizeStringInt(GetText(), GetFontList(), &text_width_,
&text_height_, 0, 0); &text_height_, 0, 0);
SetHasInkDrop(true); SetInkDropMode(InkDropMode::ON);
set_ink_drop_base_color( set_ink_drop_base_color(
color_utils::BlendTowardOppositeLuma(background_color_, 0x61)); color_utils::BlendTowardOppositeLuma(background_color_, 0x61));
} }

2
script/lib/config.py
View file

@ -9,7 +9,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
'f1e9cdb45ec6e08fecc6f116661713e3e4d11a70' 'a42d67f7c75e7efff14089af0b9277f8392970fb'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',