OLD | NEW |
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_handler_wrapper.h" | 5 #include "blimp/client/feature/compositor/blimp_input_handler_wrapper.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "blimp/client/feature/compositor/blimp_input_manager.h" | 10 #include "blimp/client/feature/compositor/blimp_input_manager.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 ui::InputHandlerProxy::EventDisposition disposition = | 44 ui::InputHandlerProxy::EventDisposition disposition = |
45 input_handler_proxy_->HandleInputEvent(gesture_event); | 45 input_handler_proxy_->HandleInputEvent(gesture_event); |
46 | 46 |
47 bool consumed = false; | 47 bool consumed = false; |
48 | 48 |
49 switch (disposition) { | 49 switch (disposition) { |
50 case ui::InputHandlerProxy::EventDisposition::DID_HANDLE: | 50 case ui::InputHandlerProxy::EventDisposition::DID_HANDLE: |
51 case ui::InputHandlerProxy::EventDisposition::DROP_EVENT: | 51 case ui::InputHandlerProxy::EventDisposition::DROP_EVENT: |
52 consumed = true; | 52 consumed = true; |
53 break; | 53 break; |
| 54 case ui::InputHandlerProxy::EventDisposition::NON_BLOCKING: |
54 case ui::InputHandlerProxy::EventDisposition::DID_NOT_HANDLE: | 55 case ui::InputHandlerProxy::EventDisposition::DID_NOT_HANDLE: |
55 consumed = false; | 56 consumed = false; |
56 break; | 57 break; |
57 } | 58 } |
58 | 59 |
59 main_task_runner_->PostTask( | 60 main_task_runner_->PostTask( |
60 FROM_HERE, base::Bind(&BlimpInputManager::DidHandleWebGestureEvent, | 61 FROM_HERE, base::Bind(&BlimpInputManager::DidHandleWebGestureEvent, |
61 input_manager_weak_ptr_, gesture_event, consumed)); | 62 input_manager_weak_ptr_, gesture_event, consumed)); |
62 } | 63 } |
63 | 64 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 void BlimpInputHandlerWrapper::DidStopFlinging() { | 100 void BlimpInputHandlerWrapper::DidStopFlinging() { |
100 DCHECK(compositor_thread_checker_.CalledOnValidThread()); | 101 DCHECK(compositor_thread_checker_.CalledOnValidThread()); |
101 } | 102 } |
102 | 103 |
103 void BlimpInputHandlerWrapper::DidAnimateForInput() { | 104 void BlimpInputHandlerWrapper::DidAnimateForInput() { |
104 DCHECK(compositor_thread_checker_.CalledOnValidThread()); | 105 DCHECK(compositor_thread_checker_.CalledOnValidThread()); |
105 } | 106 } |
106 | 107 |
107 } // namespace client | 108 } // namespace client |
108 } // namespace blimp | 109 } // namespace blimp |
OLD | NEW |