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 "content/renderer/mus/render_widget_mus_connection.h" | 5 #include "content/renderer/mus/render_widget_mus_connection.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "components/mus/public/cpp/context_provider.h" | |
12 #include "components/mus/public/cpp/output_surface.h" | |
13 #include "components/mus/public/interfaces/command_buffer.mojom.h" | |
14 #include "components/mus/public/interfaces/surface.mojom.h" | |
15 #include "components/mus/public/interfaces/window_tree.mojom.h" | |
16 #include "content/public/common/mojo_shell_connection.h" | 11 #include "content/public/common/mojo_shell_connection.h" |
17 #include "content/renderer/mus/compositor_mus_connection.h" | 12 #include "content/renderer/mus/compositor_mus_connection.h" |
18 #include "content/renderer/render_thread_impl.h" | 13 #include "content/renderer/render_thread_impl.h" |
19 #include "content/renderer/render_view_impl.h" | 14 #include "content/renderer/render_view_impl.h" |
20 #include "services/shell/public/cpp/connector.h" | 15 #include "services/shell/public/cpp/connector.h" |
| 16 #include "services/ui/public/cpp/context_provider.h" |
| 17 #include "services/ui/public/cpp/output_surface.h" |
| 18 #include "services/ui/public/interfaces/command_buffer.mojom.h" |
| 19 #include "services/ui/public/interfaces/surface.mojom.h" |
| 20 #include "services/ui/public/interfaces/window_tree.mojom.h" |
21 | 21 |
22 namespace content { | 22 namespace content { |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 typedef std::map<int, RenderWidgetMusConnection*> ConnectionMap; | 26 typedef std::map<int, RenderWidgetMusConnection*> ConnectionMap; |
27 base::LazyInstance<ConnectionMap>::Leaky g_connections = | 27 base::LazyInstance<ConnectionMap>::Leaky g_connections = |
28 LAZY_INSTANCE_INITIALIZER; | 28 LAZY_INSTANCE_INITIALIZER; |
29 } | 29 } |
30 | 30 |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 // previous event. | 171 // previous event. |
172 // DCHECK(pending_ack_.is_null()); | 172 // DCHECK(pending_ack_.is_null()); |
173 pending_ack_ = ack; | 173 pending_ack_ = ack; |
174 // TODO(fsamuel, sadrul): Track real latency info. | 174 // TODO(fsamuel, sadrul): Track real latency info. |
175 ui::LatencyInfo latency_info; | 175 ui::LatencyInfo latency_info; |
176 input_handler_->HandleInputEvent(*input_event, latency_info, | 176 input_handler_->HandleInputEvent(*input_event, latency_info, |
177 DISPATCH_TYPE_BLOCKING); | 177 DISPATCH_TYPE_BLOCKING); |
178 } | 178 } |
179 | 179 |
180 } // namespace content | 180 } // namespace content |
OLD | NEW |