Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: services/gfx/compositor/compositor_engine.h

Issue 1873573003: Mozart: Ensure time always runs forward. (Closed) Base URL: git@github.com:domokit/mojo.git@moz-3
Patch Set: fix build error on Android Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/gfx/compositor/BUILD.gn ('k') | services/gfx/compositor/compositor_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « services/gfx/compositor/BUILD.gn ('k') | services/gfx/compositor/compositor_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698