From 0d669408e5e0f2cc92daedab1432e325f0c65144 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Wed, 20 Mar 2024 11:00:48 -0700 Subject: [PATCH 1/4] [Fuchsia] Assert renders are only into the implicit view --- shell/platform/fuchsia/flutter/external_view_embedder.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.cc b/shell/platform/fuchsia/flutter/external_view_embedder.cc index 5900799c8c577..5e2afc602f010 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/external_view_embedder.cc @@ -115,6 +115,10 @@ void ExternalViewEmbedder::BeginFrame( void ExternalViewEmbedder::PrepareFlutterView(int64_t flutter_view_id, SkISize frame_size, double device_pixel_ratio) { + // TODO(team-fuchsia): Support multiple views. For now, Fuchsia can render + // only into the implicit view. + FML_DCHECK(flutter_view_id == kFlutterImplicitViewId); + // Reset for new view. Reset(); frame_size_ = frame_size; From ca06e10193f5f446d97d4731dd1b2572c583e349 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Wed, 20 Mar 2024 11:51:03 -0700 Subject: [PATCH 2/4] Fix --- shell/platform/fuchsia/flutter/external_view_embedder.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.cc b/shell/platform/fuchsia/flutter/external_view_embedder.cc index 5e2afc602f010..3bbea9061b923 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/external_view_embedder.cc @@ -3,9 +3,11 @@ // found in the LICENSE file. #include "external_view_embedder.h" + #include #include +#include "flutter/common/constants.h" #include "flutter/fml/trace_event.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkSurface.h" From a3948eaaa7ac566fa61f4c9293b670eafb710a08 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Wed, 20 Mar 2024 13:09:59 -0700 Subject: [PATCH 3/4] Fix --- shell/platform/fuchsia/flutter/external_view_embedder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.cc b/shell/platform/fuchsia/flutter/external_view_embedder.cc index 3bbea9061b923..a76d1bcb0ee9d 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/external_view_embedder.cc @@ -119,7 +119,7 @@ void ExternalViewEmbedder::PrepareFlutterView(int64_t flutter_view_id, double device_pixel_ratio) { // TODO(team-fuchsia): Support multiple views. For now, Fuchsia can render // only into the implicit view. - FML_DCHECK(flutter_view_id == kFlutterImplicitViewId); + FML_DCHECK(flutter_view_id == flutter::kFlutterImplicitViewId); // Reset for new view. Reset(); From bcf389237e7ac9ea1dcbeddd4daf37d5740d0b67 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 13:29:56 -0700 Subject: [PATCH 4/4] Update shell/platform/fuchsia/flutter/external_view_embedder.cc Co-authored-by: Tong Mu --- shell/platform/fuchsia/flutter/external_view_embedder.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.cc b/shell/platform/fuchsia/flutter/external_view_embedder.cc index a76d1bcb0ee9d..af50b423f9d58 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/external_view_embedder.cc @@ -117,8 +117,7 @@ void ExternalViewEmbedder::BeginFrame( void ExternalViewEmbedder::PrepareFlutterView(int64_t flutter_view_id, SkISize frame_size, double device_pixel_ratio) { - // TODO(team-fuchsia): Support multiple views. For now, Fuchsia can render - // only into the implicit view. + // Fuchsia only supports operating the implicit view for now. FML_DCHECK(flutter_view_id == flutter::kFlutterImplicitViewId); // Reset for new view.