Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 606dafa

Browse files
committed
Revert "fuchsia: Add scaffolding and basic implementation for flatland migration (#27423)"
This reverts commit d5b410e.
1 parent 8799727 commit 606dafa

25 files changed

+320
-1687
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,12 +1399,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.h
13991399
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_unittest.cc
14001400
FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc
14011401
FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.h
1402-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.cc
1403-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.h
1404-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc
1405-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
1406-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_platform_view.cc
1407-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_platform_view.h
14081402
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
14091403
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
14101404
FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
@@ -1416,8 +1410,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_external_view_embe
14161410
FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.cc
14171411
FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.h
14181412
FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc
1419-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_platform_view.cc
1420-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_platform_view.h
14211413
FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_session_connection.cc
14221414
FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_session_connection.h
14231415
FILE: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc

shell/platform/fuchsia/flutter/BUILD.gn

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ template("runner_sources") {
5959
"component.h",
6060
"engine.cc",
6161
"engine.h",
62-
"flatland_connection.cc",
63-
"flatland_connection.h",
64-
"flatland_external_view_embedder.cc",
65-
"flatland_external_view_embedder.h",
66-
"flatland_platform_view.cc",
67-
"flatland_platform_view.h",
6862
"flutter_runner_product_configuration.cc",
6963
"flutter_runner_product_configuration.h",
7064
"focus_delegate.cc",
@@ -73,8 +67,6 @@ template("runner_sources") {
7367
"fuchsia_external_view_embedder.h",
7468
"fuchsia_intl.cc",
7569
"fuchsia_intl.h",
76-
"gfx_platform_view.cc",
77-
"gfx_platform_view.h",
7870
"gfx_session_connection.cc",
7971
"gfx_session_connection.h",
8072
"isolate_configurator.cc",
@@ -137,7 +129,6 @@ template("runner_sources") {
137129
"$fuchsia_sdk_root/fidl:fuchsia.io",
138130
"$fuchsia_sdk_root/fidl:fuchsia.sys",
139131
"$fuchsia_sdk_root/fidl:fuchsia.ui.app",
140-
"$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
141132
"$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
142133
"$fuchsia_sdk_root/pkg:async-cpp",
143134
"$fuchsia_sdk_root/pkg:async-default",

shell/platform/fuchsia/flutter/component.cc

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -639,29 +639,6 @@ void Application::CreateViewWithViewRef(
639639
));
640640
}
641641

642-
void Application::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
643-
if (!svc_) {
644-
FML_DLOG(ERROR)
645-
<< "Component incoming services was invalid when attempting to "
646-
"create a shell for a view provider request.";
647-
return;
648-
}
649-
650-
shell_holders_.emplace(std::make_unique<Engine>(
651-
*this, // delegate
652-
debug_label_, // thread label
653-
svc_, // Component incoming services
654-
runner_incoming_services_, // Runner incoming services
655-
settings_, // settings
656-
std::move(
657-
*view_args.mutable_view_creation_token()), // view creation token
658-
scenic::ViewRefPair::New(), // view ref pair
659-
std::move(fdio_ns_), // FDIO namespace
660-
std::move(directory_request_), // outgoing request
661-
product_config_ // product configuration
662-
));
663-
}
664-
665642
#if !defined(DART_PRODUCT)
666643
void Application::WriteProfileToTrace() const {
667644
for (const auto& engine : shell_holders_) {

shell/platform/fuchsia/flutter/component.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ class Application final : public Engine::Delegate,
128128
fuchsia::ui::views::ViewRefControl control_ref,
129129
fuchsia::ui::views::ViewRef view_ref) override;
130130

131-
// |fuchsia::ui::app::ViewProvider|
132-
void CreateView2(fuchsia::ui::app::CreateView2Args view_args) override;
133-
134131
// |flutter::Engine::Delegate|
135132
void OnEngineTerminate(const Engine* holder) override;
136133

0 commit comments

Comments
 (0)