From 454af9a350d0a51ecaf302c13dc9cb47d3402ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sharma?=
 <737941+loic-sharma@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:07:27 -0700
Subject: [PATCH] [Embedder API] Fix test helper's present callback
 registration (flutter/engine#51560)

https://github.com/flutter/engine/pull/51293 added a new present callback that supports multiple views. However, the test helper incorrectly inversed the single-view and multi-view present callbacks. This didn't affect the existing tests as we don't any multi-view tests yet.

Prepares for https://github.com/flutter/flutter/issues/144810

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
---
 .../embedder/tests/embedder_config_builder.cc    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc
index 72e10f0ebbd..fa89c66e65b 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_config_builder.cc
@@ -377,14 +377,6 @@ void EmbedderConfigBuilder::SetCompositor(bool avoid_backing_store_cache,
             ->CollectBackingStore(backing_store);
       };
   if (use_present_layers_callback) {
-    compositor_.present_view_callback = [](const FlutterPresentViewInfo* info) {
-      auto compositor =
-          reinterpret_cast<EmbedderTestCompositor*>(info->user_data);
-
-      return compositor->Present(info->view_id, info->layers,
-                                 info->layers_count);
-    };
-  } else {
     compositor_.present_layers_callback = [](const FlutterLayer** layers,
                                              size_t layers_count,
                                              void* user_data) {
@@ -394,6 +386,14 @@ void EmbedderConfigBuilder::SetCompositor(bool avoid_backing_store_cache,
       // it can only be used to render the implicit view.
       return compositor->Present(kFlutterImplicitViewId, layers, layers_count);
     };
+  } else {
+    compositor_.present_view_callback = [](const FlutterPresentViewInfo* info) {
+      auto compositor =
+          reinterpret_cast<EmbedderTestCompositor*>(info->user_data);
+
+      return compositor->Present(info->view_id, info->layers,
+                                 info->layers_count);
+    };
   }
   compositor_.avoid_backing_store_cache = avoid_backing_store_cache;
   project_args_.compositor = &compositor_;