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

Fix iOS references to PostPrerollResult (flutter/engine#10949)

Browse Source
This commit is contained in:
Kaushik Iska 2019-08-12 13:01:11 -07:00 committed by GitHub
parent de1c728dab
commit 3519a8bfdf
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
View File

@ -173,7 +173,7 @@ bool FlutterPlatformViewsController::HasPendingViewOperations() {
const int FlutterPlatformViewsController::kDefaultMergedLeaseDuration;
bool FlutterPlatformViewsController::PostPrerollAction(
PostPrerollResult FlutterPlatformViewsController::PostPrerollAction(
fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {
const bool uiviews_mutated = HasPendingViewOperations();
if (uiviews_mutated) {
@ -182,10 +182,10 @@ bool FlutterPlatformViewsController::PostPrerollAction(
} else {
CancelFrame();
gpu_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);
return true;
return PostPrerollResult::kSuccess;
}
}
return false;
return PostPrerollResult::kResubmitFrame;
}
void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(

2
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
View File

@ -91,7 +91,7 @@ class FlutterPlatformViewsController {
// returns nil.
NSObject<FlutterPlatformView>* GetPlatformViewByID(int view_id);
bool PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger);
PostPrerollResult PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger);
std::vector<SkCanvas*> GetCurrentCanvases();

2
engine/src/flutter/shell/platform/darwin/ios/ios_surface_gl.h
View File

@ -62,7 +62,7 @@ class IOSSurfaceGL final : public IOSSurface,
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
// |flutter::ExternalViewEmbedder|
bool PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) override;
PostPrerollResult PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) override;
// |flutter::ExternalViewEmbedder|
std::vector<SkCanvas*> GetCurrentCanvases() override;

2
engine/src/flutter/shell/platform/darwin/ios/ios_surface_gl.mm
View File

@ -106,7 +106,7 @@ void IOSSurfaceGL::PrerollCompositeEmbeddedView(
platform_views_controller->PrerollCompositeEmbeddedView(view_id, std::move(params));
}
bool IOSSurfaceGL::PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {
PostPrerollResult IOSSurfaceGL::PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {
FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
FML_CHECK(platform_views_controller != nullptr);
return platform_views_controller->PostPrerollAction(gpu_thread_merger);