Fix iOS references to PostPrerollResult (#10949)

flutter · Aug 12, 2019 · b5c198b · b5c198b
1 parent 971a639
commit b5c198b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
@@ -173,7 +173,7 @@
 
 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 @@
     } else {
       CancelFrame();
       gpu_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);
-      return true;
+      return PostPrerollResult::kSuccess;
     }
   }
-  return false;
+  return PostPrerollResult::kResubmitFrame;
 }
 
 void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(

diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
@@ -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();
 

diff --git a/shell/platform/darwin/ios/ios_surface_gl.h b/shell/platform/darwin/ios/ios_surface_gl.h
@@ -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;

diff --git a/shell/platform/darwin/ios/ios_surface_gl.mm b/shell/platform/darwin/ios/ios_surface_gl.mm
@@ -106,7 +106,7 @@
   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);