From b78992bc14818205f1bdf1a8c740427e8ac2cf0b Mon Sep 17 00:00:00 2001 From: ccameron Date: Sun, 8 Mar 2015 00:54:57 -0800 Subject: [PATCH] Mac: Remove flag to disable threaded event handling BUG=133097 Review URL: https://codereview.chromium.org/982643003 Cr-Commit-Position: refs/heads/master@{#319587} --- content/browser/renderer_host/render_process_host_impl.cc | 3 --- content/browser/renderer_host/render_view_host_impl.cc | 8 -------- content/public/common/common_param_traits_macros.h | 1 - content/public/common/content_switches.cc | 6 ------ content/public/common/web_preferences.cc | 1 - content/public/common/web_preferences.h | 1 - content/renderer/render_thread_impl.cc | 5 +---- content/renderer/render_view_impl.cc | 2 -- 8 files changed, 1 insertion(+), 26 deletions(-) diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 7f5c54d7269a..3f9003bfabf6 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1362,9 +1362,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, #endif -#if defined(OS_MACOSX) && !defined(OS_IOS) - switches::kDisableThreadedEventHandlingMac, -#endif #if defined(OS_WIN) switches::kDisableDirectWrite, switches::kEnableWin32kRendererLockDown, diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index aee80e4402c9..4b8b1c22cb68 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -401,14 +401,6 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { prefs.pinch_virtual_viewport_enabled = true; prefs.pinch_overlay_scrollbar_thickness = 10; } -#if defined(OS_MACOSX) - // This preference has the effect of disabling Blink's elastic overscroll, - // and may be removed when Blink's elastic overscroll implementation is - // removed. - // http://crbug.com/138003 - prefs.rubber_banding_on_compositor_thread = - !command_line.HasSwitch(switches::kDisableThreadedEventHandlingMac); -#endif prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); #if defined(OS_ANDROID) diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index e0b9760eab07..53f112826e2a 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -145,7 +145,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) IPC_STRUCT_TRAITS_MEMBER(pepper_3d_enabled) IPC_STRUCT_TRAITS_MEMBER(pinch_virtual_viewport_enabled) IPC_STRUCT_TRAITS_MEMBER(pinch_overlay_scrollbar_thickness) - IPC_STRUCT_TRAITS_MEMBER(rubber_banding_on_compositor_thread) IPC_STRUCT_TRAITS_MEMBER(use_solid_color_scrollbars) IPC_STRUCT_TRAITS_MEMBER(flash_3d_enabled) IPC_STRUCT_TRAITS_MEMBER(flash_stage3d_enabled) diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 50f0a8ceff2c..c2fed1e7de1d 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -958,12 +958,6 @@ const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher"; // accelerated compositing is disabled. See http://crbug.com/122430. const char kDisableCoreAnimationPlugins[] = "disable-core-animation-plugins"; - -// Force all input events to be handled by Blink on thread. This will be removed -// once compositor thread events have stuck. -// http://crbug.com/138003 -extern const char kDisableThreadedEventHandlingMac[] = - "disable-threaded-event-handling-mac"; #endif #if defined(OS_WIN) diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc index 1a4c116be4f6..b61e1dc83906 100644 --- a/content/public/common/web_preferences.cc +++ b/content/public/common/web_preferences.cc @@ -187,7 +187,6 @@ WebPreferences::WebPreferences() spatial_navigation_enabled(false), pinch_virtual_viewport_enabled(false), pinch_overlay_scrollbar_thickness(0), - rubber_banding_on_compositor_thread(false), use_solid_color_scrollbars(false), navigate_on_drag_drop(true), v8_cache_options(V8_CACHE_OPTIONS_DEFAULT), diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h index bb47acb93d77..8d25487b9a22 100644 --- a/content/public/common/web_preferences.h +++ b/content/public/common/web_preferences.h @@ -179,7 +179,6 @@ struct CONTENT_EXPORT WebPreferences { bool spatial_navigation_enabled; bool pinch_virtual_viewport_enabled; int pinch_overlay_scrollbar_thickness; - bool rubber_banding_on_compositor_thread; bool use_solid_color_scrollbars; bool navigate_on_drag_drop; V8CacheOptions v8_cache_options; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 419e8aa7cfc8..c4d9b5e673e9 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -564,10 +564,7 @@ void RenderThreadImpl::Init() { is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); #if defined(OS_MACOSX) && !defined(OS_IOS) - is_elastic_overscroll_enabled_ = - !base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableThreadedEventHandlingMac) && - base::mac::IsOSLionOrLater(); + is_elastic_overscroll_enabled_ = base::mac::IsOSLionOrLater(); if (is_elastic_overscroll_enabled_) { base::ScopedCFTypeRef key( base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding")); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 3eee7b2993ef..ff77a10a0297 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -1120,8 +1120,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, settings->setPinchOverlayScrollbarThickness( prefs.pinch_overlay_scrollbar_thickness); - settings->setRubberBandingOnCompositorThread( - prefs.rubber_banding_on_compositor_thread); settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); -- 2.11.4.GIT