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

Side by Side Diff: content/browser/renderer_host/render_widget_host_input_event_router.h

Issue 2186983002: Re-route Touchscreen GesturePinch events to root view. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address kenrb@'s comments. Created 4 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <deque> 10 #include <deque>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const blink::WebGestureEvent& event); 130 const blink::WebGestureEvent& event);
131 131
132 SurfaceClientIdOwnerMap owner_map_; 132 SurfaceClientIdOwnerMap owner_map_;
133 TargetQueue touchscreen_gesture_target_queue_; 133 TargetQueue touchscreen_gesture_target_queue_;
134 TargetData touch_target_; 134 TargetData touch_target_;
135 TargetData touchscreen_gesture_target_; 135 TargetData touchscreen_gesture_target_;
136 TargetData touchpad_gesture_target_; 136 TargetData touchpad_gesture_target_;
137 TargetData bubbling_gesture_scroll_target_; 137 TargetData bubbling_gesture_scroll_target_;
138 TargetData first_bubbling_scroll_target_; 138 TargetData first_bubbling_scroll_target_;
139 int active_touches_; 139 int active_touches_;
140 bool in_touchscreen_gesture_pinch_;
Charlie Reis 2016/07/28 17:23:02 Can you add comments for these? It's a bit unfort
wjmaclean 2016/07/29 14:28:31 Done.
141 bool root_view_gesture_scrolling_;
Charlie Reis 2016/07/28 17:23:02 Is this stale? It's never initialized, and looks
wjmaclean 2016/07/29 14:28:31 Yes, thanks for catching it! Done.
140 std::unordered_map<cc::SurfaceId, HittestData, cc::SurfaceIdHash> 142 std::unordered_map<cc::SurfaceId, HittestData, cc::SurfaceIdHash>
141 hittest_data_; 143 hittest_data_;
142 144
143 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter); 145 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter);
144 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 146 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
145 InputEventRouterGestureTargetQueueTest); 147 InputEventRouterGestureTargetQueueTest);
146 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 148 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
147 InputEventRouterTouchpadGestureTargetTest); 149 InputEventRouterTouchpadGestureTargetTest);
148 }; 150 };
149 151
150 } // namespace content 152 } // namespace content
151 153
152 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H _ 154 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698