Revert "Implement unobstructed Platform Views on iOS"

flow/embedded_views.cc

@@ -6,13 +6,10 @@
 
 namespace flutter {
 
-bool ExternalViewEmbedder::SubmitFrame(GrContext* context,
-                                       SkCanvas* background_canvas) {
+bool ExternalViewEmbedder::SubmitFrame(GrContext* context) {
   return false;
 };
 
-void ExternalViewEmbedder::FinishFrame(){};
-
 void MutatorsStack::PushClipRect(const SkRect& rect) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(rect);
   vector_.push_back(element);

flow/embedded_views.h

@@ -248,10 +248,7 @@ class ExternalViewEmbedder {
   // Must be called on the UI thread.
   virtual SkCanvas* CompositeEmbeddedView(int view_id) = 0;
 
-  virtual bool SubmitFrame(GrContext* context, SkCanvas* background_canvas);
-
-  // This is called after submitting the embedder frame and the surface frame.
-  virtual void FinishFrame();
+  virtual bool SubmitFrame(GrContext* context);
 
   FML_DISALLOW_COPY_AND_ASSIGN(ExternalViewEmbedder);
 

flow/layers/picture_layer.cc

@@ -59,7 +59,7 @@ void PictureLayer::Paint(PaintContext& context) const {
       return;
     }
   }
-  picture()->playback(context.leaf_nodes_canvas);
+  context.leaf_nodes_canvas->drawPicture(picture());
 }
 
 }  // namespace flutter

flow/layers/picture_layer_unittests.cc

@@ -94,6 +94,9 @@ TEST_F(PictureLayerTest, SimplePicture) {
            1, MockCanvas::SetMatrixData{RasterCache::GetIntegralTransCTM(
                   layer_offset_matrix)}},
 #endif
+       MockCanvas::DrawCall{
+           1, MockCanvas::DrawPictureData{mock_picture->serialize(), SkPaint(),
+                                          SkMatrix()}},
        MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
   EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
 }

shell/common/rasterizer.cc

@@ -342,17 +342,9 @@ RasterStatus Rasterizer::DrawToSurface(flutter::LayerTree& layer_tree) {
     if (raster_status == RasterStatus::kFailed) {
       return raster_status;
     }
+    frame->Submit();
     if (external_view_embedder != nullptr) {
-      external_view_embedder->SubmitFrame(surface_->GetContext(),
-                                          root_surface_canvas);
-      // The external view embedder may mutate the root surface canvas while
-      // submitting the frame.
-      // Therefore, submit the final frame after asking the external view
-      // embedder to submit the frame.
-      frame->Submit();
-      external_view_embedder->FinishFrame();
-    } else {
-      frame->Submit();
+      external_view_embedder->SubmitFrame(surface_->GetContext());
     }
 
     FireNextFrameCallbackIfPresent();