未验证 提交 933c8b84 编写于 作者: E Emmanuel Garcia 提交者: GitHub

bool SubmitFrame -> void SubmitFrame (#18984)

上级 48f90888
......@@ -6,9 +6,9 @@
namespace flutter {
bool ExternalViewEmbedder::SubmitFrame(GrContext* context,
void ExternalViewEmbedder::SubmitFrame(GrContext* context,
std::unique_ptr<SurfaceFrame> frame) {
return frame->Submit();
frame->Submit();
};
void MutatorsStack::PushClipRect(const SkRect& rect) {
......
......@@ -295,7 +295,7 @@ class ExternalViewEmbedder {
// This method can mutate the root Skia canvas before submitting the frame.
//
// It can also allocate frames for overlay surfaces to compose hybrid views.
virtual bool SubmitFrame(GrContext* context,
virtual void SubmitFrame(GrContext* context,
std::unique_ptr<SurfaceFrame> frame);
// This method provides the embedder a way to do additional tasks after
......
......@@ -35,10 +35,10 @@ SkCanvas* ShellTestExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
}
// |ExternalViewEmbedder|
bool ShellTestExternalViewEmbedder::SubmitFrame(
void ShellTestExternalViewEmbedder::SubmitFrame(
GrContext* context,
std::unique_ptr<SurfaceFrame> frame) {
return frame->Submit();
frame->Submit();
}
// |ExternalViewEmbedder|
......
......@@ -51,7 +51,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
SkCanvas* CompositeEmbeddedView(int view_id) override;
// |ExternalViewEmbedder|
bool SubmitFrame(GrContext* context,
void SubmitFrame(GrContext* context,
std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
......
......@@ -72,14 +72,14 @@ SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
}
// |ExternalViewEmbedder|
bool AndroidExternalViewEmbedder::SubmitFrame(
void AndroidExternalViewEmbedder::SubmitFrame(
GrContext* context,
std::unique_ptr<SurfaceFrame> frame) {
TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::SubmitFrame");
if (should_run_rasterizer_on_platform_thread_) {
// Don't submit the current frame if the frame will be resubmitted.
return true;
return;
}
std::unordered_map<int64_t, std::list<SkRect>> overlay_layers;
......@@ -181,7 +181,6 @@ bool AndroidExternalViewEmbedder::SubmitFrame(
}
}
}
return true;
}
// |ExternalViewEmbedder|
......
......@@ -45,7 +45,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
std::vector<SkCanvas*> GetCurrentCanvases() override;
// |ExternalViewEmbedder|
bool SubmitFrame(GrContext* context,
void SubmitFrame(GrContext* context,
std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
......
......@@ -161,7 +161,6 @@ TEST(AndroidExternalViewEmbedder, RasterizerRunsOnPlatformThread) {
auto postpreroll_result = embedder->PostPrerollAction(raster_thread_merger);
ASSERT_EQ(PostPrerollResult::kResubmitFrame, postpreroll_result);
ASSERT_TRUE(embedder->SubmitFrame(nullptr, nullptr));
EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
embedder->EndFrame(/*should_resubmit_frame=*/true, raster_thread_merger);
......
......@@ -82,7 +82,7 @@ class IOSSurface : public ExternalViewEmbedder {
SkCanvas* CompositeEmbeddedView(int view_id) override;
// |ExternalViewEmbedder|
bool SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> frame) override;
void SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
void EndFrame(bool should_resubmit_frame,
......
......@@ -135,7 +135,7 @@ SkCanvas* IOSSurface::CompositeEmbeddedView(int view_id) {
}
// |ExternalViewEmbedder|
bool IOSSurface::SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> frame) {
void IOSSurface::SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> frame) {
TRACE_EVENT0("flutter", "IOSSurface::SubmitFrame");
FML_CHECK(platform_views_controller_ != nullptr);
bool submitted =
......@@ -145,7 +145,6 @@ bool IOSSurface::SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> f
TRACE_EVENT0("flutter", "IOSSurface::DidSubmitFrame");
[CATransaction commit];
}
return submitted;
}
// |ExternalViewEmbedder|
......
......@@ -131,7 +131,7 @@ static FlutterBackingStoreConfig MakeBackingStoreConfig(
}
// |ExternalViewEmbedder|
bool EmbedderExternalViewEmbedder::SubmitFrame(
void EmbedderExternalViewEmbedder::SubmitFrame(
GrContext* context,
std::unique_ptr<SurfaceFrame> frame) {
auto [matched_render_targets, pending_keys] =
......@@ -185,7 +185,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
if (!render_target) {
FML_LOG(ERROR) << "Embedder did not return a valid render target.";
return false;
return;
}
matched_render_targets[pending_key] = std::move(render_target);
}
......@@ -204,7 +204,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
->Render(*render_target.second)) {
FML_LOG(ERROR)
<< "Could not render into the embedder supplied render target.";
return false;
return;
}
}
......@@ -266,7 +266,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
std::move(render_target.second));
}
return frame->Submit();
frame->Submit();
}
} // namespace flutter
......@@ -91,7 +91,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
SkCanvas* CompositeEmbeddedView(int view_id) override;
// |ExternalViewEmbedder|
bool SubmitFrame(GrContext* context,
void SubmitFrame(GrContext* context,
std::unique_ptr<SurfaceFrame> frame) override;
// |ExternalViewEmbedder|
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册