fix deadlock

Kaushik Iska · Kaushik Iska · commit 15c02ac9c56e · 2020-05-07T13:52:20.000-07:00
diff --git a/shell/common/layer_tree_holder.cc b/shell/common/layer_tree_holder.cc
@@ -14,7 +14,7 @@ std::unique_ptr<LayerTree> LayerTreeHolder::Get() {
 void LayerTreeHolder::ReplaceIfNewer(
     std::unique_ptr<LayerTree> proposed_layer_tree) {
   std::scoped_lock lock(layer_tree_mutex);
-  if (IsEmpty() ||
+  if (!layer_tree_ ||
       layer_tree_->target_time() < proposed_layer_tree->target_time()) {
     layer_tree_ = std::move(proposed_layer_tree);
   }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ std::unique_ptr<LayerTree> LayerTreeHolder::Get() {`
`14`	`14`	`void LayerTreeHolder::ReplaceIfNewer(`
`15`	`15`	`std::unique_ptr<LayerTree> proposed_layer_tree) {`
`16`	`16`	`std::scoped_lock lock(layer_tree_mutex);`
`17`		`- if (IsEmpty() \|\|`
	`17`	`+ if (!layer_tree_ \|\|`
`18`	`18`	`layer_tree_->target_time() < proposed_layer_tree->target_time()) {`
`19`	`19`	`layer_tree_ = std::move(proposed_layer_tree);`
`20`	`20`	`}`