From ce4e05b85a5553ccc1ef84114daa526745aba851 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 26 Jul 2018 18:38:37 +0900 Subject: [PATCH] fix: pass scrollBounce by command line flag (#13812) Implement the scrollBounce option by reading the command line flag in `RenderThreadImpl::IsElasticOverscrollEnabled`, there is no more need to set NSScrollViewRubberbanding. --- atom/renderer/renderer_client_base.cc | 10 ---------- vendor/libchromiumcontent | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/atom/renderer/renderer_client_base.cc b/atom/renderer/renderer_client_base.cc index 3af38a0c8ae1..46aa2c8d43ac 100644 --- a/atom/renderer/renderer_client_base.cc +++ b/atom/renderer/renderer_client_base.cc @@ -35,7 +35,6 @@ #include "third_party/WebKit/public/web/WebSecurityPolicy.h" #if defined(OS_MACOSX) -#include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" #endif @@ -158,15 +157,6 @@ void RendererClientBase::RenderThreadStarted() { SetCurrentProcessExplicitAppUserModelID(app_id.c_str()); } #endif - -#if defined(OS_MACOSX) - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - bool scroll_bounce = command_line->HasSwitch(switches::kScrollBounce); - CFPreferencesSetAppValue(CFSTR("NSScrollViewRubberbanding"), - scroll_bounce ? kCFBooleanTrue : kCFBooleanFalse, - kCFPreferencesCurrentApplication); - CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication); -#endif } void RendererClientBase::RenderFrameCreated( diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent index 659aa8337580..c2548454a768 160000 --- a/vendor/libchromiumcontent +++ b/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 659aa83375805545402eff8b0746784bbf2d64c2 +Subproject commit c2548454a768a671caae97b0e2d389f72aafdc97