From ec08de4bc5d0518e28a2dd067cb5cb5c4eced532 Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Tue, 22 Oct 2019 10:03:10 -0700 Subject: [PATCH] Revert "Made restarting the Engine remember the last entrypoint that was used. (#13264)" (flutter/engine#13287) This reverts commit ba50a6dfba72b30a7a06cfb1ee5d40c2316b8a71. --- engine/src/flutter/shell/common/engine.cc | 11 ---------- engine/src/flutter/shell/common/engine.h | 14 ------------- engine/src/flutter/shell/common/shell.cc | 7 ++++--- engine/src/flutter/shell/common/shell.h | 4 ++++ .../flutter/shell/common/shell_unittests.cc | 21 ------------------- 5 files changed, 8 insertions(+), 49 deletions(-) diff --git a/engine/src/flutter/shell/common/engine.cc b/engine/src/flutter/shell/common/engine.cc index d42b8e1a40f..7345ac2055d 100644 --- a/engine/src/flutter/shell/common/engine.cc +++ b/engine/src/flutter/shell/common/engine.cc @@ -128,9 +128,6 @@ Engine::RunStatus Engine::Run(RunConfiguration configuration) { return RunStatus::Failure; } - last_entry_point_ = configuration.GetEntrypoint(); - last_entry_point_library_ = configuration.GetEntrypointLibrary(); - auto isolate_launch_status = PrepareAndLaunchIsolate(std::move(configuration)); if (isolate_launch_status == Engine::RunStatus::Failure) { @@ -506,12 +503,4 @@ void Engine::HandleAssetPlatformMessage(fml::RefPtr message) { response->CompleteEmpty(); } -const std::string& Engine::GetLastEntrypoint() const { - return last_entry_point_; -} - -const std::string& Engine::GetLastEntrypointLibrary() const { - return last_entry_point_library_; -} - } // namespace flutter diff --git a/engine/src/flutter/shell/common/engine.h b/engine/src/flutter/shell/common/engine.h index 1f219c053b3..cc9d1bcf687 100644 --- a/engine/src/flutter/shell/common/engine.h +++ b/engine/src/flutter/shell/common/engine.h @@ -717,18 +717,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate { // |PointerDataDispatcher::Delegate| void ScheduleSecondaryVsyncCallback(fml::closure callback) override; - //---------------------------------------------------------------------------- - /// @brief Get the last Entrypoint that was used in the RunConfiguration - /// when |Engine::Run| was called. - /// - const std::string& GetLastEntrypoint() const; - - //---------------------------------------------------------------------------- - /// @brief Get the last Entrypoint Library that was used in the - /// RunConfiguration when |Engine::Run| was called. - /// - const std::string& GetLastEntrypointLibrary() const; - private: Engine::Delegate& delegate_; const Settings settings_; @@ -740,8 +728,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate { // is destructed first. std::unique_ptr pointer_data_dispatcher_; - std::string last_entry_point_; - std::string last_entry_point_library_; std::string initial_route_; ViewportMetrics viewport_metrics_; std::shared_ptr asset_manager_; diff --git a/engine/src/flutter/shell/common/shell.cc b/engine/src/flutter/shell/common/shell.cc index 2b1b0e07915..cc88bb9095d 100644 --- a/engine/src/flutter/shell/common/shell.cc +++ b/engine/src/flutter/shell/common/shell.cc @@ -545,10 +545,14 @@ fml::WeakPtr Shell::GetRasterizer() { return weak_rasterizer_; } +// TODO(dnfield): Remove this when either Topaz is up to date or flutter_runner +// is built out of this repo. +#ifdef OS_FUCHSIA fml::WeakPtr Shell::GetEngine() { FML_DCHECK(is_setup_); return weak_engine_; } +#endif // OS_FUCHSIA fml::WeakPtr Shell::GetPlatformView() { FML_DCHECK(is_setup_); @@ -1267,9 +1271,6 @@ bool Shell::OnServiceProtocolRunInView( RunConfiguration configuration(std::move(isolate_configuration)); - configuration.SetEntrypointAndLibrary(engine_->GetLastEntrypoint(), - engine_->GetLastEntrypointLibrary()); - configuration.AddAssetResolver( std::make_unique(fml::OpenDirectory( asset_directory_path.c_str(), false, fml::FilePermission::kRead))); diff --git a/engine/src/flutter/shell/common/shell.h b/engine/src/flutter/shell/common/shell.h index 2f5a45923ee..e4ee6960389 100644 --- a/engine/src/flutter/shell/common/shell.h +++ b/engine/src/flutter/shell/common/shell.h @@ -216,6 +216,9 @@ class Shell final : public PlatformView::Delegate, /// fml::WeakPtr GetRasterizer(); +// TODO(dnfield): Remove this when either Topaz is up to date or flutter_runner +// is built out of this repo. +#ifdef OS_FUCHSIA //------------------------------------------------------------------------------ /// @brief Engines may only be accessed on the UI thread. This method is /// deprecated, and implementers should instead use other API @@ -224,6 +227,7 @@ class Shell final : public PlatformView::Delegate, /// @return A weak pointer to the engine. /// fml::WeakPtr GetEngine(); +#endif // OS_FUCHSIA //---------------------------------------------------------------------------- /// @brief Platform views may only be accessed on the platform task diff --git a/engine/src/flutter/shell/common/shell_unittests.cc b/engine/src/flutter/shell/common/shell_unittests.cc index e497e4609ba..942db37c943 100644 --- a/engine/src/flutter/shell/common/shell_unittests.cc +++ b/engine/src/flutter/shell/common/shell_unittests.cc @@ -202,27 +202,6 @@ TEST_F(ShellTest, SecondaryIsolateBindingsAreSetupViaShellSettings) { ASSERT_FALSE(DartVMRef::IsInstanceRunning()); } -TEST_F(ShellTest, LastEntrypoint) { - ASSERT_FALSE(DartVMRef::IsInstanceRunning()); - auto settings = CreateSettingsForFixture(); - auto shell = CreateShell(settings); - ASSERT_TRUE(ValidateShell(shell.get())); - - auto configuration = RunConfiguration::InferFromSettings(settings); - ASSERT_TRUE(configuration.IsValid()); - std::string entry_point = "fixturesAreFunctionalMain"; - configuration.SetEntrypoint(entry_point); - - fml::AutoResetWaitableEvent main_latch; - AddNativeCallback( - "SayHiFromFixturesAreFunctionalMain", - CREATE_NATIVE_ENTRY([&main_latch](auto args) { main_latch.Signal(); })); - - RunEngine(shell.get(), std::move(configuration)); - main_latch.Wait(); - EXPECT_EQ(entry_point, shell->GetEngine()->GetLastEntrypoint()); -} - TEST(ShellTestNoFixture, EnableMirrorsIsWhitelisted) { if (DartVM::IsRunningPrecompiledCode()) { // This covers profile and release modes which use AOT (where this flag does