DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-land "Make flow/embedded_views.h compatible with .clang_tidy." (flutter/engine#48137)

Browse Source 
Reverts flutter/engine#48130.

Now that the `runIf` clauses are omitted, CI should be a reliable source
of truth.
This commit is contained in:
Matan Lurey 2023-11-16 13:05:13 -08:00 committed by GitHub
parent a189220384
commit 56fc8315cc
16 changed files with 129 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/src/flutter/flow/embedded_views.h
View File

@ -6,6 +6,7 @@
#define FLUTTER_FLOW_EMBEDDED_VIEWS_H_
#include <memory>
#include <utility>
#include <vector>
#include "flutter/display_list/dl_builder.h"
@ -51,7 +52,7 @@ class ImageFilterMutation {
public:
ImageFilterMutation(std::shared_ptr<const DlImageFilter> 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<const DlImageFilter> filter,
explicit Mutator(const std::shared_ptr<const DlImageFilter>& 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<const DlImageFilter> filter,
void PushImageFilter(const std::shared_ptr<const DlImageFilter>& 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;
@ -391,7 +392,7 @@ class ExternalViewEmbedder {
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) = 0;
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) = 0;
virtual void PrerollCompositeEmbeddedView(
int64_t view_id,
@ -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<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
return PostPrerollResult::kSuccess;
}
@ -432,7 +433,7 @@ class ExternalViewEmbedder {
// returns false.
virtual void EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
const fml::RefPtr<fml::RasterThreadMerger>& 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<const DlImageFilter> filter,
const std::shared_ptr<const DlImageFilter>& filter,
const SkRect& filter_rect) {}
private:

2
engine/src/flutter/flow/testing/mock_embedder.cc
View File

@ -28,7 +28,7 @@ void MockViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
// |ExternalViewEmbedder|
void MockViewEmbedder::PrerollCompositeEmbeddedView(

10
engine/src/flutter/flow/testing/mock_embedder.h
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void PrerollCompositeEmbeddedView(

65
engine/src/flutter/shell/common/rasterizer_unittests.cc
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger),
(override));
MOCK_METHOD(
void,
BeginFrame,
(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger),
(override));
MOCK_METHOD(void,
PrerollCompositeEmbeddedView,
(int64_t view_id, std::unique_ptr<EmbeddedViewParams> params),
(override));
MOCK_METHOD(PostPrerollResult,
PostPrerollAction,
(fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger),
(override));
MOCK_METHOD(
PostPrerollResult,
PostPrerollAction,
(const fml::RefPtr<fml::RasterThreadMerger>& 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<impeller::AiksContext>& aiks_context,
std::unique_ptr<SurfaceFrame> frame),
(override));
MOCK_METHOD(void,
EndFrame,
(bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger),
(override));
MOCK_METHOD(
void,
EndFrame,
(bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>& 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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*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<SurfaceFrame>(
/*surface=*/nullptr, framebuffer_info,
/*surface=*/
nullptr, framebuffer_info,
/*submit_callback=*/
[](const SurfaceFrame& frame, DlCanvas*) { return true; },
/*frame_size=*/SkISize::Make(800, 600));

8
engine/src/flutter/shell/common/shell_test_external_view_embedder.cc
View File

@ -44,7 +44,7 @@ void ShellTestExternalViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
visited_platform_views_.clear();
mutators_stacks_.clear();
current_composition_params_.clear();
@ -61,7 +61,7 @@ void ShellTestExternalViewEmbedder::PrerollCompositeEmbeddedView(
// |ExternalViewEmbedder|
PostPrerollResult ShellTestExternalViewEmbedder::PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& 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<const DlImageFilter> filter,
const std::shared_ptr<const DlImageFilter>& filter,
const SkRect& filter_rect) {
for (int64_t id : visited_platform_views_) {
EmbeddedViewParams params = current_composition_params_[id];
@ -109,7 +109,7 @@ void ShellTestExternalViewEmbedder::SubmitFrame(
// |ExternalViewEmbedder|
void ShellTestExternalViewEmbedder::EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
end_frame_call_back_(should_resubmit_frame, raster_thread_merger);
}

21
engine/src/flutter/shell/common/shell_test_external_view_embedder.h
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void PrerollCompositeEmbeddedView(
@ -59,7 +59,8 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
// |ExternalViewEmbedder|
PostPrerollResult PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
const fml::RefPtr<fml::RasterThreadMerger>& 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<const DlImageFilter> filter,
const std::shared_ptr<const DlImageFilter>& filter,
const SkRect& filter_rect) override;
// |ExternalViewEmbedder|
@ -78,9 +79,9 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
void EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void EndFrame(bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
DlCanvas* GetRootCanvas() override;

6
engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc
View File

@ -212,7 +212,7 @@ AndroidExternalViewEmbedder::CreateSurfaceIfNeeded(GrDirectContext* context,
// |ExternalViewEmbedder|
PostPrerollResult AndroidExternalViewEmbedder::PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
if (!FrameHasPlatformLayers()) {
return PostPrerollResult::kSuccess;
}
@ -260,7 +260,7 @@ void AndroidExternalViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
Reset();
// The surface size changed. Therefore, destroy existing surfaces as
@ -286,7 +286,7 @@ void AndroidExternalViewEmbedder::CancelFrame() {
// |ExternalViewEmbedder|
void AndroidExternalViewEmbedder::EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
surface_pool_->RecycleLayers();
// JNI method must be called on the platform thread.
if (raster_thread_merger->IsOnPlatformThread()) {

19
engine/src/flutter/shell/platform/android/external_view_embedder/external_view_embedder.h
View File

@ -49,25 +49,26 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
// |ExternalViewEmbedder|
PostPrerollResult PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
override;
// |ExternalViewEmbedder|
DlCanvas* GetRootCanvas() override;
// |ExternalViewEmbedder|
void BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void CancelFrame() override;
// |ExternalViewEmbedder|
void EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void EndFrame(bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
bool SupportsDynamicThreadMerging() override;

21
engine/src/flutter/shell/platform/darwin/ios/ios_external_view_embedder.h
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void PrerollCompositeEmbeddedView(
@ -44,7 +44,8 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
// |ExternalViewEmbedder|
PostPrerollResult PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
override;
// |ExternalViewEmbedder|
DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
@ -55,16 +56,16 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
void EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void EndFrame(bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
bool SupportsDynamicThreadMerging() override;
// |ExternalViewEmbedder|
void PushFilterToVisitedPlatformViews(
std::shared_ptr<const DlImageFilter> filter,
const std::shared_ptr<const DlImageFilter>& filter,
const SkRect& filter_rect) override;
// |ExternalViewEmbedder|

11
engine/src/flutter/shell/platform/darwin/ios/ios_external_view_embedder.mm
View File

@ -34,7 +34,7 @@ void IOSExternalViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::BeginFrame");
FML_CHECK(platform_views_controller_);
platform_views_controller_->BeginFrame(frame_size);
@ -51,7 +51,7 @@ void IOSExternalViewEmbedder::PrerollCompositeEmbeddedView(
// |ExternalViewEmbedder|
PostPrerollResult IOSExternalViewEmbedder::PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PostPrerollAction");
FML_CHECK(platform_views_controller_);
PostPrerollResult result = platform_views_controller_->PostPrerollAction(raster_thread_merger);
@ -77,8 +77,9 @@ void IOSExternalViewEmbedder::SubmitFrame(
}
// |ExternalViewEmbedder|
void IOSExternalViewEmbedder::EndFrame(bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
void IOSExternalViewEmbedder::EndFrame(
bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::EndFrame");
platform_views_controller_->EndFrame(should_resubmit_frame, raster_thread_merger);
}
@ -90,7 +91,7 @@ bool IOSExternalViewEmbedder::SupportsDynamicThreadMerging() {
// |ExternalViewEmbedder|
void IOSExternalViewEmbedder::PushFilterToVisitedPlatformViews(
std::shared_ptr<const DlImageFilter> filter,
const std::shared_ptr<const DlImageFilter>& filter,
const SkRect& filter_rect) {
platform_views_controller_->PushFilterToVisitedPlatformViews(filter, filter_rect);
}

2
engine/src/flutter/shell/platform/embedder/embedder_external_view_embedder.cc
View File

@ -54,7 +54,7 @@ void EmbedderExternalViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
Reset();
pending_frame_size_ = frame_size;

10
engine/src/flutter/shell/platform/embedder/embedder_external_view_embedder.h
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void PrerollCompositeEmbeddedView(

6
engine/src/flutter/shell/platform/fuchsia/flutter/external_view_embedder.cc
View File

@ -103,7 +103,7 @@ flutter::DlCanvas* ExternalViewEmbedder::CompositeEmbeddedView(
}
flutter::PostPrerollResult ExternalViewEmbedder::PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
return flutter::PostPrerollResult::kSuccess;
}
@ -111,7 +111,7 @@ void ExternalViewEmbedder::BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
TRACE_EVENT0("flutter", "ExternalViewEmbedder::BeginFrame");
// Reset for new frame.
@ -128,7 +128,7 @@ void ExternalViewEmbedder::BeginFrame(
void ExternalViewEmbedder::EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
TRACE_EVENT0("flutter", "ExternalViewEmbedder::EndFrame");
}

19
engine/src/flutter/shell/platform/fuchsia/flutter/external_view_embedder.h
View File

@ -68,19 +68,20 @@ class ExternalViewEmbedder final : public flutter::ExternalViewEmbedder {
// |ExternalViewEmbedder|
flutter::PostPrerollResult PostPrerollAction(
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
override;
// |ExternalViewEmbedder|
void BeginFrame(
SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void EndFrame(
bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
void EndFrame(bool should_resubmit_frame,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override;
// |ExternalViewEmbedder|
void SubmitFrame(GrDirectContext* context,

10
engine/src/flutter/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override {}
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override {}
void SubmitFrame(GrDirectContext* context,
const std::shared_ptr<impeller::AiksContext>& aiks_context,

10
engine/src/flutter/shell/testing/tester_main.cc
View File

@ -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<fml::RasterThreadMerger> raster_thread_merger) override {}
void BeginFrame(SkISize frame_size,
GrDirectContext* context,
double device_pixel_ratio,
const fml::RefPtr<fml::RasterThreadMerger>&
raster_thread_merger) override {}
// |ExternalViewEmbedder|
void PrerollCompositeEmbeddedView(