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

Side by Side Diff: content/renderer/input/input_handler_manager.h

Issue 2048023005: Remove ObserveWheelEventAndResult callbacks since they are now gesture based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_2
Patch Set: Rebase 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
« no previous file with comments | « no previous file | content/renderer/input/input_handler_manager.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 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // Callable from the main thread only. 55 // Callable from the main thread only.
56 void AddInputHandler(int routing_id, 56 void AddInputHandler(int routing_id,
57 const base::WeakPtr<cc::InputHandler>& input_handler, 57 const base::WeakPtr<cc::InputHandler>& input_handler,
58 const base::WeakPtr<RenderViewImpl>& render_view_impl, 58 const base::WeakPtr<RenderViewImpl>& render_view_impl,
59 bool enable_smooth_scrolling); 59 bool enable_smooth_scrolling);
60 60
61 void RegisterRoutingID(int routing_id); 61 void RegisterRoutingID(int routing_id);
62 void UnregisterRoutingID(int routing_id); 62 void UnregisterRoutingID(int routing_id);
63 63
64 void ObserveWheelEventAndResultOnMainThread(
65 int routing_id,
66 const blink::WebMouseWheelEvent& wheel_event,
67 const cc::InputHandlerScrollResult& scroll_result);
68
69 void ObserveGestureEventAndResultOnMainThread( 64 void ObserveGestureEventAndResultOnMainThread(
70 int routing_id, 65 int routing_id,
71 const blink::WebGestureEvent& gesture_event, 66 const blink::WebGestureEvent& gesture_event,
72 const cc::InputHandlerScrollResult& scroll_result); 67 const cc::InputHandlerScrollResult& scroll_result);
73 68
74 void NotifyInputEventHandledOnMainThread(int routing_id, 69 void NotifyInputEventHandledOnMainThread(int routing_id,
75 blink::WebInputEvent::Type); 70 blink::WebInputEvent::Type);
76 71
77 // Callback only from the compositor's thread. 72 // Callback only from the compositor's thread.
78 void RemoveInputHandler(int routing_id); 73 void RemoveInputHandler(int routing_id);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 121 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
127 InputHandlerManagerClient* const client_; 122 InputHandlerManagerClient* const client_;
128 // May be null. 123 // May be null.
129 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_; 124 SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_;
130 scheduler::RendererScheduler* const renderer_scheduler_; // Not owned. 125 scheduler::RendererScheduler* const renderer_scheduler_; // Not owned.
131 }; 126 };
132 127
133 } // namespace content 128 } // namespace content
134 129
135 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 130 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/input/input_handler_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698