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 #ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 5 #ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 const ui::TextInputState& state) override; | 260 const ui::TextInputState& state) override; |
261 | 261 |
262 void CloneAndAnimate(mojo::Id transport_view_id); | 262 void CloneAndAnimate(mojo::Id transport_view_id); |
263 | 263 |
264 // FocusControllerDelegate: | 264 // FocusControllerDelegate: |
265 void OnFocusChanged(ServerView* old_focused_view, | 265 void OnFocusChanged(ServerView* old_focused_view, |
266 ServerView* new_focused_view) override; | 266 ServerView* new_focused_view) override; |
267 | 267 |
268 // Overriden from CustomSurfaceConverter: | 268 // Overriden from CustomSurfaceConverter: |
269 bool ConvertSurfaceDrawQuad(const mojo::QuadPtr& input, | 269 bool ConvertSurfaceDrawQuad(const mojo::QuadPtr& input, |
| 270 const mojo::CompositorFrameMetadataPtr& metadata, |
270 cc::SharedQuadState* sqs, | 271 cc::SharedQuadState* sqs, |
271 cc::RenderPass* render_pass) override; | 272 cc::RenderPass* render_pass) override; |
272 | 273 |
273 ConnectionManagerDelegate* delegate_; | 274 ConnectionManagerDelegate* delegate_; |
274 | 275 |
275 // State for rendering into a Surface. | 276 // State for rendering into a Surface. |
276 scoped_refptr<surfaces::SurfacesState> surfaces_state_; | 277 scoped_refptr<surfaces::SurfacesState> surfaces_state_; |
277 | 278 |
278 // ID to use for next ViewTreeImpl. | 279 // ID to use for next ViewTreeImpl. |
279 mojo::ConnectionSpecificId next_connection_id_; | 280 mojo::ConnectionSpecificId next_connection_id_; |
(...skipping 21 matching lines...) Expand all Loading... |
301 AnimationRunner animation_runner_; | 302 AnimationRunner animation_runner_; |
302 | 303 |
303 scoped_ptr<FocusController> focus_controller_; | 304 scoped_ptr<FocusController> focus_controller_; |
304 | 305 |
305 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 306 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
306 }; | 307 }; |
307 | 308 |
308 } // namespace view_manager | 309 } // namespace view_manager |
309 | 310 |
310 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ | 311 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ |
OLD | NEW |