Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "content/child/request_extra_data.h" 43 #include "content/child/request_extra_data.h"
44 #include "content/child/v8_value_converter_impl.h" 44 #include "content/child/v8_value_converter_impl.h"
45 #include "content/child/webmessageportchannel_impl.h" 45 #include "content/child/webmessageportchannel_impl.h"
46 #include "content/common/content_constants_internal.h" 46 #include "content/common/content_constants_internal.h"
47 #include "content/common/content_switches_internal.h" 47 #include "content/common/content_switches_internal.h"
48 #include "content/common/database_messages.h" 48 #include "content/common/database_messages.h"
49 #include "content/common/dom_storage/dom_storage_types.h" 49 #include "content/common/dom_storage/dom_storage_types.h"
50 #include "content/common/drag_messages.h" 50 #include "content/common/drag_messages.h"
51 #include "content/common/frame_messages.h" 51 #include "content/common/frame_messages.h"
52 #include "content/common/frame_replication_state.h" 52 #include "content/common/frame_replication_state.h"
53 #include "content/common/input/input_event_utils.h"
54 #include "content/common/input_messages.h" 53 #include "content/common/input_messages.h"
55 #include "content/common/page_messages.h" 54 #include "content/common/page_messages.h"
56 #include "content/common/site_isolation_policy.h" 55 #include "content/common/site_isolation_policy.h"
57 #include "content/common/ssl_status_serialization.h" 56 #include "content/common/ssl_status_serialization.h"
58 #include "content/common/view_messages.h" 57 #include "content/common/view_messages.h"
59 #include "content/public/common/bindings_policy.h" 58 #include "content/public/common/bindings_policy.h"
60 #include "content/public/common/content_client.h" 59 #include "content/public/common/content_client.h"
61 #include "content/public/common/content_constants.h" 60 #include "content/public/common/content_constants.h"
62 #include "content/public/common/content_switches.h" 61 #include "content/public/common/content_switches.h"
63 #include "content/public/common/drop_data.h" 62 #include "content/public/common/drop_data.h"
(...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled(); 2001 use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled();
2003 #endif 2002 #endif
2004 if (use_threaded_event_handling) { 2003 if (use_threaded_event_handling) {
2005 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 2004 RenderThreadImpl* render_thread = RenderThreadImpl::current();
2006 // render_thread may be NULL in tests. 2005 // render_thread may be NULL in tests.
2007 InputHandlerManager* input_handler_manager = 2006 InputHandlerManager* input_handler_manager =
2008 render_thread ? render_thread->input_handler_manager() : NULL; 2007 render_thread ? render_thread->input_handler_manager() : NULL;
2009 if (input_handler_manager) { 2008 if (input_handler_manager) {
2010 input_handler_manager->AddInputHandler( 2009 input_handler_manager->AddInputHandler(
2011 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(), 2010 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
2012 webkit_preferences_.enable_scroll_animator, 2011 webkit_preferences_.enable_scroll_animator);
2013 UseGestureBasedWheelScrolling());
2014 } 2012 }
2015 } 2013 }
2016 } 2014 }
2017 2015
2018 bool RenderViewImpl::allowsBrokenNullLayerTreeView() const { 2016 bool RenderViewImpl::allowsBrokenNullLayerTreeView() const {
2019 return RenderWidget::allowsBrokenNullLayerTreeView(); 2017 return RenderWidget::allowsBrokenNullLayerTreeView();
2020 } 2018 }
2021 2019
2022 void RenderViewImpl::closeWidgetSoon() { 2020 void RenderViewImpl::closeWidgetSoon() {
2023 RenderWidget::closeWidgetSoon(); 2021 RenderWidget::closeWidgetSoon();
(...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after
3339 return render_frame->focused_pepper_plugin(); 3337 return render_frame->focused_pepper_plugin();
3340 } 3338 }
3341 frame = frame->traverseNext(false); 3339 frame = frame->traverseNext(false);
3342 } 3340 }
3343 3341
3344 return nullptr; 3342 return nullptr;
3345 } 3343 }
3346 #endif 3344 #endif
3347 3345
3348 } // namespace content 3346 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698