OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/native_viewport/native_viewport_impl.h" | 5 #include "services/native_viewport/native_viewport_impl.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/macros.h" | 9 #include "base/macros.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 void NativeViewportImpl::OnAcceleratedWidgetDestroyed() { | 121 void NativeViewportImpl::OnAcceleratedWidgetDestroyed() { |
122 context_provider_.SetAcceleratedWidget(gfx::kNullAcceleratedWidget); | 122 context_provider_.SetAcceleratedWidget(gfx::kNullAcceleratedWidget); |
123 } | 123 } |
124 | 124 |
125 bool NativeViewportImpl::OnEvent(mojo::EventPtr event) { | 125 bool NativeViewportImpl::OnEvent(mojo::EventPtr event) { |
126 if (event.is_null() || !event_dispatcher_.get()) | 126 if (event.is_null() || !event_dispatcher_.get()) |
127 return false; | 127 return false; |
128 | 128 |
129 mojo::NativeViewportEventDispatcher::OnEventCallback callback; | 129 mojo::NativeViewportEventDispatcher::OnEventCallback callback; |
130 switch (event->action) { | 130 switch (event->action) { |
131 case mojo::EVENT_TYPE_POINTER_MOVE: { | 131 case mojo::EventType::POINTER_MOVE: { |
132 // TODO(sky): add logic to remember last event location and not send if | 132 // TODO(sky): add logic to remember last event location and not send if |
133 // the same. | 133 // the same. |
134 if (pointers_waiting_on_ack_.count(event->pointer_data->pointer_id)) | 134 if (pointers_waiting_on_ack_.count(event->pointer_data->pointer_id)) |
135 return false; | 135 return false; |
136 | 136 |
137 pointers_waiting_on_ack_.insert(event->pointer_data->pointer_id); | 137 pointers_waiting_on_ack_.insert(event->pointer_data->pointer_id); |
138 callback = | 138 callback = |
139 base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr(), | 139 base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr(), |
140 event->pointer_data->pointer_id); | 140 event->pointer_data->pointer_id); |
141 break; | 141 break; |
142 } | 142 } |
143 | 143 |
144 case mojo::EVENT_TYPE_POINTER_CANCEL: | 144 case mojo::EventType::POINTER_CANCEL: |
145 pointers_waiting_on_ack_.clear(); | 145 pointers_waiting_on_ack_.clear(); |
146 break; | 146 break; |
147 | 147 |
148 case mojo::EVENT_TYPE_POINTER_UP: | 148 case mojo::EventType::POINTER_UP: |
149 pointers_waiting_on_ack_.erase(event->pointer_data->pointer_id); | 149 pointers_waiting_on_ack_.erase(event->pointer_data->pointer_id); |
150 break; | 150 break; |
151 | 151 |
152 default: | 152 default: |
153 break; | 153 break; |
154 } | 154 } |
155 | 155 |
156 event_dispatcher_->OnEvent(event.Pass(), callback); | 156 event_dispatcher_->OnEvent(event.Pass(), callback); |
157 return false; | 157 return false; |
158 } | 158 } |
159 | 159 |
160 void NativeViewportImpl::OnDestroyed() { | 160 void NativeViewportImpl::OnDestroyed() { |
161 delete this; | 161 delete this; |
162 } | 162 } |
163 | 163 |
164 void NativeViewportImpl::AckEvent(int32 pointer_id) { | 164 void NativeViewportImpl::AckEvent(int32 pointer_id) { |
165 pointers_waiting_on_ack_.erase(pointer_id); | 165 pointers_waiting_on_ack_.erase(pointer_id); |
166 } | 166 } |
167 | 167 |
168 } // namespace native_viewport | 168 } // namespace native_viewport |
OLD | NEW |