From 4a7125d9f831b47993e2e7b16e64f55cf78f7f78 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Mon, 17 Apr 2017 23:21:43 +0300 Subject: [PATCH 1/2] Update libcc for electron/libchromiumcontent#285 This fixes non-client area DPI scaling on recent Windows 10 versions. See discussion in #8786. --- script/lib/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/config.py b/script/lib/config.py index d033d8a41c6a..5818571089ff 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 \ - '8d551064d2b3d11f89ce8d5c4610f34e0408bad8' + '4a0e32606e52c12c50c2e3a0973d015d8cdff494' PLATFORM = { 'cygwin': 'win32', From 3bcf5e0e9f0862d62fdd9e937225e9137300d98e Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 18 Apr 2017 11:51:38 +0300 Subject: [PATCH 2/2] Fix OverrideSiteInstanceForNavigation() signature --- atom/browser/atom_browser_client.cc | 1 + atom/browser/atom_browser_client.h | 1 + 2 files changed, 2 insertions(+) diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index d0bbf4ad535f..9b096ae8aef6 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -172,6 +172,7 @@ std::string AtomBrowserClient::GetApplicationLocale() { } void AtomBrowserClient::OverrideSiteInstanceForNavigation( + content::RenderFrameHost* render_frame_host, content::BrowserContext* browser_context, content::SiteInstance* current_instance, const GURL& url, diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index c2a7d5edd0f4..70573d6eee37 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -54,6 +54,7 @@ class AtomBrowserClient : public brightray::BrowserClient, content::WebPreferences* prefs) override; std::string GetApplicationLocale() override; void OverrideSiteInstanceForNavigation( + content::RenderFrameHost* render_frame_host, content::BrowserContext* browser_context, content::SiteInstance* current_instance, const GURL& dest_url,