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

Unified Diff: services/gfx/compositor/graph/nodes.cc

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/graph/nodes.h ('k') | services/gfx/compositor/graph/resources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/gfx/compositor/graph/nodes.cc
diff --git a/services/gfx/compositor/graph/nodes.cc b/services/gfx/compositor/graph/nodes.cc
index 38a1d2263b79ddfebb3de851baccb9eeb6326d0c..b25575cfc4edad8368cd8f53ef4bfbdd576ae977 100644
--- a/services/gfx/compositor/graph/nodes.cc
+++ b/services/gfx/compositor/graph/nodes.cc
@@ -10,7 +10,6 @@
#include "mojo/services/gfx/composition/cpp/formatting.h"
#include "mojo/skia/type_converters.h"
#include "services/gfx/compositor/graph/scene_content.h"
-#include "services/gfx/compositor/graph/scene_def.h"
#include "services/gfx/compositor/graph/snapshot.h"
#include "services/gfx/compositor/graph/transform_pair.h"
#include "services/gfx/compositor/render/render_image.h"
@@ -445,22 +444,8 @@ Snapshot::Disposition SceneNode::RecordSnapshot(
DCHECK(content);
DCHECK(builder);
- auto scene_resource = static_cast<const SceneResource*>(
- content->GetResource(scene_resource_id_, Resource::Type::kScene));
- DCHECK(scene_resource);
-
- SceneDef* referenced_scene = scene_resource->referenced_scene().get();
- if (!referenced_scene) {
- if (builder->block_log()) {
- *builder->block_log()
- << "Scene node blocked because its referenced scene is unavailable: "
- << FormattedLabel(content) << std::endl;
- }
- return Snapshot::Disposition::kBlocked;
- }
-
Snapshot::Disposition disposition =
- builder->SnapshotScene(referenced_scene, scene_version_, this, content);
+ builder->SnapshotReferencedScene(this, content);
if (disposition != Snapshot::Disposition::kSuccess)
return disposition;
return Node::RecordSnapshot(content, builder);
« no previous file with comments | « services/gfx/compositor/graph/nodes.h ('k') | services/gfx/compositor/graph/resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698