| 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 #ifndef SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ | 5 #ifndef SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ |
| 6 #define SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ | 6 #define SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <unordered_map> | 8 #include <unordered_map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 61 // RENDERER REQUESTS | 61 // RENDERER REQUESTS |
| 62 | 62 |
| 63 // Sets the root scene. | 63 // Sets the root scene. |
| 64 // Destroys |renderer_state| if an error occurs. | 64 // Destroys |renderer_state| if an error occurs. |
| 65 void SetRootScene(RendererState* renderer_state, | 65 void SetRootScene(RendererState* renderer_state, |
| 66 mojo::gfx::composition::SceneTokenPtr scene_token, | 66 mojo::gfx::composition::SceneTokenPtr scene_token, |
| 67 uint32 scene_version, | 67 uint32 scene_version, |
| 68 mojo::RectPtr viewport); | 68 mojo::RectPtr viewport); |
| 69 | 69 |
| 70 // Resets the root scene. |
| 71 // Destroys |renderer_state| if an error occurs. |
| 72 void ResetRootScene(RendererState* renderer_state); |
| 73 |
| 70 // Performs a hit test. | 74 // Performs a hit test. |
| 71 void HitTest( | 75 void HitTest( |
| 72 RendererState* renderer_state, | 76 RendererState* renderer_state, |
| 73 mojo::PointPtr point, | 77 mojo::PointPtr point, |
| 74 const mojo::gfx::composition::HitTester::HitTestCallback& callback); | 78 const mojo::gfx::composition::HitTester::HitTestCallback& callback); |
| 75 | 79 |
| 76 private: | 80 private: |
| 77 void OnSceneConnectionError(SceneState* scene_state); | 81 void OnSceneConnectionError(SceneState* scene_state); |
| 78 void DestroyScene(SceneState* scene_state); | 82 void DestroyScene(SceneState* scene_state); |
| 79 | 83 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 std::vector<RendererState*> renderers_; | 132 std::vector<RendererState*> renderers_; |
| 129 | 133 |
| 130 base::WeakPtrFactory<CompositorEngine> weak_factory_; | 134 base::WeakPtrFactory<CompositorEngine> weak_factory_; |
| 131 | 135 |
| 132 DISALLOW_COPY_AND_ASSIGN(CompositorEngine); | 136 DISALLOW_COPY_AND_ASSIGN(CompositorEngine); |
| 133 }; | 137 }; |
| 134 | 138 |
| 135 } // namespace compositor | 139 } // namespace compositor |
| 136 | 140 |
| 137 #endif // SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ | 141 #endif // SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |