External view embedder can tell if embedded views have mutated (#9653)

iskakaushik · web-flow · commit d637f291a96f · 2019-07-03T07:28:53.000-07:00
* refactoring to move the mutator stack handling to preroll

* more review fixes

* Add support for external view embedded to know if it has changed

* remove the need to reset

* address comments

* Rename to HasPendingViewOperations
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
@@ -183,6 +183,10 @@ class ExternalViewEmbedder {
  public:
   ExternalViewEmbedder() = default;
 
+  // This will return true after pre-roll if any of the embedded views
+  // have mutated for last layer tree.
+  virtual bool HasPendingViewOperations() = 0;
+
   virtual void BeginFrame(SkISize frame_size) = 0;
 
   virtual void PrerollCompositeEmbeddedView(
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
@@ -160,6 +160,13 @@
   frame_size_ = frame_size;
 }
 
+bool FlutterPlatformViewsController::HasPendingViewOperations() {
+  if (!views_to_recomposite_.empty()) {
+    return true;
+  }
+  return active_composition_order_ != composition_order_;
+}
+
 void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(
     int view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
@@ -79,6 +79,8 @@ class FlutterPlatformViewsController {
 
   void SetFrameSize(SkISize frame_size);
 
+  bool HasPendingViewOperations();
+
   void PrerollCompositeEmbeddedView(int view_id,
                                     std::unique_ptr<flutter::EmbeddedViewParams> params);
 
diff --git a/shell/platform/darwin/ios/ios_surface_gl.h b/shell/platform/darwin/ios/ios_surface_gl.h
@@ -51,6 +51,9 @@ class IOSSurfaceGL final : public IOSSurface,
   // |GPUSurfaceGLDelegate|
   flutter::ExternalViewEmbedder* GetExternalViewEmbedder() override;
 
+  // |flutter::ExternalViewEmbedder|
+  bool HasPendingViewOperations() override;
+
   // |flutter::ExternalViewEmbedder|
   void BeginFrame(SkISize frame_size) override;
 
diff --git a/shell/platform/darwin/ios/ios_surface_gl.mm b/shell/platform/darwin/ios/ios_surface_gl.mm
@@ -82,6 +82,12 @@
   }
 }
 
+bool IOSSurfaceGL::HasPendingViewOperations() {
+  FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
+  FML_CHECK(platform_views_controller != nullptr);
+  return platform_views_controller->HasPendingViewOperations();
+}
+
 void IOSSurfaceGL::BeginFrame(SkISize frame_size) {
   FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
   FML_CHECK(platform_views_controller != nullptr);
diff --git a/shell/platform/darwin/ios/ios_surface_software.h b/shell/platform/darwin/ios/ios_surface_software.h
@@ -45,6 +45,9 @@ class IOSSurfaceSoftware final : public IOSSurface,
   // |GPUSurfaceSoftwareDelegate|
   flutter::ExternalViewEmbedder* GetExternalViewEmbedder() override;
 
+  // |flutter::ExternalViewEmbedder|
+  bool HasPendingViewOperations() override;
+
   // |flutter::ExternalViewEmbedder|
   void BeginFrame(SkISize frame_size) override;
 
diff --git a/shell/platform/darwin/ios/ios_surface_software.mm b/shell/platform/darwin/ios/ios_surface_software.mm
@@ -135,6 +135,12 @@
   }
 }
 
+bool IOSSurfaceSoftware::HasPendingViewOperations() {
+  FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
+  FML_CHECK(platform_views_controller != nullptr);
+  return platform_views_controller->HasPendingViewOperations();
+}
+
 void IOSSurfaceSoftware::BeginFrame(SkISize frame_size) {
   FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
   FML_CHECK(platform_views_controller != nullptr);

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,12 @@`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
	`85`	`+bool IOSSurfaceGL::HasPendingViewOperations() {`
	`86`	`+ FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();`
	`87`	`+ FML_CHECK(platform_views_controller != nullptr);`
	`88`	`+ return platform_views_controller->HasPendingViewOperations();`
	`89`	`+}`
	`90`	`+`
`85`	`91`	`void IOSSurfaceGL::BeginFrame(SkISize frame_size) {`
`86`	`92`	`FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();`
`87`	`93`	`FML_CHECK(platform_views_controller != nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,12 @@`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
	`138`	`+bool IOSSurfaceSoftware::HasPendingViewOperations() {`
	`139`	`+ FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();`
	`140`	`+ FML_CHECK(platform_views_controller != nullptr);`
	`141`	`+ return platform_views_controller->HasPendingViewOperations();`
	`142`	`+}`
	`143`	`+`
`138`	`144`	`void IOSSurfaceSoftware::BeginFrame(SkISize frame_size) {`
`139`	`145`	`FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();`
`140`	`146`	`FML_CHECK(platform_views_controller != nullptr);`