| Index: services/gfx/compositor/compositor_engine.h
|
| diff --git a/services/gfx/compositor/compositor_engine.h b/services/gfx/compositor/compositor_engine.h
|
| index 237a2b81f44f612ec81ff21ed2a54dd03b287bb6..05c3e8d16c6d95b20a99dd3f03acc722f5f82a74 100644
|
| --- a/services/gfx/compositor/compositor_engine.h
|
| +++ b/services/gfx/compositor/compositor_engine.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "mojo/services/gfx/composition/interfaces/compositor.mojom.h"
|
| #include "services/gfx/compositor/backend/scheduler.h"
|
| +#include "services/gfx/compositor/graph/universe.h"
|
| #include "services/gfx/compositor/renderer_state.h"
|
| #include "services/gfx/compositor/scene_state.h"
|
|
|
| @@ -107,14 +108,14 @@ class CompositorEngine {
|
| void OnPresentScene(const base::WeakPtr<SceneState>& scene_state_weak,
|
| int64_t presentation_time);
|
|
|
| - base::WeakPtr<SceneDef> ResolveSceneReference(
|
| + bool ResolveSceneReference(
|
| const mojo::gfx::composition::SceneToken& scene_token);
|
| void SendResourceUnavailable(SceneState* scene_state, uint32_t resource_id);
|
|
|
| SceneState* FindScene(uint32_t scene_token);
|
|
|
| bool IsSceneStateRegisteredDebug(SceneState* scene_state) {
|
| - return scene_state && FindScene(scene_state->scene_token()->value);
|
| + return scene_state && FindScene(scene_state->scene_token().value);
|
| }
|
| bool IsRendererStateRegisteredDebug(RendererState* renderer_state) {
|
| return renderer_state &&
|
| @@ -129,6 +130,8 @@ class CompositorEngine {
|
| std::unordered_map<uint32_t, SceneState*> scenes_by_token_;
|
| std::vector<RendererState*> renderers_;
|
|
|
| + Universe universe_;
|
| +
|
| base::WeakPtrFactory<CompositorEngine> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CompositorEngine);
|
|
|