From 63b0fc83c72e08b0a4e963f9af79fa5ccbb2d8a1 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 13 Nov 2023 14:19:00 -0800 Subject: [PATCH 01/11] Make `flow/embedded_views.h` compatible with `.clang_tidy`. --- flow/embedded_views.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/flow/embedded_views.h b/flow/embedded_views.h index 6985c37e5b8c0..44aae7572231f 100644 --- a/flow/embedded_views.h +++ b/flow/embedded_views.h @@ -6,6 +6,7 @@ #define FLUTTER_FLOW_EMBEDDED_VIEWS_H_ #include +#include #include #include "flutter/display_list/dl_builder.h" @@ -51,7 +52,7 @@ class ImageFilterMutation { public: ImageFilterMutation(std::shared_ptr filter, const SkRect& filter_rect) - : filter_(filter), filter_rect_(filter_rect) {} + : filter_(std::move(filter)), filter_rect_(filter_rect) {} const DlImageFilter& GetFilter() const { return *filter_; } const SkRect& GetFilterRect() const { return filter_rect_; } @@ -110,7 +111,7 @@ class Mutator { explicit Mutator(const SkMatrix& matrix) : type_(kTransform), matrix_(matrix) {} explicit Mutator(const int& alpha) : type_(kOpacity), alpha_(alpha) {} - explicit Mutator(std::shared_ptr filter, + explicit Mutator(const std::shared_ptr& filter, const SkRect& filter_rect) : type_(kBackdropFilter), filter_mutation_( @@ -270,7 +271,7 @@ class EmbeddedViewParams { MutatorsStack mutators_stack) : matrix_(matrix), size_points_(size_points), - mutators_stack_(mutators_stack) { + mutators_stack_(std::move(mutators_stack)) { SkPath path; SkRect starting_rect = SkRect::MakeSize(size_points); path.addRect(starting_rect); @@ -295,7 +296,7 @@ class EmbeddedViewParams { // Pushes the stored DlImageFilter object to the mutators stack. // // `filter_rect` is in global coordinates. - void PushImageFilter(std::shared_ptr filter, + void PushImageFilter(const std::shared_ptr& filter, const SkRect& filter_rect) { mutators_stack_.PushBackdropFilter(filter, filter_rect); } @@ -344,7 +345,7 @@ class EmbedderViewSlice { class DisplayListEmbedderViewSlice : public EmbedderViewSlice { public: - DisplayListEmbedderViewSlice(SkRect view_bounds); + explicit DisplayListEmbedderViewSlice(SkRect view_bounds); ~DisplayListEmbedderViewSlice() override = default; DlCanvas* canvas() override; @@ -402,7 +403,7 @@ class ExternalViewEmbedder { // after it does any requisite tasks needed to bring itself to a valid state. // Returns kSuccess if the view embedder is already in a valid state. virtual PostPrerollResult PostPrerollAction( - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { return PostPrerollResult::kSuccess; } @@ -432,7 +433,7 @@ class ExternalViewEmbedder { // returns false. virtual void EndFrame( bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) {} + const fml::RefPtr& raster_thread_merger) {} // Whether the embedder should support dynamic thread merging. // @@ -468,7 +469,7 @@ class ExternalViewEmbedder { // See also: |PushVisitedPlatformView| for pushing platform view ids to the // visited platform views list. virtual void PushFilterToVisitedPlatformViews( - std::shared_ptr filter, + const std::shared_ptr& filter, const SkRect& filter_rect) {} private: From e48d20aac57f9cc298a841a12363509aa1b4b634 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 13 Nov 2023 14:35:45 -0800 Subject: [PATCH 02/11] ++ --- shell/platform/fuchsia/flutter/external_view_embedder.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.h b/shell/platform/fuchsia/flutter/external_view_embedder.h index a5771a9ce4bfc..055d6bd0b0e6c 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.h +++ b/shell/platform/fuchsia/flutter/external_view_embedder.h @@ -68,7 +68,8 @@ class ExternalViewEmbedder final : public flutter::ExternalViewEmbedder { // |ExternalViewEmbedder| flutter::PostPrerollResult PostPrerollAction( - fml::RefPtr raster_thread_merger) override; + const fml::RefPtr& raster_thread_merger) + override; // |ExternalViewEmbedder| void BeginFrame( @@ -78,9 +79,9 @@ class ExternalViewEmbedder final : public flutter::ExternalViewEmbedder { fml::RefPtr raster_thread_merger) override; // |ExternalViewEmbedder| - void EndFrame( - bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) override; + void EndFrame(bool should_resubmit_frame, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void SubmitFrame(GrDirectContext* context, From 14d74930cc8ba45afeba74121ee861ae2e1c61e0 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 13 Nov 2023 14:45:34 -0800 Subject: [PATCH 03/11] ++ --- .../external_view_embedder/external_view_embedder.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h index 400b43fb91a89..63553da6dc5fd 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.h +++ b/shell/platform/android/external_view_embedder/external_view_embedder.h @@ -49,7 +49,8 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| PostPrerollResult PostPrerollAction( - fml::RefPtr raster_thread_merger) override; + const fml::RefPtr& raster_thread_merger) + override; // |ExternalViewEmbedder| DlCanvas* GetRootCanvas() override; @@ -65,9 +66,9 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder { void CancelFrame() override; // |ExternalViewEmbedder| - void EndFrame( - bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) override; + void EndFrame(bool should_resubmit_frame, + const fml::RefPtr& + raster_thread_merger) override; bool SupportsDynamicThreadMerging() override; From addb8ed4d385bbd84afef7edb684f6063cdf189a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 13 Nov 2023 14:57:53 -0800 Subject: [PATCH 04/11] ++ --- .../android/external_view_embedder/external_view_embedder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index a0e516e4c10a2..1bb51d1ed6cef 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -212,7 +212,7 @@ AndroidExternalViewEmbedder::CreateSurfaceIfNeeded(GrDirectContext* context, // |ExternalViewEmbedder| PostPrerollResult AndroidExternalViewEmbedder::PostPrerollAction( - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { if (!FrameHasPlatformLayers()) { return PostPrerollResult::kSuccess; } From 4dc92d09bba418ec6c0c190291881bcfb6e4c213 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 13 Nov 2023 15:19:16 -0800 Subject: [PATCH 05/11] ++ --- .../android/external_view_embedder/external_view_embedder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index 1bb51d1ed6cef..bd372972fe438 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -286,7 +286,7 @@ void AndroidExternalViewEmbedder::CancelFrame() { // |ExternalViewEmbedder| void AndroidExternalViewEmbedder::EndFrame( bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { surface_pool_->RecycleLayers(); // JNI method must be called on the platform thread. if (raster_thread_merger->IsOnPlatformThread()) { From 9e31a5119463ec13e51f57c1a25045aabd10cd11 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 12:42:30 -0800 Subject: [PATCH 06/11] ++ --- shell/common/shell_test_external_view_embedder.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h index b2e8c48d0ccf0..5146c09f0bbb1 100644 --- a/shell/common/shell_test_external_view_embedder.h +++ b/shell/common/shell_test_external_view_embedder.h @@ -59,7 +59,8 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| PostPrerollResult PostPrerollAction( - fml::RefPtr raster_thread_merger) override; + const fml::RefPtr& raster_thread_merger) + override; // |ExternalViewEmbedder| DlCanvas* CompositeEmbeddedView(int64_t view_id) override; @@ -69,7 +70,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PushFilterToVisitedPlatformViews( - std::shared_ptr filter, + const std::shared_ptr& filter, const SkRect& filter_rect) override; // |ExternalViewEmbedder| @@ -78,9 +79,9 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { std::unique_ptr frame) override; // |ExternalViewEmbedder| - void EndFrame( - bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) override; + void EndFrame(bool should_resubmit_frame, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| DlCanvas* GetRootCanvas() override; From afcc6f952b1823a73ee9333aeb4c5059577c4dd1 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 12:52:48 -0800 Subject: [PATCH 07/11] ++ --- shell/common/rasterizer_unittests.cc | 65 +++++++++++-------- .../shell_test_external_view_embedder.cc | 4 +- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index 1e21d0d8f1ecb..10085e66ade0e 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -89,21 +89,23 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder { public: MOCK_METHOD(DlCanvas*, GetRootCanvas, (), (override)); MOCK_METHOD(void, CancelFrame, (), (override)); - MOCK_METHOD(void, - BeginFrame, - (SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger), - (override)); + MOCK_METHOD( + void, + BeginFrame, + (SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& raster_thread_merger), + (override)); MOCK_METHOD(void, PrerollCompositeEmbeddedView, (int64_t view_id, std::unique_ptr params), (override)); - MOCK_METHOD(PostPrerollResult, - PostPrerollAction, - (fml::RefPtr raster_thread_merger), - (override)); + MOCK_METHOD( + PostPrerollResult, + PostPrerollAction, + (const fml::RefPtr& raster_thread_merger), + (override)); MOCK_METHOD(DlCanvas*, CompositeEmbeddedView, (int64_t view_id), (override)); MOCK_METHOD(void, SubmitFrame, @@ -111,11 +113,12 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder { const std::shared_ptr& aiks_context, std::unique_ptr frame), (override)); - MOCK_METHOD(void, - EndFrame, - (bool should_resubmit_frame, - fml::RefPtr raster_thread_merger), - (override)); + MOCK_METHOD( + void, + EndFrame, + (bool should_resubmit_frame, + const fml::RefPtr& raster_thread_merger), + (override)); MOCK_METHOD(bool, SupportsDynamicThreadMerging, (), (override)); }; } // namespace @@ -199,7 +202,8 @@ TEST(RasterizerTest, framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true)); @@ -271,7 +275,8 @@ TEST( SurfaceFrame::FramebufferInfo framebuffer_info; framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true)); @@ -343,7 +348,8 @@ TEST( framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true)); @@ -412,11 +418,13 @@ TEST(RasterizerTest, framebuffer_info.supports_readback = true; auto surface_frame1 = std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); auto surface_frame2 = std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()) @@ -645,7 +653,8 @@ TEST(RasterizerTest, SurfaceFrame::FramebufferInfo framebuffer_info; framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info, + /*surface=*/ + nullptr, /*framebuffer_info=*/framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true)); @@ -704,7 +713,8 @@ TEST( framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info, + /*surface=*/ + nullptr, /*framebuffer_info=*/framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true)); @@ -764,7 +774,8 @@ TEST( framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info, + /*surface=*/ + nullptr, /*framebuffer_info=*/framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(false)); @@ -823,7 +834,8 @@ TEST( framebuffer_info.supports_readback = true; auto surface_frame = std::make_unique( - /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info, + /*surface=*/ + nullptr, /*framebuffer_info=*/framebuffer_info, /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(false)); @@ -945,7 +957,8 @@ TEST(RasterizerTest, SurfaceFrame::FramebufferInfo framebuffer_info; framebuffer_info.supports_readback = true; return std::make_unique( - /*surface=*/nullptr, framebuffer_info, + /*surface=*/ + nullptr, framebuffer_info, /*submit_callback=*/ [](const SurfaceFrame& frame, DlCanvas*) { return true; }, /*frame_size=*/SkISize::Make(800, 600)); diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc index 22b9bfe13554b..8f0b930b7a8f3 100644 --- a/shell/common/shell_test_external_view_embedder.cc +++ b/shell/common/shell_test_external_view_embedder.cc @@ -61,7 +61,7 @@ void ShellTestExternalViewEmbedder::PrerollCompositeEmbeddedView( // |ExternalViewEmbedder| PostPrerollResult ShellTestExternalViewEmbedder::PostPrerollAction( - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { FML_DCHECK(raster_thread_merger); return post_preroll_result_; } @@ -73,7 +73,7 @@ void ShellTestExternalViewEmbedder::PushVisitedPlatformView(int64_t view_id) { // |ExternalViewEmbedder| void ShellTestExternalViewEmbedder::PushFilterToVisitedPlatformViews( - std::shared_ptr filter, + const std::shared_ptr& filter, const SkRect& filter_rect) { for (int64_t id : visited_platform_views_) { EmbeddedViewParams params = current_composition_params_[id]; From 0371aa81c79cbeee77b37f7d95a68aef1b05cec8 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 13:45:31 -0800 Subject: [PATCH 08/11] ++ --- flow/embedded_views.h | 2 +- flow/testing/mock_embedder.cc | 2 +- flow/testing/mock_embedder.h | 10 ++++----- .../shell_test_external_view_embedder.cc | 4 ++-- .../shell_test_external_view_embedder.h | 10 ++++----- .../external_view_embedder.cc | 2 +- .../external_view_embedder.h | 10 ++++----- .../darwin/ios/ios_external_view_embedder.h | 21 ++++++++++--------- .../embedder_external_view_embedder.cc | 2 +- .../embedder_external_view_embedder.h | 10 ++++----- .../fuchsia/flutter/external_view_embedder.h | 10 ++++----- .../flutter/tests/platform_view_unittest.cc | 10 ++++----- 12 files changed, 47 insertions(+), 46 deletions(-) diff --git a/flow/embedded_views.h b/flow/embedded_views.h index 44aae7572231f..c16426980f88d 100644 --- a/flow/embedded_views.h +++ b/flow/embedded_views.h @@ -392,7 +392,7 @@ class ExternalViewEmbedder { SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) = 0; + const fml::RefPtr& raster_thread_merger) = 0; virtual void PrerollCompositeEmbeddedView( int64_t view_id, diff --git a/flow/testing/mock_embedder.cc b/flow/testing/mock_embedder.cc index ae41675b6f771..1f86912fdc549 100644 --- a/flow/testing/mock_embedder.cc +++ b/flow/testing/mock_embedder.cc @@ -28,7 +28,7 @@ void MockViewEmbedder::BeginFrame( SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) {} + const fml::RefPtr& raster_thread_merger) {} // |ExternalViewEmbedder| void MockViewEmbedder::PrerollCompositeEmbeddedView( diff --git a/flow/testing/mock_embedder.h b/flow/testing/mock_embedder.h index 164d7baff79e3..5ea8fdf8a7cbc 100644 --- a/flow/testing/mock_embedder.h +++ b/flow/testing/mock_embedder.h @@ -25,11 +25,11 @@ class MockViewEmbedder : public ExternalViewEmbedder { void CancelFrame() override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc index 8f0b930b7a8f3..6c87e734982c2 100644 --- a/shell/common/shell_test_external_view_embedder.cc +++ b/shell/common/shell_test_external_view_embedder.cc @@ -44,7 +44,7 @@ void ShellTestExternalViewEmbedder::BeginFrame( SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { visited_platform_views_.clear(); mutators_stacks_.clear(); current_composition_params_.clear(); @@ -109,7 +109,7 @@ void ShellTestExternalViewEmbedder::SubmitFrame( // |ExternalViewEmbedder| void ShellTestExternalViewEmbedder::EndFrame( bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { end_frame_call_back_(should_resubmit_frame, raster_thread_merger); } diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h index 5146c09f0bbb1..93aca8578f0d3 100644 --- a/shell/common/shell_test_external_view_embedder.h +++ b/shell/common/shell_test_external_view_embedder.h @@ -46,11 +46,11 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { void CancelFrame() override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index bd372972fe438..905c2751a3d4b 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -260,7 +260,7 @@ void AndroidExternalViewEmbedder::BeginFrame( SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { Reset(); // The surface size changed. Therefore, destroy existing surfaces as diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h index 63553da6dc5fd..a84681ab098d5 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.h +++ b/shell/platform/android/external_view_embedder/external_view_embedder.h @@ -56,11 +56,11 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder { DlCanvas* GetRootCanvas() override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void CancelFrame() override; diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.h b/shell/platform/darwin/ios/ios_external_view_embedder.h index d83b435930f21..1aa67890d6117 100644 --- a/shell/platform/darwin/ios/ios_external_view_embedder.h +++ b/shell/platform/darwin/ios/ios_external_view_embedder.h @@ -31,11 +31,11 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder { void CancelFrame() override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( @@ -44,7 +44,8 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder { // |ExternalViewEmbedder| PostPrerollResult PostPrerollAction( - fml::RefPtr raster_thread_merger) override; + const fml::RefPtr& raster_thread_merger) + override; // |ExternalViewEmbedder| DlCanvas* CompositeEmbeddedView(int64_t view_id) override; @@ -55,16 +56,16 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder { std::unique_ptr frame) override; // |ExternalViewEmbedder| - void EndFrame( - bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) override; + void EndFrame(bool should_resubmit_frame, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| bool SupportsDynamicThreadMerging() override; // |ExternalViewEmbedder| void PushFilterToVisitedPlatformViews( - std::shared_ptr filter, + const std::shared_ptr& filter, const SkRect& filter_rect) override; // |ExternalViewEmbedder| diff --git a/shell/platform/embedder/embedder_external_view_embedder.cc b/shell/platform/embedder/embedder_external_view_embedder.cc index ca38e86af4826..94c770f809277 100644 --- a/shell/platform/embedder/embedder_external_view_embedder.cc +++ b/shell/platform/embedder/embedder_external_view_embedder.cc @@ -54,7 +54,7 @@ void EmbedderExternalViewEmbedder::BeginFrame( SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { Reset(); pending_frame_size_ = frame_size; diff --git a/shell/platform/embedder/embedder_external_view_embedder.h b/shell/platform/embedder/embedder_external_view_embedder.h index 014f7393c416e..31b1f4cf6f22b 100644 --- a/shell/platform/embedder/embedder_external_view_embedder.h +++ b/shell/platform/embedder/embedder_external_view_embedder.h @@ -81,11 +81,11 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder { void CancelFrame() override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( diff --git a/shell/platform/fuchsia/flutter/external_view_embedder.h b/shell/platform/fuchsia/flutter/external_view_embedder.h index 055d6bd0b0e6c..4e5afd151ba86 100644 --- a/shell/platform/fuchsia/flutter/external_view_embedder.h +++ b/shell/platform/fuchsia/flutter/external_view_embedder.h @@ -72,11 +72,11 @@ class ExternalViewEmbedder final : public flutter::ExternalViewEmbedder { override; // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override; + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override; // |ExternalViewEmbedder| void EndFrame(bool should_resubmit_frame, diff --git a/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc b/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc index f19c04ba56bc2..274818de22669 100644 --- a/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc +++ b/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc @@ -45,11 +45,11 @@ class MockExternalViewEmbedder : public flutter::ExternalViewEmbedder { flutter::DlCanvas* GetRootCanvas() override { return nullptr; } void CancelFrame() override {} - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override {} + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override {} void SubmitFrame(GrDirectContext* context, const std::shared_ptr& aiks_context, From a0594353b5fa361cf25c1602a42a30f00f20190b Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 15:07:35 -0800 Subject: [PATCH 09/11] ++ --- shell/testing/tester_main.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc index 4be39c4d70b41..a621dc86acf67 100644 --- a/shell/testing/tester_main.cc +++ b/shell/testing/tester_main.cc @@ -138,11 +138,11 @@ class TesterExternalViewEmbedder : public ExternalViewEmbedder { void CancelFrame() override {} // |ExternalViewEmbedder| - void BeginFrame( - SkISize frame_size, - GrDirectContext* context, - double device_pixel_ratio, - fml::RefPtr raster_thread_merger) override {} + void BeginFrame(SkISize frame_size, + GrDirectContext* context, + double device_pixel_ratio, + const fml::RefPtr& + raster_thread_merger) override {} // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( From 6906e77342f16674b1a275149e3ea387d0159669 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 15:51:42 -0800 Subject: [PATCH 10/11] ++ --- shell/platform/darwin/ios/ios_external_view_embedder.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.mm b/shell/platform/darwin/ios/ios_external_view_embedder.mm index 67112e999d13d..15d10b7a35403 100644 --- a/shell/platform/darwin/ios/ios_external_view_embedder.mm +++ b/shell/platform/darwin/ios/ios_external_view_embedder.mm @@ -34,7 +34,7 @@ SkISize frame_size, GrDirectContext* context, double device_pixel_ratio, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::BeginFrame"); FML_CHECK(platform_views_controller_); platform_views_controller_->BeginFrame(frame_size); @@ -51,7 +51,7 @@ // |ExternalViewEmbedder| PostPrerollResult IOSExternalViewEmbedder::PostPrerollAction( - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PostPrerollAction"); FML_CHECK(platform_views_controller_); PostPrerollResult result = platform_views_controller_->PostPrerollAction(raster_thread_merger); @@ -78,7 +78,7 @@ // |ExternalViewEmbedder| void IOSExternalViewEmbedder::EndFrame(bool should_resubmit_frame, - fml::RefPtr raster_thread_merger) { + const fml::RefPtr& raster_thread_merger) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::EndFrame"); platform_views_controller_->EndFrame(should_resubmit_frame, raster_thread_merger); } @@ -90,7 +90,7 @@ // |ExternalViewEmbedder| void IOSExternalViewEmbedder::PushFilterToVisitedPlatformViews( - std::shared_ptr filter, + const std::shared_ptr& filter, const SkRect& filter_rect) { platform_views_controller_->PushFilterToVisitedPlatformViews(filter, filter_rect); } From bcdacbc56e18d5a21855da2e4e7838bf8aae435e Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 15 Nov 2023 15:52:26 -0800 Subject: [PATCH 11/11] ++ --- shell/platform/darwin/ios/ios_external_view_embedder.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.mm b/shell/platform/darwin/ios/ios_external_view_embedder.mm index 15d10b7a35403..3f4edffdd8c6f 100644 --- a/shell/platform/darwin/ios/ios_external_view_embedder.mm +++ b/shell/platform/darwin/ios/ios_external_view_embedder.mm @@ -77,8 +77,9 @@ } // |ExternalViewEmbedder| -void IOSExternalViewEmbedder::EndFrame(bool should_resubmit_frame, - const fml::RefPtr& raster_thread_merger) { +void IOSExternalViewEmbedder::EndFrame( + bool should_resubmit_frame, + const fml::RefPtr& raster_thread_merger) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::EndFrame"); platform_views_controller_->EndFrame(should_resubmit_frame, raster_thread_merger); }