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

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

Issue 1729343004: Reverse scene node drawing order. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 10 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 | « mojo/services/gfx/composition/interfaces/nodes.mojom ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/gfx/compositor/graph/node_def.cc
diff --git a/services/gfx/compositor/graph/node_def.cc b/services/gfx/compositor/graph/node_def.cc
index 3287301495fe45e24ea286fbbe55a21ca2ddb9fa..9a6fae2afda73bbf1c55bc4a75636c83a722f362 100644
--- a/services/gfx/compositor/graph/node_def.cc
+++ b/services/gfx/compositor/graph/node_def.cc
@@ -191,13 +191,11 @@ bool RectNodeOp::Snapshot(SnapshotBuilder* snapshot_builder,
RenderLayerBuilder* layer_builder,
SceneDef* scene,
NodeDef* node) {
- if (!node->SnapshotChildren(snapshot_builder, layer_builder, scene))
- return false;
-
SkPaint paint;
paint.setColor(MakeSkColor(color_));
layer_builder->DrawRect(content_rect_.To<SkRect>(), paint);
- return true;
+
+ return node->SnapshotChildren(snapshot_builder, layer_builder, scene);
}
ImageNodeOp::ImageNodeOp(const mojo::Rect& content_rect,
@@ -238,16 +236,14 @@ bool ImageNodeOp::Snapshot(SnapshotBuilder* snapshot_builder,
return false;
}
- if (!node->SnapshotChildren(snapshot_builder, layer_builder, scene))
- return false;
-
layer_builder->DrawImage(
image_resource_->image(), content_rect_.To<SkRect>(),
image_rect_ ? image_rect_->To<SkRect>()
: SkRect::MakeWH(image_resource_->image()->width(),
image_resource_->image()->height()),
blend_ ? MakePaintForBlend(*blend_) : SkPaint());
- return true;
+
+ return node->SnapshotChildren(snapshot_builder, layer_builder, scene);
}
SceneNodeOp::SceneNodeOp(uint32_t scene_resource_id, uint32_t scene_version)
@@ -298,10 +294,10 @@ bool SceneNodeOp::Snapshot(SnapshotBuilder* snapshot_builder,
return false;
}
- if (!node->SnapshotChildren(snapshot_builder, layer_builder, scene))
+ if (!referenced_scene->Snapshot(snapshot_builder, layer_builder))
return false;
- return referenced_scene->Snapshot(snapshot_builder, layer_builder);
+ return node->SnapshotChildren(snapshot_builder, layer_builder, scene);
}
LayerNodeOp::LayerNodeOp(const mojo::Size& size,
« no previous file with comments | « mojo/services/gfx/composition/interfaces/nodes.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698