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

Side by Side Diff: content/renderer/input/input_handler_wrapper.cc

Issue 2649573003: Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « content/renderer/input/input_handler_wrapper.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/input/input_handler_wrapper.h" 5 #include "content/renderer/input/input_handler_wrapper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "content/public/common/content_features.h" 9 #include "content/public/common/content_features.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/renderer/input/input_event_filter.h" 11 #include "content/renderer/input/input_event_filter.h"
12 #include "content/renderer/input/input_handler_manager.h" 12 #include "content/renderer/input/input_handler_manager.h"
13 #include "third_party/WebKit/public/platform/Platform.h" 13 #include "third_party/WebKit/public/platform/Platform.h"
14 #include "ui/events/blink/did_overscroll_params.h" 14 #include "ui/events/blink/did_overscroll_params.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 InputHandlerWrapper::InputHandlerWrapper( 18 InputHandlerWrapper::InputHandlerWrapper(
19 InputHandlerManager* input_handler_manager, 19 InputHandlerManager* input_handler_manager,
20 int routing_id, 20 int routing_id,
21 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, 21 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
22 const base::WeakPtr<cc::InputHandler>& input_handler, 22 const base::WeakPtr<cc::InputHandler>& input_handler,
23 const base::WeakPtr<RenderWidget>& render_widget, 23 const base::WeakPtr<RenderViewImpl>& render_view_impl,
24 bool enable_smooth_scrolling) 24 bool enable_smooth_scrolling)
25 : input_handler_manager_(input_handler_manager), 25 : input_handler_manager_(input_handler_manager),
26 routing_id_(routing_id), 26 routing_id_(routing_id),
27 input_handler_proxy_(input_handler.get(), this), 27 input_handler_proxy_(input_handler.get(), this),
28 main_task_runner_(main_task_runner), 28 main_task_runner_(main_task_runner),
29 render_widget_(render_widget) { 29 render_view_impl_(render_view_impl) {
30 DCHECK(input_handler); 30 DCHECK(input_handler);
31 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling); 31 input_handler_proxy_.set_smooth_scroll_enabled(enable_smooth_scrolling);
32 input_handler_proxy_.set_touchpad_and_wheel_scroll_latching_enabled( 32 input_handler_proxy_.set_touchpad_and_wheel_scroll_latching_enabled(
33 base::FeatureList::IsEnabled(features::kTouchpadAndWheelScrollLatching)); 33 base::FeatureList::IsEnabled(features::kTouchpadAndWheelScrollLatching));
34 } 34 }
35 35
36 InputHandlerWrapper::~InputHandlerWrapper() { 36 InputHandlerWrapper::~InputHandlerWrapper() {
37 } 37 }
38 38
39 void InputHandlerWrapper::NeedsMainFrame() { 39 void InputHandlerWrapper::NeedsMainFrame() {
40 main_task_runner_->PostTask( 40 main_task_runner_->PostTask(
41 FROM_HERE, 41 FROM_HERE,
42 base::Bind(&RenderWidget::SetNeedsMainFrame, render_widget_)); 42 base::Bind(&RenderViewImpl::SetNeedsMainFrame, render_view_impl_));
43 } 43 }
44 44
45 void InputHandlerWrapper::TransferActiveWheelFlingAnimation( 45 void InputHandlerWrapper::TransferActiveWheelFlingAnimation(
46 const blink::WebActiveWheelFlingParameters& params) { 46 const blink::WebActiveWheelFlingParameters& params) {
47 main_task_runner_->PostTask( 47 main_task_runner_->PostTask(
48 FROM_HERE, base::Bind(&RenderWidget::TransferActiveWheelFlingAnimation, 48 FROM_HERE, base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation,
49 render_widget_, params)); 49 render_view_impl_, params));
50 } 50 }
51 51
52 void InputHandlerWrapper::DispatchNonBlockingEventToMainThread( 52 void InputHandlerWrapper::DispatchNonBlockingEventToMainThread(
53 blink::WebScopedInputEvent event, 53 blink::WebScopedInputEvent event,
54 const ui::LatencyInfo& latency_info) { 54 const ui::LatencyInfo& latency_info) {
55 input_handler_manager_->DispatchNonBlockingEventToMainThread( 55 input_handler_manager_->DispatchNonBlockingEventToMainThread(
56 routing_id_, std::move(event), latency_info); 56 routing_id_, std::move(event), latency_info);
57 } 57 }
58 58
59 void InputHandlerWrapper::WillShutdown() { 59 void InputHandlerWrapper::WillShutdown() {
(...skipping 23 matching lines...) Expand all
83 83
84 void InputHandlerWrapper::DidStopFlinging() { 84 void InputHandlerWrapper::DidStopFlinging() {
85 input_handler_manager_->DidStopFlinging(routing_id_); 85 input_handler_manager_->DidStopFlinging(routing_id_);
86 } 86 }
87 87
88 void InputHandlerWrapper::DidAnimateForInput() { 88 void InputHandlerWrapper::DidAnimateForInput() {
89 input_handler_manager_->DidAnimateForInput(); 89 input_handler_manager_->DidAnimateForInput();
90 } 90 }
91 91
92 } // namespace content 92 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/input/input_handler_wrapper.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698