From 123d29e155ab02942c587a040d3fbaea96537197 Mon Sep 17 00:00:00 2001 From: Felipe Archondo Date: Tue, 11 May 2021 15:55:18 -0400 Subject: [PATCH 1/2] [fuchsia] rename to DefaultSessionConnection In preparation for #25551, rename SessionConnection to DefaultSessionConnection. The plan is to have SessionConnection be an interface we can create a fake of for testing. --- ci/licenses_golden/licenses_flutter | 4 +-- shell/platform/fuchsia/flutter/BUILD.gn | 6 ++-- .../fuchsia/flutter/compositor_context.cc | 6 ++-- .../fuchsia/flutter/compositor_context.h | 6 ++-- ...ction.cc => default_session_connection.cc} | 24 ++++++------- ...nection.h => default_session_connection.h} | 25 ++++++------- shell/platform/fuchsia/flutter/engine.h | 4 +-- .../flutter/fuchsia_external_view_embedder.cc | 2 +- .../flutter/fuchsia_external_view_embedder.h | 6 ++-- ...> default_session_connection_unittests.cc} | 36 +++++++++---------- .../fuchsia/flutter/tests/engine_unittests.cc | 2 +- .../flutter/tests/vsync_recorder_unittests.cc | 2 +- 12 files changed, 62 insertions(+), 61 deletions(-) rename shell/platform/fuchsia/flutter/{session_connection.cc => default_session_connection.cc} (90%) rename shell/platform/fuchsia/flutter/{session_connection.h => default_session_connection.h} (78%) rename shell/platform/fuchsia/flutter/tests/{session_connection_unittests.cc => default_session_connection_unittests.cc} (94%) diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 0fe8846415154..d9a9b266bfa7b 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -1315,6 +1315,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_unittest.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/compositor_context.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/compositor_context.h +FILE: ../../../flutter/shell/platform/fuchsia/flutter/default_session_connection.cc +FILE: ../../../flutter/shell/platform/fuchsia/flutter/default_session_connection.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_fakes.h @@ -1355,8 +1357,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_unittest.cc -FILE: ../../../flutter/shell/platform/fuchsia/flutter/session_connection.cc -FILE: ../../../flutter/shell/platform/fuchsia/flutter/session_connection.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.h FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.cc diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 728d2c4e819d4..3e03505bf1ecf 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -53,6 +53,8 @@ template("runner_sources") { "accessibility_bridge.h", "component.cc", "component.h", + "default_session_connection.cc", + "default_session_connection.h", "engine.cc", "engine.h", "flutter_runner_product_configuration.cc", @@ -72,8 +74,6 @@ template("runner_sources") { "platform_view.h", "runner.cc", "runner.h", - "session_connection.cc", - "session_connection.h", "surface.cc", "surface.h", "task_observers.cc", @@ -512,7 +512,7 @@ executable("flutter_runner_scenic_unittests") { output_name = "flutter_runner_scenic_tests" - sources = [ "tests/session_connection_unittests.cc" ] + sources = [ "tests/default_session_connection_unittests.cc" ] # This is needed for //third_party/googletest for linking zircon symbols. libs = [ "//fuchsia/sdk/$host_os/arch/$target_cpu/sysroot/lib/libzircon.so" ] diff --git a/shell/platform/fuchsia/flutter/compositor_context.cc b/shell/platform/fuchsia/flutter/compositor_context.cc index b53297d1a9a96..6f6bc8d5572bc 100644 --- a/shell/platform/fuchsia/flutter/compositor_context.cc +++ b/shell/platform/fuchsia/flutter/compositor_context.cc @@ -22,7 +22,7 @@ class ScopedFrame final : public flutter::CompositorContext::ScopedFrame { bool instrumentation_enabled, bool surface_supports_readback, fml::RefPtr raster_thread_merger, - SessionConnection& session_connection, + DefaultSessionConnection& session_connection, VulkanSurfaceProducer& surface_producer, std::shared_ptr scene_update_context) : flutter::CompositorContext::ScopedFrame(context, @@ -38,7 +38,7 @@ class ScopedFrame final : public flutter::CompositorContext::ScopedFrame { scene_update_context_(scene_update_context) {} private: - SessionConnection& session_connection_; + DefaultSessionConnection& session_connection_; VulkanSurfaceProducer& surface_producer_; std::shared_ptr scene_update_context_; @@ -149,7 +149,7 @@ class ScopedFrame final : public flutter::CompositorContext::ScopedFrame { }; CompositorContext::CompositorContext( - SessionConnection& session_connection, + DefaultSessionConnection& session_connection, VulkanSurfaceProducer& surface_producer, std::shared_ptr scene_update_context) : session_connection_(session_connection), diff --git a/shell/platform/fuchsia/flutter/compositor_context.h b/shell/platform/fuchsia/flutter/compositor_context.h index 4a943a499ad63..2fef78523396c 100644 --- a/shell/platform/fuchsia/flutter/compositor_context.h +++ b/shell/platform/fuchsia/flutter/compositor_context.h @@ -12,7 +12,7 @@ #include "flutter/flow/scene_update_context.h" #include "flutter/fml/macros.h" -#include "session_connection.h" +#include "default_session_connection.h" #include "vulkan_surface_producer.h" namespace flutter_runner { @@ -22,14 +22,14 @@ namespace flutter_runner { class CompositorContext final : public flutter::CompositorContext { public: CompositorContext( - SessionConnection& session_connection, + DefaultSessionConnection& session_connection, VulkanSurfaceProducer& surface_producer, std::shared_ptr scene_update_context); ~CompositorContext() override; private: - SessionConnection& session_connection_; + DefaultSessionConnection& session_connection_; VulkanSurfaceProducer& surface_producer_; std::shared_ptr scene_update_context_; diff --git a/shell/platform/fuchsia/flutter/session_connection.cc b/shell/platform/fuchsia/flutter/default_session_connection.cc similarity index 90% rename from shell/platform/fuchsia/flutter/session_connection.cc rename to shell/platform/fuchsia/flutter/default_session_connection.cc index ea686a88c7c50..1b72d7a990567 100644 --- a/shell/platform/fuchsia/flutter/session_connection.cc +++ b/shell/platform/fuchsia/flutter/default_session_connection.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "session_connection.h" +#include "default_session_connection.h" #include "flutter/fml/make_copyable.h" #include "flutter/fml/trace_event.h" @@ -12,7 +12,7 @@ namespace flutter_runner { -SessionConnection::SessionConnection( +DefaultSessionConnection::DefaultSessionConnection( std::string debug_label, fidl::InterfaceHandle session, fml::closure session_error_callback, @@ -38,7 +38,7 @@ SessionConnection::SessionConnection( // A frame was presented: Update our |frames_in_flight| to match the // updated unfinalized present requests. frames_in_flight_ -= num_presents_handled; - TRACE_EVENT2("gfx", "OnFramePresented", "frames_in_flight", + TRACE_EVENT2("gfx", "DSC::OnFramePresented", "frames_in_flight", frames_in_flight_, "max_frames_in_flight", kMaxFramesInFlight); FML_DCHECK(frames_in_flight_ >= 0); @@ -78,13 +78,13 @@ SessionConnection::SessionConnection( }); } -SessionConnection::~SessionConnection() = default; +DefaultSessionConnection::~DefaultSessionConnection() = default; -void SessionConnection::Present() { - TRACE_EVENT2("gfx", "SessionConnection::Present", "frames_in_flight", +void DefaultSessionConnection::Present() { + TRACE_EVENT2("gfx", "DefaultSessionConnection::Present", "frames_in_flight", frames_in_flight_, "max_frames_in_flight", kMaxFramesInFlight); - TRACE_FLOW_BEGIN("gfx", "SessionConnection::PresentSession", + TRACE_FLOW_BEGIN("gfx", "DefaultSessionConnection::PresentSession", next_present_session_trace_id_); next_present_session_trace_id_++; @@ -105,7 +105,7 @@ void SessionConnection::Present() { } } -fml::TimePoint SessionConnection::CalculateNextLatchPoint( +fml::TimePoint DefaultSessionConnection::CalculateNextLatchPoint( fml::TimePoint present_requested_time, fml::TimePoint now, fml::TimePoint last_latch_point_targeted, @@ -134,8 +134,8 @@ fml::TimePoint SessionConnection::CalculateNextLatchPoint( return minimum_latch_point_to_target; } -void SessionConnection::PresentSession() { - TRACE_EVENT0("gfx", "SessionConnection::PresentSession"); +void DefaultSessionConnection::PresentSession() { + TRACE_EVENT0("gfx", "DefaultSessionConnection::PresentSession"); // If we cannot call Present2() because we have no more Scenic frame budget, // then we must wait until the OnFramePresented() event fires so we can @@ -148,7 +148,7 @@ void SessionConnection::PresentSession() { present_session_pending_ = false; while (processed_present_session_trace_id_ < next_present_session_trace_id_) { - TRACE_FLOW_END("gfx", "SessionConnection::PresentSession", + TRACE_FLOW_END("gfx", "DefaultSessionConnection::PresentSession", processed_present_session_trace_id_); processed_present_session_trace_id_++; } @@ -197,7 +197,7 @@ void SessionConnection::PresentSession() { }); } -void SessionConnection::ToggleSignal(zx_handle_t handle, bool set) { +void DefaultSessionConnection::ToggleSignal(zx_handle_t handle, bool set) { const auto signal = VsyncWaiter::SessionPresentSignal; auto status = zx_object_signal(handle, // handle set ? 0 : signal, // clear mask diff --git a/shell/platform/fuchsia/flutter/session_connection.h b/shell/platform/fuchsia/flutter/default_session_connection.h similarity index 78% rename from shell/platform/fuchsia/flutter/session_connection.h rename to shell/platform/fuchsia/flutter/default_session_connection.h index 6f0eef073e509..97ca5637e4084 100644 --- a/shell/platform/fuchsia/flutter/session_connection.h +++ b/shell/platform/fuchsia/flutter/default_session_connection.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_SESSION_CONNECTION_H_ -#define FLUTTER_SHELL_PLATFORM_FUCHSIA_SESSION_CONNECTION_H_ +#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_SESSION_CONNECTION_H_ +#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_SESSION_CONNECTION_H_ #include #include @@ -21,16 +21,17 @@ using on_frame_presented_event = // The component residing on the raster thread that is responsible for // maintaining the Scenic session connection and presenting node updates. -class SessionConnection final : public flutter::SessionWrapper { +class DefaultSessionConnection final : public flutter::SessionWrapper { public: - SessionConnection(std::string debug_label, - fidl::InterfaceHandle session, - fml::closure session_error_callback, - on_frame_presented_event on_frame_presented_callback, - zx_handle_t vsync_event_handle, - uint64_t max_frames_in_flight); + DefaultSessionConnection( + std::string debug_label, + fidl::InterfaceHandle session, + fml::closure session_error_callback, + on_frame_presented_event on_frame_presented_callback, + zx_handle_t vsync_event_handle, + uint64_t max_frames_in_flight); - ~SessionConnection(); + ~DefaultSessionConnection(); scenic::Session* get() override { return &session_wrapper_; } void Present() override; @@ -83,9 +84,9 @@ class SessionConnection final : public flutter::SessionWrapper { static void ToggleSignal(zx_handle_t handle, bool raise); - FML_DISALLOW_COPY_AND_ASSIGN(SessionConnection); + FML_DISALLOW_COPY_AND_ASSIGN(DefaultSessionConnection); }; } // namespace flutter_runner -#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_SESSION_CONNECTION_H_ +#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_SESSION_CONNECTION_H_ diff --git a/shell/platform/fuchsia/flutter/engine.h b/shell/platform/fuchsia/flutter/engine.h index 5faeb277ee78b..73b47074179bd 100644 --- a/shell/platform/fuchsia/flutter/engine.h +++ b/shell/platform/fuchsia/flutter/engine.h @@ -22,10 +22,10 @@ #include "flutter/fml/macros.h" #include "flutter/shell/common/shell.h" +#include "default_session_connection.h" #include "flutter_runner_product_configuration.h" #include "fuchsia_external_view_embedder.h" #include "isolate_configurator.h" -#include "session_connection.h" #include "thread.h" #include "vulkan_surface_producer.h" @@ -74,7 +74,7 @@ class Engine final { const std::string thread_label_; std::array threads_; - std::optional session_connection_; + std::optional session_connection_; std::optional surface_producer_; std::shared_ptr external_view_embedder_; #if defined(LEGACY_FUCHSIA_EMBEDDER) diff --git a/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.cc b/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.cc index 313146ba254c8..31821d2465a75 100644 --- a/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.cc @@ -64,7 +64,7 @@ FuchsiaExternalViewEmbedder::FuchsiaExternalViewEmbedder( std::string debug_label, fuchsia::ui::views::ViewToken view_token, scenic::ViewRefPair view_ref_pair, - SessionConnection& session, + DefaultSessionConnection& session, VulkanSurfaceProducer& surface_producer, bool intercept_all_input) : session_(session), diff --git a/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.h b/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.h index 374434b2f1182..01d03a09db0ef 100644 --- a/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.h +++ b/shell/platform/fuchsia/flutter/fuchsia_external_view_embedder.h @@ -27,7 +27,7 @@ #include "third_party/skia/include/core/SkSize.h" #include "third_party/skia/include/gpu/GrDirectContext.h" -#include "session_connection.h" +#include "default_session_connection.h" #include "vulkan_surface_producer.h" namespace flutter_runner { @@ -42,7 +42,7 @@ class FuchsiaExternalViewEmbedder final : public flutter::ExternalViewEmbedder { FuchsiaExternalViewEmbedder(std::string debug_label, fuchsia::ui::views::ViewToken view_token, scenic::ViewRefPair view_ref_pair, - SessionConnection& session, + DefaultSessionConnection& session, VulkanSurfaceProducer& surface_producer, bool intercept_all_input = false); ~FuchsiaExternalViewEmbedder(); @@ -147,7 +147,7 @@ class FuchsiaExternalViewEmbedder final : public flutter::ExternalViewEmbedder { using EmbedderLayerId = std::optional; constexpr static EmbedderLayerId kRootLayerId = EmbedderLayerId{}; - SessionConnection& session_; + DefaultSessionConnection& session_; VulkanSurfaceProducer& surface_producer_; scenic::View root_view_; diff --git a/shell/platform/fuchsia/flutter/tests/session_connection_unittests.cc b/shell/platform/fuchsia/flutter/tests/default_session_connection_unittests.cc similarity index 94% rename from shell/platform/fuchsia/flutter/tests/session_connection_unittests.cc rename to shell/platform/fuchsia/flutter/tests/default_session_connection_unittests.cc index b2c33a69313d6..d684f0bdd86c0 100644 --- a/shell/platform/fuchsia/flutter/tests/session_connection_unittests.cc +++ b/shell/platform/fuchsia/flutter/tests/default_session_connection_unittests.cc @@ -8,24 +8,24 @@ #include #include +#include "flutter/shell/platform/fuchsia/flutter/default_session_connection.h" #include "flutter/shell/platform/fuchsia/flutter/logging.h" #include "flutter/shell/platform/fuchsia/flutter/runner.h" -#include "flutter/shell/platform/fuchsia/flutter/session_connection.h" #include "gtest/gtest.h" using namespace flutter_runner; namespace flutter_runner_test { -class SessionConnectionTest : public ::testing::Test { +class DefaultSessionConnectionTest : public ::testing::Test { public: void SetUp() override { context_ = sys::ComponentContext::CreateAndServeOutgoingDirectory(); scenic_ = context_->svc()->Connect(); presenter_ = context_->svc()->Connect(); - FML_CHECK(ZX_OK == - loop_.StartThread("SessionConnectionTestThread", &fidl_thread_)); + FML_CHECK(ZX_OK == loop_.StartThread("DefaultSessionConnectionTestThread", + &fidl_thread_)); auto session_listener_request = session_listener_.NewRequest(); @@ -58,7 +58,7 @@ class SessionConnectionTest : public ::testing::Test { thrd_t fidl_thread_; }; -TEST_F(SessionConnectionTest, SimplePresentTest) { +TEST_F(DefaultSessionConnectionTest, SimplePresentTest) { fml::closure on_session_error_callback = []() { FML_CHECK(false); }; uint64_t num_presents_handled = 0; @@ -68,7 +68,7 @@ TEST_F(SessionConnectionTest, SimplePresentTest) { num_presents_handled += info.presentation_infos.size(); }; - flutter_runner::SessionConnection session_connection( + flutter_runner::DefaultSessionConnection session_connection( "debug label", std::move(session_), on_session_error_callback, on_frame_presented_callback, vsync_event_.get(), 3); @@ -80,7 +80,7 @@ TEST_F(SessionConnectionTest, SimplePresentTest) { EXPECT_GT(num_presents_handled, 0u); } -TEST_F(SessionConnectionTest, BatchedPresentTest) { +TEST_F(DefaultSessionConnectionTest, BatchedPresentTest) { fml::closure on_session_error_callback = []() { FML_CHECK(false); }; uint64_t num_presents_handled = 0; @@ -90,7 +90,7 @@ TEST_F(SessionConnectionTest, BatchedPresentTest) { num_presents_handled += info.presentation_infos.size(); }; - flutter_runner::SessionConnection session_connection( + flutter_runner::DefaultSessionConnection session_connection( "debug label", std::move(session_), on_session_error_callback, on_frame_presented_callback, vsync_event_.get(), 3); @@ -132,7 +132,7 @@ TEST(CalculateNextLatchPointTest, PresentAsSoonAsPossible) { EXPECT_GT(vsync_interval, TimeDeltaFromInt(0)); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -163,7 +163,7 @@ TEST(CalculateNextLatchPointTest, LongFrameBuildTime) { EXPECT_GT(flutter_frame_build_time, vsync_interval); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -196,7 +196,7 @@ TEST(CalculateNextLatchPointTest, DelayedPresentRequestWithLongFrameBuildTime) { EXPECT_GT(now, present_requested_time + vsync_interval); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -227,7 +227,7 @@ TEST(CalculateNextLatchPointTest, LastLastPointTargetedLate) { EXPECT_GT(last_latch_point_targeted, present_requested_time); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -267,7 +267,7 @@ TEST(CalculateNextLatchPointTest, SteadyState_OnTimeFrames) { EXPECT_GT(vsync_interval, TimeDeltaFromInt(0)); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -306,7 +306,7 @@ TEST(CalculateNextLatchPointTest, SteadyState_LongFrameBuildTimes) { EXPECT_GT(flutter_frame_build_time, vsync_interval); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -345,7 +345,7 @@ TEST(CalculateNextLatchPointTest, SteadyState_LateLastLatchPointTargeted) { EXPECT_GT(last_latch_point_targeted, now + vsync_interval); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -384,7 +384,7 @@ TEST(CalculateNextLatchPointTest, EXPECT_GT(now, present_requested_time + vsync_interval); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -420,7 +420,7 @@ TEST(CalculateNextLatchPointTest, SteadyState_FuzzyLatchPointsBeforeTarget) { EXPECT_GT(vsync_interval, TimeDeltaFromInt(0)); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); @@ -456,7 +456,7 @@ TEST(CalculateNextLatchPointTest, SteadyState_FuzzyLatchPointsAfterTarget) { EXPECT_GT(vsync_interval, TimeDeltaFromInt(0)); fml::TimePoint calculated_latch_point = - SessionConnection::CalculateNextLatchPoint( + DefaultSessionConnection::CalculateNextLatchPoint( present_requested_time, now, last_latch_point_targeted, flutter_frame_build_time, vsync_interval, future_presentation_infos); diff --git a/shell/platform/fuchsia/flutter/tests/engine_unittests.cc b/shell/platform/fuchsia/flutter/tests/engine_unittests.cc index 78c0235180a1f..cd2b293fbf4e6 100644 --- a/shell/platform/fuchsia/flutter/tests/engine_unittests.cc +++ b/shell/platform/fuchsia/flutter/tests/engine_unittests.cc @@ -14,9 +14,9 @@ #include "flutter/fml/message_loop_impl.h" #include "flutter/fml/task_runner.h" #include "flutter/shell/common/serialization_callbacks.h" +#include "flutter/shell/platform/fuchsia/flutter/default_session_connection.h" #include "flutter/shell/platform/fuchsia/flutter/logging.h" #include "flutter/shell/platform/fuchsia/flutter/runner.h" -#include "flutter/shell/platform/fuchsia/flutter/session_connection.h" #include "gtest/gtest.h" #include "include/core/SkPicture.h" #include "include/core/SkPictureRecorder.h" diff --git a/shell/platform/fuchsia/flutter/tests/vsync_recorder_unittests.cc b/shell/platform/fuchsia/flutter/tests/vsync_recorder_unittests.cc index 1b16af654b9db..200ad80732d5c 100644 --- a/shell/platform/fuchsia/flutter/tests/vsync_recorder_unittests.cc +++ b/shell/platform/fuchsia/flutter/tests/vsync_recorder_unittests.cc @@ -10,8 +10,8 @@ #include "flutter/shell/platform/fuchsia/flutter/logging.h" #include "flutter/shell/platform/fuchsia/flutter/vsync_recorder.h" +#include "flutter/shell/platform/fuchsia/flutter/default_session_connection.h" #include "flutter/shell/platform/fuchsia/flutter/runner.h" -#include "flutter/shell/platform/fuchsia/flutter/session_connection.h" using namespace flutter_runner; From e2269f719457f06cd83b1185597258b97fc74446 Mon Sep 17 00:00:00 2001 From: Felipe Archondo Date: Thu, 13 May 2021 04:59:58 -0400 Subject: [PATCH 2/2] update yaml file --- testing/fuchsia/gtest_filters.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/fuchsia/gtest_filters.yaml b/testing/fuchsia/gtest_filters.yaml index 09d325f2e58e6..ade1a15773eec 100644 --- a/testing/fuchsia/gtest_filters.yaml +++ b/testing/fuchsia/gtest_filters.yaml @@ -4,4 +4,4 @@ txt_tests: -ParagraphTest.* fml_tests: -MessageLoop.TimeSensitiveTest_*:FileTest.CanTruncateAndWrite:FileTest.CreateDirectoryStructure shell_tests: -ShellTest.ReportTimingsIsCalledLaterInReleaseMode:ShellTest.ReportTimingsIsCalledSoonerInNonReleaseMode:ShellTest.DisallowedDartVMFlag:FuchsiaShellTest.LocaltimesVaryOnTimezoneChanges -flutter_runner_scenic_tests: -SessionConnectionTest.*:CalculateNextLatchPointTest.* +flutter_runner_scenic_tests: -DefaultSessionConnectionTest.*:CalculateNextLatchPointTest.*