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

Side by Side Diff: blimp/client/feature/compositor/blimp_input_manager.cc

Issue 1645613007: Redefined the bit WebTouchEvent.causesScrollingIfUncanceled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed an aura unittest. Created 4 years, 10 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 | components/html_viewer/touch_handler.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 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 #include "blimp/client/feature/compositor/blimp_input_manager.h" 5 #include "blimp/client/feature/compositor/blimp_input_manager.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "ui/events/blink/blink_event_util.h" 10 #include "ui/events/blink/blink_event_util.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool BlimpInputManager::OnTouchEvent(const ui::MotionEvent& motion_event) { 65 bool BlimpInputManager::OnTouchEvent(const ui::MotionEvent& motion_event) {
66 DCHECK(IsMainThread()); 66 DCHECK(IsMainThread());
67 67
68 ui::FilteredGestureProvider::TouchHandlingResult result = 68 ui::FilteredGestureProvider::TouchHandlingResult result =
69 gesture_provider_.OnTouchEvent(motion_event); 69 gesture_provider_.OnTouchEvent(motion_event);
70 if (!result.succeeded) 70 if (!result.succeeded)
71 return false; 71 return false;
72 72
73 blink::WebTouchEvent touch = 73 blink::WebTouchEvent touch =
74 ui::CreateWebTouchEventFromMotionEvent(motion_event, 74 ui::CreateWebTouchEventFromMotionEvent(motion_event,
75 result.did_generate_scroll); 75 result.moved_beyond_slop_region);
76 76
77 // Touch events are queued in the Gesture Provider until acknowledged to 77 // Touch events are queued in the Gesture Provider until acknowledged to
78 // allow them to be consumed by the touch event handlers in blink which can 78 // allow them to be consumed by the touch event handlers in blink which can
79 // prevent-default on the event. Since we currently do not support touch 79 // prevent-default on the event. Since we currently do not support touch
80 // handlers the event is always acknowledged as not consumed. 80 // handlers the event is always acknowledged as not consumed.
81 gesture_provider_.OnTouchEventAck(touch.uniqueTouchEventId, false); 81 gesture_provider_.OnTouchEventAck(touch.uniqueTouchEventId, false);
82 82
83 return true; 83 return true;
84 } 84 }
85 85
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 bool BlimpInputManager::IsMainThread() const { 152 bool BlimpInputManager::IsMainThread() const {
153 return main_task_runner_->BelongsToCurrentThread(); 153 return main_task_runner_->BelongsToCurrentThread();
154 } 154 }
155 155
156 bool BlimpInputManager::IsCompositorThread() const { 156 bool BlimpInputManager::IsCompositorThread() const {
157 return compositor_task_runner_->BelongsToCurrentThread(); 157 return compositor_task_runner_->BelongsToCurrentThread();
158 } 158 }
159 159
160 } // namespace client 160 } // namespace client
161 } // namespace blimp 161 } // namespace blimp
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/touch_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698