Fix iOS references to PostPrerollResult (#10949)

iskakaushik · web-flow · commit b5c198b69995 · 2019-08-12T13:01:11.000-07:00
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);

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@`
`173`	`173`
`174`	`174`	`const int FlutterPlatformViewsController::kDefaultMergedLeaseDuration;`
`175`	`175`
`176`		`-bool FlutterPlatformViewsController::PostPrerollAction(`
	`176`	`+PostPrerollResult FlutterPlatformViewsController::PostPrerollAction(`
`177`	`177`	`fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {`
`178`	`178`	`const bool uiviews_mutated = HasPendingViewOperations();`
`179`	`179`	`if (uiviews_mutated) {`
`@@ -182,10 +182,10 @@`
`182`	`182`	`} else {`
`183`	`183`	`CancelFrame();`
`184`	`184`	`gpu_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);`
`185`		`- return true;`
	`185`	`+ return PostPrerollResult::kSuccess;`
`186`	`186`	`}`
`187`	`187`	`}`
`188`		`- return false;`
	`188`	`+ return PostPrerollResult::kResubmitFrame;`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@`
`106`	`106`	`platform_views_controller->PrerollCompositeEmbeddedView(view_id, std::move(params));`
`107`	`107`	`}`
`108`	`108`
`109`		`-bool IOSSurfaceGL::PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {`
	`109`	`+PostPrerollResult IOSSurfaceGL::PostPrerollAction(fml::RefPtr<fml::GpuThreadMerger> gpu_thread_merger) {`
`110`	`110`	`FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();`
`111`	`111`	`FML_CHECK(platform_views_controller != nullptr);`
`112`	`112`	`return platform_views_controller->PostPrerollAction(gpu_thread_merger);`