From 2123899cc6da1e018ec0052bc4012aa38e3b86ad Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 4 Apr 2016 12:17:39 -0700 Subject: [PATCH] Jank insted of flicker in Mozart Currently there's no good way of synchronizing layout changes with children in Mozart. Previously we flickered when we were out of sync with our child. Now we jank instead because that's a more acceptable artifact while we work on improving Mozart. Fixes https://github.com/flutter/flutter/issues/3024 --- sky/shell/gpu/mojo/rasterizer_mojo.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sky/shell/gpu/mojo/rasterizer_mojo.cc b/sky/shell/gpu/mojo/rasterizer_mojo.cc index 854fab916d0..bf4d316d458 100644 --- a/sky/shell/gpu/mojo/rasterizer_mojo.cc +++ b/sky/shell/gpu/mojo/rasterizer_mojo.cc @@ -99,7 +99,7 @@ void RasterizerMojo::Draw(uint64_t layer_tree_ptr, root_node->op->get_image()->content_rect->height = size.height; root_node->op->get_image()->image_resource_id = kContentImageResourceId; root_node->hit_test_behavior = mojo::gfx::composition::HitTestBehavior::New(); - root_node->combinator = mojo::gfx::composition::Node::Combinator::PRUNE; + root_node->combinator = mojo::gfx::composition::Node::Combinator::MERGE; layer_tree->UpdateScene(update.get(), root_node.get()); update->nodes.insert(kRootNodeId, root_node.Pass());