diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 575ac8c579f0..9762351de228 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -162,6 +162,9 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) { std::string color; if (options.Get(options::kBackgroundColor, &color)) { SetBackgroundColor(color); + } else if (has_frame()) { + // For window with frame, use white as default background. + SetBackgroundColor("#FFFF"); } std::string title("Electron"); options.Get(options::kTitle, &title); diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index bb8bd9387619..3c76cbe25a57 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -10,6 +10,7 @@ #include "atom/common/draggable_region.h" #include "atom/common/options_switches.h" #include "base/mac/mac_util.h" +#include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" #include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents_view.h" @@ -806,8 +807,9 @@ bool NativeWindowMac::IsKiosk() { } void NativeWindowMac::SetBackgroundColor(const std::string& color_name) { - SkColor color = ParseHexColor(color_name); - [window_ setBackgroundColor:skia::SkColorToCalibratedNSColor(color)]; + base::ScopedCFTypeRef color = + skia::CGColorCreateFromSkColor(ParseHexColor(color_name)); + [[[window_ contentView] layer] setBackgroundColor:color]; } void NativeWindowMac::SetHasShadow(bool has_shadow) { diff --git a/script/lib/config.py b/script/lib/config.py index 83960e68e2cd..707917f6f10b 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = 'd41c1e48f428257d99abcf29fd9f26928e9fc53e' +LIBCHROMIUMCONTENT_COMMIT = '9229f39b44ca1dde25db9c648547861286b61935' PLATFORM = { 'cygwin': 'win32',